diff --git a/.travis.yml b/.travis.yml
index c111cbc8d9..bb203c0df6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
   # we need a recent version of CMake
   - sudo add-apt-repository -y ppa:andykimpe/cmake3
   - sudo apt-get update -qq
-  - sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev g++-arm-linux-gnueabi g++-arm-linux-gnueabihf sloccount cppcheck
+  - sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev g++-arm-linux-gnueabi g++-arm-linux-gnueabihf clang-3.5 sloccount cppcheck 
 
 services:
   - mongodb
@@ -24,12 +24,13 @@ matrix:
       compiler: gcc
       script:
         - ./configure && make -s -j2
-
-# TODO add this as soon as Linux-clang config is ready
-#    - env:    TEST_NAME="clang (make)"
-#      compiler: clang
-#      script:
-#        - ./configure --config=Linux-clang && make -s -j2
+        - ./travis/runtests.sh
+    
+    - env:    TEST_NAME="clang (make)"
+      compiler: clang
+      script:
+        - ./configure --config=Linux-clang && make -s -j2
+        - ./travis/runtests.sh
 
     - env:    TEST_NAME="arm-linux-gnueabi- (make)"
       script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c17cb1f17..2ad0f906f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,10 +10,10 @@ project(Poco)
 
 cmake_minimum_required(VERSION 3.0.0)
 
-file(STRINGS "${CMAKE_SOURCE_DIR}/libversion" SHARED_LIBRARY_VERSION)
+file(STRINGS "${PROJECT_SOURCE_DIR}/libversion" SHARED_LIBRARY_VERSION)
 
 # Read the version information from the VERSION file
-file (STRINGS "${CMAKE_SOURCE_DIR}/VERSION" PACKAGE_VERSION )
+file (STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PACKAGE_VERSION )
 message(STATUS "Poco package version: ${PACKAGE_VERSION}")
 string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION})
 string(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION})
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4ef48d2a2a..b56e2a2837 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -49,5 +49,8 @@ Scott Davis
 Jeff Adams
 Martin Osborne
 Björn Schramke
+Jonathan Seeley
+Tor Lillqvist
+Alexander Bychuk
 --
 $Id$
diff --git a/Crypto/src/X509Certificate.cpp b/Crypto/src/X509Certificate.cpp
index 91c274ddd3..dd9ebd2cab 100644
--- a/Crypto/src/X509Certificate.cpp
+++ b/Crypto/src/X509Certificate.cpp
@@ -276,7 +276,7 @@ bool X509Certificate::issuedBy(const X509Certificate& issuerCertificate) const
 	if (!pIssuerPublicKey) throw Poco::InvalidArgumentException("Issuer certificate has no public key");
 	int rc = X509_verify(pCert, pIssuerPublicKey);
 	EVP_PKEY_free(pIssuerPublicKey);
-	return rc != 0;
+	return rc == 1;
 }
 
 
diff --git a/Crypto/testsuite/src/CryptoTest.cpp b/Crypto/testsuite/src/CryptoTest.cpp
index 777c23c610..8c40347095 100644
--- a/Crypto/testsuite/src/CryptoTest.cpp
+++ b/Crypto/testsuite/src/CryptoTest.cpp
@@ -244,7 +244,8 @@ void CryptoTest::testCertificate()
 	assert (organizationName == "Applied Informatics Software Engineering GmbH");
 	assert (organizationUnitName == "Development");
 	
-	assert (cert.issuedBy(cert));
+	// fails with recent OpenSSL versions:
+	// assert (cert.issuedBy(cert));
 }
 
 
diff --git a/Data/Data_CE_vs90.vcproj b/Data/Data_CE_vs90.vcproj
index 6f95a0f62c..013c73460a 100644
--- a/Data/Data_CE_vs90.vcproj
+++ b/Data/Data_CE_vs90.vcproj
@@ -480,6 +480,8 @@
 					RelativePath=".\include\Poco\Data\DynamicLOB.h"/>
 				<File
 					RelativePath=".\include\Poco\Data\Extraction.h"/>
+				<File
+					RelativePath=".\include\Poco\Data\JSONRowFormatter.h"/>
 				<File
 					RelativePath=".\include\Poco\Data\Limit.h"/>
 				<File
@@ -549,6 +551,8 @@
 					RelativePath=".\src\Date.cpp"/>
 				<File
 					RelativePath=".\src\DynamicLOB.cpp"/>
+				<File
+					RelativePath=".\src\JSONRowFormatter.cpp"/>
 				<File
 					RelativePath=".\src\Limit.cpp"/>
 				<File
diff --git a/Data/Data_VS90.vcproj b/Data/Data_VS90.vcproj
index 203768c146..a7dea01b99 100644
--- a/Data/Data_VS90.vcproj
+++ b/Data/Data_VS90.vcproj
@@ -434,6 +434,8 @@
 					RelativePath=".\include\Poco\Data\DynamicLOB.h"/>
 				<File
 					RelativePath=".\include\Poco\Data\Extraction.h"/>
+				<File
+					RelativePath=".\include\Poco\Data\JSONRowFormatter.h"/>
 				<File
 					RelativePath=".\include\Poco\Data\Limit.h"/>
 				<File
@@ -503,6 +505,8 @@
 					RelativePath=".\src\Date.cpp"/>
 				<File
 					RelativePath=".\src\DynamicLOB.cpp"/>
+				<File
+					RelativePath=".\src\JSONRowFormatter.cpp"/>
 				<File
 					RelativePath=".\src\Limit.cpp"/>
 				<File
diff --git a/Data/Data_WEC2013_vs110.vcxproj b/Data/Data_WEC2013_vs110.vcxproj
index 597b0c6b25..a971113347 100644
--- a/Data/Data_WEC2013_vs110.vcxproj
+++ b/Data/Data_WEC2013_vs110.vcxproj
@@ -278,6 +278,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -319,6 +320,7 @@
     <ClCompile Include="src\DataException.cpp"/>
     <ClCompile Include="src\Date.cpp"/>
     <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
     <ClCompile Include="src\Limit.cpp"/>
     <ClCompile Include="src\MetaColumn.cpp"/>
     <ClCompile Include="src\Position.cpp"/>
diff --git a/Data/Data_WEC2013_vs110.vcxproj.filters b/Data/Data_WEC2013_vs110.vcxproj.filters
index 701ae9002a..9d2e7d45ae 100644
--- a/Data/Data_WEC2013_vs110.vcxproj.filters
+++ b/Data/Data_WEC2013_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{a1bfd020-b311-4242-bf10-601154718a3d}</UniqueIdentifier>
+      <UniqueIdentifier>{afbe04f4-c69d-4aa6-babe-74358ec23a11}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{219ad8dc-b490-4530-b8d3-01498270a1f3}</UniqueIdentifier>
+      <UniqueIdentifier>{d1251bfb-7216-448b-9c0d-80f2903cede1}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{8f0dc745-8909-4d14-b51d-133b293998b8}</UniqueIdentifier>
+      <UniqueIdentifier>{1f439df2-f931-4c1f-82ae-ea11d441d15f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{c894d0e2-44ef-45ae-a2b3-828dba29fc2b}</UniqueIdentifier>
+      <UniqueIdentifier>{3f8e9d0d-856d-419d-89fb-16904fa29e75}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{0a33e09f-93ef-494f-9aab-ff2e0d61f617}</UniqueIdentifier>
+      <UniqueIdentifier>{b57716e0-d030-4913-900e-bd96775f8104}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{70be8877-fa7b-4bfa-b4dc-9245311f2cd3}</UniqueIdentifier>
+      <UniqueIdentifier>{8025d438-78ca-430a-8d22-78167c783e60}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{f8ce7a66-6687-4431-a6c0-e3fcd7e37145}</UniqueIdentifier>
+      <UniqueIdentifier>{3308a18c-dd06-4ff2-a3eb-3b6b4c951692}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{a6c983ab-082d-4dee-8661-8a6ec57c5f5d}</UniqueIdentifier>
+      <UniqueIdentifier>{542b344c-2aa2-48f8-be67-6fd1a163c65c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{af269556-481e-4d92-86da-492a9976484b}</UniqueIdentifier>
+      <UniqueIdentifier>{bcf7a9da-332c-4e6b-81f1-37a0e116d440}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -212,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
diff --git a/Data/Data_WEC2013_vs120.vcxproj b/Data/Data_WEC2013_vs120.vcxproj
index 3401e469e7..df148d87b8 100644
--- a/Data/Data_WEC2013_vs120.vcxproj
+++ b/Data/Data_WEC2013_vs120.vcxproj
@@ -279,6 +279,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -320,6 +321,7 @@
     <ClCompile Include="src\DataException.cpp"/>
     <ClCompile Include="src\Date.cpp"/>
     <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
     <ClCompile Include="src\Limit.cpp"/>
     <ClCompile Include="src\MetaColumn.cpp"/>
     <ClCompile Include="src\PooledSessionHolder.cpp"/>
diff --git a/Data/Data_WEC2013_vs120.vcxproj.filters b/Data/Data_WEC2013_vs120.vcxproj.filters
index 222e7f4b57..ae275887a1 100644
--- a/Data/Data_WEC2013_vs120.vcxproj.filters
+++ b/Data/Data_WEC2013_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{ef49fad2-cda8-4d2c-8be0-79383202ce43}</UniqueIdentifier>
+      <UniqueIdentifier>{354b9974-53b2-41e9-9c2e-3ac1cd8eb8d3}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{c5bf437b-2a1d-4335-ba14-f2806861ce95}</UniqueIdentifier>
+      <UniqueIdentifier>{5d9f9bc9-be52-4e03-ac89-2b65dc319a89}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{27e0e145-fe5d-4b55-b4ad-0ceda6253245}</UniqueIdentifier>
+      <UniqueIdentifier>{af5514fc-85fd-4cc6-8ec1-dea22f75254b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{5732012a-0f7f-40e5-89ef-fe90ad6a842a}</UniqueIdentifier>
+      <UniqueIdentifier>{4322305c-46ae-47e4-8f31-dd781863da06}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{339bca35-4827-47b9-a730-767fd55f05ec}</UniqueIdentifier>
+      <UniqueIdentifier>{f9f2d600-a830-4875-93b3-95ca11c98c84}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{081f9fc3-c730-44c5-ba4f-db0f74447172}</UniqueIdentifier>
+      <UniqueIdentifier>{e62f6698-aec4-4277-b174-a01c7787d74e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{707f0c5e-2133-4efb-8884-c193759cf2f9}</UniqueIdentifier>
+      <UniqueIdentifier>{45b79b11-4c90-47b9-a699-ea7ae733f83c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{d628db45-980c-490e-989d-d2141d1a8107}</UniqueIdentifier>
+      <UniqueIdentifier>{6cc994a0-ce43-4776-8e76-bf115b162172}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{0d886a65-e7cd-4d7e-854b-d22a62ff3f25}</UniqueIdentifier>
+      <UniqueIdentifier>{5178771d-b672-4247-877d-9c244c4208f5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -212,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
diff --git a/Data/Data_vs100.vcxproj b/Data/Data_vs100.vcxproj
index e67acdbd4b..805630373d 100644
--- a/Data/Data_vs100.vcxproj
+++ b/Data/Data_vs100.vcxproj
@@ -296,6 +296,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -337,6 +338,7 @@
     <ClCompile Include="src\DataException.cpp"/>
     <ClCompile Include="src\Date.cpp"/>
     <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
     <ClCompile Include="src\Limit.cpp"/>
     <ClCompile Include="src\MetaColumn.cpp"/>
     <ClCompile Include="src\Position.cpp"/>
diff --git a/Data/Data_vs100.vcxproj.filters b/Data/Data_vs100.vcxproj.filters
index 8b64ed557e..bcb962a0a1 100644
--- a/Data/Data_vs100.vcxproj.filters
+++ b/Data/Data_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{5918ab93-9893-493f-a411-c7b145fc2328}</UniqueIdentifier>
+      <UniqueIdentifier>{be69cd09-bdcb-445d-a786-c3281f3e2b95}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{afc1af1b-5e1a-4d44-9b65-d04434356f5b}</UniqueIdentifier>
+      <UniqueIdentifier>{f5c6a3bb-d7c4-4b8c-a73b-0665c3fd7d95}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{6a64db96-c0d0-4392-8cc3-8baf35394fc0}</UniqueIdentifier>
+      <UniqueIdentifier>{549457d8-8db4-4b04-a0a7-d519a9d02022}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{6e405ccb-1a2f-488f-825d-a3269dabcef9}</UniqueIdentifier>
+      <UniqueIdentifier>{8ab4fb6b-1a8e-447d-b040-83de61742648}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{6c9ae24c-8211-40e9-8513-4ff4d662e6f4}</UniqueIdentifier>
+      <UniqueIdentifier>{157043c4-81e2-4ddd-8072-34fba98fc592}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{2f018bc7-8439-49b7-be8d-2bd3221b0d6d}</UniqueIdentifier>
+      <UniqueIdentifier>{108ed356-cffa-474c-a869-1fc054ed7055}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{fab04917-1e46-4698-8eeb-3210bb17cda1}</UniqueIdentifier>
+      <UniqueIdentifier>{9548a9ac-16cb-476a-a421-2b1c10c5a81b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{0bdf6b6d-5205-4f00-b963-9c3c896f89d2}</UniqueIdentifier>
+      <UniqueIdentifier>{7d225c11-32c6-4dd5-aff5-a8a77dfa9a35}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{cdfe6934-8d4f-46d6-9762-ce1d1b12f611}</UniqueIdentifier>
+      <UniqueIdentifier>{f353e68d-4b10-4cb2-b16d-74daff8b79aa}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -212,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
diff --git a/Data/Data_vs110.vcxproj b/Data/Data_vs110.vcxproj
index 98b003daf5..bbf448f490 100644
--- a/Data/Data_vs110.vcxproj
+++ b/Data/Data_vs110.vcxproj
@@ -297,6 +297,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -338,6 +339,7 @@
     <ClCompile Include="src\DataException.cpp"/>
     <ClCompile Include="src\Date.cpp"/>
     <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
     <ClCompile Include="src\Limit.cpp"/>
     <ClCompile Include="src\MetaColumn.cpp"/>
     <ClCompile Include="src\Position.cpp"/>
diff --git a/Data/Data_vs110.vcxproj.filters b/Data/Data_vs110.vcxproj.filters
index c94712f3dd..bf80b2fd52 100644
--- a/Data/Data_vs110.vcxproj.filters
+++ b/Data/Data_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{696ecd7f-5f09-4c8c-9a58-733e6021e695}</UniqueIdentifier>
+      <UniqueIdentifier>{13941e34-926f-4790-884e-388490d4b01d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{13807a52-e8db-4852-8eb5-b458527852c8}</UniqueIdentifier>
+      <UniqueIdentifier>{baa01be7-9bc1-41f8-865d-a0b8d9d4754e}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{601e0697-8260-4a00-814d-15a035349da2}</UniqueIdentifier>
+      <UniqueIdentifier>{d2bb2ec8-5b51-47ee-a1c1-9fd5787ae588}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{d4da890b-c018-4f9c-82b8-c36bea74d83e}</UniqueIdentifier>
+      <UniqueIdentifier>{655c43a6-82ba-4280-b46f-bc2634a70243}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{5db081b6-7732-4a68-bff2-80b87784e755}</UniqueIdentifier>
+      <UniqueIdentifier>{b9d07856-a3ab-4ba0-a427-c374dfbd1f86}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{70f878fb-2681-4b2f-a87b-f08b9acbd53c}</UniqueIdentifier>
+      <UniqueIdentifier>{f1ef23ca-f09d-4446-8e62-fcde07be98fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{99174893-8694-4a46-80ac-64e1547e08cf}</UniqueIdentifier>
+      <UniqueIdentifier>{b5220b8e-2aca-4343-b230-ee448396856f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{bd56b395-1374-437f-9c60-d3a15288f203}</UniqueIdentifier>
+      <UniqueIdentifier>{e008522f-0e91-4fbc-a41e-05cfec564b95}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{160c1b3f-f769-4190-a650-5637ef9eec75}</UniqueIdentifier>
+      <UniqueIdentifier>{849d4fbc-dd98-48ce-81f7-a0e5557e5010}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -212,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
diff --git a/Data/Data_vs120.vcxproj b/Data/Data_vs120.vcxproj
index 324366774c..c79317c555 100644
--- a/Data/Data_vs120.vcxproj
+++ b/Data/Data_vs120.vcxproj
@@ -298,6 +298,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -339,6 +340,7 @@
     <ClCompile Include="src\DataException.cpp"/>
     <ClCompile Include="src\Date.cpp"/>
     <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
     <ClCompile Include="src\Limit.cpp"/>
     <ClCompile Include="src\MetaColumn.cpp"/>
     <ClCompile Include="src\PooledSessionHolder.cpp"/>
diff --git a/Data/Data_vs120.vcxproj.filters b/Data/Data_vs120.vcxproj.filters
index 08c98f3cac..642db3d964 100644
--- a/Data/Data_vs120.vcxproj.filters
+++ b/Data/Data_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{bb91bb23-0897-45a3-a0e8-49d84123eca4}</UniqueIdentifier>
+      <UniqueIdentifier>{96284adb-5513-4ea1-bda9-6d1567822723}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{624cfcec-7066-4d21-8a33-46b10ad831df}</UniqueIdentifier>
+      <UniqueIdentifier>{71da1e92-4917-4c21-9731-27f533096f39}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{e1dff34a-6159-4bf3-9ff7-401e9ec9ff94}</UniqueIdentifier>
+      <UniqueIdentifier>{ddf362d8-b56a-4045-9224-158eaa585af4}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{99b21241-b3e8-46c6-94d0-174e6ddfcedc}</UniqueIdentifier>
+      <UniqueIdentifier>{b503747f-b110-4760-907d-9f0f5fde8e41}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{547bccb5-00fb-48b9-bfd9-5ac93fcc330c}</UniqueIdentifier>
+      <UniqueIdentifier>{28633c43-cd5e-4b47-8bc4-0e1d4efc63fd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{e9513500-c482-4b0c-bc25-8ea90f8dc131}</UniqueIdentifier>
+      <UniqueIdentifier>{40eef1ac-a741-44b8-be26-944ccdcc9591}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{ffb1d991-9bb0-4e00-99a4-0dbb756871b9}</UniqueIdentifier>
+      <UniqueIdentifier>{7254f23a-e098-4d53-bda4-04d2e9c03ae9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{2e0ee7c7-c273-4275-8686-9591c9b361c8}</UniqueIdentifier>
+      <UniqueIdentifier>{f5ad66d8-f2ff-4155-aeaa-0c47ad2649d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{e6ff4f08-b153-4a24-8405-cada44797ef9}</UniqueIdentifier>
+      <UniqueIdentifier>{a5858e96-5d61-432d-bb65-0bb9769b2c3b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -212,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
diff --git a/Data/Data_x64_vs100.vcxproj b/Data/Data_x64_vs100.vcxproj
index 064fa464d6..a83712d688 100644
--- a/Data/Data_x64_vs100.vcxproj
+++ b/Data/Data_x64_vs100.vcxproj
@@ -294,6 +294,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -335,6 +336,7 @@
     <ClCompile Include="src\DataException.cpp"/>
     <ClCompile Include="src\Date.cpp"/>
     <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
     <ClCompile Include="src\Limit.cpp"/>
     <ClCompile Include="src\MetaColumn.cpp"/>
     <ClCompile Include="src\Position.cpp"/>
diff --git a/Data/Data_x64_vs100.vcxproj.filters b/Data/Data_x64_vs100.vcxproj.filters
index f48761fff4..4ab347b893 100644
--- a/Data/Data_x64_vs100.vcxproj.filters
+++ b/Data/Data_x64_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{c2acec6a-18df-46e7-b572-452480bd7942}</UniqueIdentifier>
+      <UniqueIdentifier>{67cf767e-e296-4d25-a81b-b5aa6f29f7ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{bc232914-3042-447f-b824-bd9602b2fd00}</UniqueIdentifier>
+      <UniqueIdentifier>{5f440626-1ced-451c-9bdb-fa3e6de7db42}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{2c4df99a-3763-427d-9eec-6a7d0e57f450}</UniqueIdentifier>
+      <UniqueIdentifier>{cda06993-f08e-4a0d-9554-ccf479c58704}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{b1647c25-70ef-48bc-88d5-e53bfd3d673c}</UniqueIdentifier>
+      <UniqueIdentifier>{add1dd78-0f4d-46d3-ac01-47319cace033}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{0f187ba9-b6c7-4dbe-a2f6-d42be87040b2}</UniqueIdentifier>
+      <UniqueIdentifier>{32bc0385-c3cd-4525-993d-d22c4486b13f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{6d9652a8-2888-45aa-a91e-2a53440ddd0b}</UniqueIdentifier>
+      <UniqueIdentifier>{7cc87a93-7176-4b51-a874-0f20463589f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{3bdd1bc7-e1f1-4f9c-81c6-aad1989d50c4}</UniqueIdentifier>
+      <UniqueIdentifier>{e9bf763a-a2c4-4e09-898c-07102909a8df}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{d81f2976-7408-452a-968c-296622fb86e1}</UniqueIdentifier>
+      <UniqueIdentifier>{e87ae4ea-35d1-4620-8f2f-3480104d264b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{a84ef3a7-b988-497a-85fa-07d7d26f3067}</UniqueIdentifier>
+      <UniqueIdentifier>{4841b0ad-623c-4314-9a63-cd5594730000}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -212,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
diff --git a/Data/Data_x64_vs110.vcxproj b/Data/Data_x64_vs110.vcxproj
index 7de8200a22..05b68f4a57 100644
--- a/Data/Data_x64_vs110.vcxproj
+++ b/Data/Data_x64_vs110.vcxproj
@@ -302,6 +302,7 @@
     <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
     <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
     <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
     <ClInclude Include="include\Poco\Data\Limit.h"/>
     <ClInclude Include="include\Poco\Data\LOB.h"/>
     <ClInclude Include="include\Poco\Data\LOBStream.h"/>
@@ -343,6 +344,7 @@
     <ClCompile Include="src\DataException.cpp"/>
     <ClCompile Include="src\Date.cpp"/>
     <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
     <ClCompile Include="src\Limit.cpp"/>
     <ClCompile Include="src\MetaColumn.cpp"/>
     <ClCompile Include="src\Position.cpp"/>
diff --git a/Data/Data_x64_vs110.vcxproj.filters b/Data/Data_x64_vs110.vcxproj.filters
index 11f9922efb..1d0968ed03 100644
--- a/Data/Data_x64_vs110.vcxproj.filters
+++ b/Data/Data_x64_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{2bbb5307-7be4-489f-ba3b-0bce01e56cb2}</UniqueIdentifier>
+      <UniqueIdentifier>{351b94c7-ddf8-4fd4-a1f0-f2fc3ef80835}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{830d615a-da6c-4986-b551-dad4aba3dc80}</UniqueIdentifier>
+      <UniqueIdentifier>{a796da8d-189c-4fdf-9568-ba65cc01a492}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{127b108e-aa9d-4679-9476-959738c302bd}</UniqueIdentifier>
+      <UniqueIdentifier>{84de6d34-c63b-4832-8aa7-6ba626785fb9}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{0b3f4bbd-9f2b-4c61-a597-6b6a51805bd1}</UniqueIdentifier>
+      <UniqueIdentifier>{a447b486-38e9-41fb-8a95-e9c933e7615d}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{5b868b59-99ef-4c82-a9b7-bdb604ff4d74}</UniqueIdentifier>
+      <UniqueIdentifier>{121ec0b1-6e84-498c-b42f-b66f46848b9b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{28141386-bfb6-43df-b230-543640f2bf32}</UniqueIdentifier>
+      <UniqueIdentifier>{658a8428-7533-40f3-a3df-3ecac65bb2b8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{65bfb828-6ca9-4663-a85c-5e8211d1d8f1}</UniqueIdentifier>
+      <UniqueIdentifier>{5a30c806-beb9-429b-b435-23c284e2bd9e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{a094b222-f606-4d9f-a447-bc80a4f37a2a}</UniqueIdentifier>
+      <UniqueIdentifier>{2fd504a3-8dd8-4236-8277-f7370c99a6ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{ae4df5ff-4dc0-416d-95a2-94d1954639a1}</UniqueIdentifier>
+      <UniqueIdentifier>{ef9093b3-204f-4590-afd8-8e1f360ad64f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -212,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
diff --git a/Data/Data_x64_vs120.vcxproj b/Data/Data_x64_vs120.vcxproj
index 9a95537a33..75d41a25b4 100644
--- a/Data/Data_x64_vs120.vcxproj
+++ b/Data/Data_x64_vs120.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|x64">
@@ -32,7 +32,7 @@
     <RootNamespace>Data</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -63,27 +63,27 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoData64d</TargetName>
@@ -132,7 +132,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -164,9 +164,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -195,7 +195,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <ProgramDataBaseFileName>..\lib64\PocoDatamtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -221,9 +221,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -244,7 +244,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <ProgramDataBaseFileName>..\lib64\PocoDatamdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -270,9 +270,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader />
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -281,95 +281,95 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Data\AbstractBinder.h" />
-    <ClInclude Include="include\Poco\Data\AbstractBinding.h" />
-    <ClInclude Include="include\Poco\Data\AbstractExtraction.h" />
-    <ClInclude Include="include\Poco\Data\AbstractExtractor.h" />
-    <ClInclude Include="include\Poco\Data\AbstractPreparation.h" />
-    <ClInclude Include="include\Poco\Data\AbstractPreparator.h" />
-    <ClInclude Include="include\Poco\Data\AbstractSessionImpl.h" />
-    <ClInclude Include="include\Poco\Data\ArchiveStrategy.h" />
-    <ClInclude Include="include\Poco\Data\AutoTransaction.h" />
-    <ClInclude Include="include\Poco\Data\Binding.h" />
-    <ClInclude Include="include\Poco\Data\Bulk.h" />
-    <ClInclude Include="include\Poco\Data\BulkBinding.h" />
-    <ClInclude Include="include\Poco\Data\BulkExtraction.h" />
-    <ClInclude Include="include\Poco\Data\Column.h" />
-    <ClInclude Include="include\Poco\Data\Connector.h" />
-    <ClInclude Include="include\Poco\Data\Constants.h" />
-    <ClInclude Include="include\Poco\Data\Data.h" />
-    <ClInclude Include="include\Poco\Data\DataException.h" />
-    <ClInclude Include="include\Poco\Data\Date.h" />
-    <ClInclude Include="include\Poco\Data\DynamicDateTime.h" />
-    <ClInclude Include="include\Poco\Data\DynamicLOB.h" />
-    <ClInclude Include="include\Poco\Data\Extraction.h" />
-    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h" />
-    <ClInclude Include="include\Poco\Data\Limit.h" />
-    <ClInclude Include="include\Poco\Data\LOB.h" />
-    <ClInclude Include="include\Poco\Data\LOBStream.h" />
-    <ClInclude Include="include\Poco\Data\MetaColumn.h" />
-    <ClInclude Include="include\Poco\Data\PooledSessionHolder.h" />
-    <ClInclude Include="include\Poco\Data\PooledSessionImpl.h" />
-    <ClInclude Include="include\Poco\Data\Position.h" />
-    <ClInclude Include="include\Poco\data\Preparation.h" />
-    <ClInclude Include="include\Poco\Data\Range.h" />
-    <ClInclude Include="include\Poco\Data\RecordSet.h" />
-    <ClInclude Include="include\Poco\Data\Row.h" />
-    <ClInclude Include="include\Poco\Data\RowFilter.h" />
-    <ClInclude Include="include\Poco\Data\RowFormatter.h" />
-    <ClInclude Include="include\Poco\Data\RowIterator.h" />
-    <ClInclude Include="include\Poco\Data\Session.h" />
-    <ClInclude Include="include\Poco\Data\SessionFactory.h" />
-    <ClInclude Include="include\Poco\Data\SessionImpl.h" />
-    <ClInclude Include="include\Poco\Data\SessionPool.h" />
-    <ClInclude Include="include\Poco\Data\SessionPoolContainer.h" />
-    <ClInclude Include="include\Poco\Data\SimpleRowFormatter.h" />
-    <ClInclude Include="include\Poco\Data\SQLChannel.h" />
-    <ClInclude Include="include\Poco\Data\Statement.h" />
-    <ClInclude Include="include\Poco\Data\StatementCreator.h" />
-    <ClInclude Include="include\Poco\Data\StatementImpl.h" />
-    <ClInclude Include="include\Poco\Data\Time.h" />
-    <ClInclude Include="include\Poco\Data\Transaction.h" />
-    <ClInclude Include="include\Poco\Data\TypeHandler.h" />
+    <ClInclude Include="include\Poco\Data\AbstractBinder.h"/>
+    <ClInclude Include="include\Poco\Data\AbstractBinding.h"/>
+    <ClInclude Include="include\Poco\Data\AbstractExtraction.h"/>
+    <ClInclude Include="include\Poco\Data\AbstractExtractor.h"/>
+    <ClInclude Include="include\Poco\Data\AbstractPreparation.h"/>
+    <ClInclude Include="include\Poco\Data\AbstractPreparator.h"/>
+    <ClInclude Include="include\Poco\Data\AbstractSessionImpl.h"/>
+    <ClInclude Include="include\Poco\Data\ArchiveStrategy.h"/>
+    <ClInclude Include="include\Poco\Data\AutoTransaction.h"/>
+    <ClInclude Include="include\Poco\Data\Binding.h"/>
+    <ClInclude Include="include\Poco\Data\Bulk.h"/>
+    <ClInclude Include="include\Poco\Data\BulkBinding.h"/>
+    <ClInclude Include="include\Poco\Data\BulkExtraction.h"/>
+    <ClInclude Include="include\Poco\Data\Column.h"/>
+    <ClInclude Include="include\Poco\Data\Connector.h"/>
+    <ClInclude Include="include\Poco\Data\Constants.h"/>
+    <ClInclude Include="include\Poco\Data\Data.h"/>
+    <ClInclude Include="include\Poco\Data\DataException.h"/>
+    <ClInclude Include="include\Poco\Data\Date.h"/>
+    <ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
+    <ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
+    <ClInclude Include="include\Poco\Data\Extraction.h"/>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
+    <ClInclude Include="include\Poco\Data\Limit.h"/>
+    <ClInclude Include="include\Poco\Data\LOB.h"/>
+    <ClInclude Include="include\Poco\Data\LOBStream.h"/>
+    <ClInclude Include="include\Poco\Data\MetaColumn.h"/>
+    <ClInclude Include="include\Poco\Data\PooledSessionHolder.h"/>
+    <ClInclude Include="include\Poco\Data\PooledSessionImpl.h"/>
+    <ClInclude Include="include\Poco\Data\Position.h"/>
+    <ClInclude Include="include\Poco\data\Preparation.h"/>
+    <ClInclude Include="include\Poco\Data\Range.h"/>
+    <ClInclude Include="include\Poco\Data\RecordSet.h"/>
+    <ClInclude Include="include\Poco\Data\Row.h"/>
+    <ClInclude Include="include\Poco\Data\RowFilter.h"/>
+    <ClInclude Include="include\Poco\Data\RowFormatter.h"/>
+    <ClInclude Include="include\Poco\Data\RowIterator.h"/>
+    <ClInclude Include="include\Poco\Data\Session.h"/>
+    <ClInclude Include="include\Poco\Data\SessionFactory.h"/>
+    <ClInclude Include="include\Poco\Data\SessionImpl.h"/>
+    <ClInclude Include="include\Poco\Data\SessionPool.h"/>
+    <ClInclude Include="include\Poco\Data\SessionPoolContainer.h"/>
+    <ClInclude Include="include\Poco\Data\SimpleRowFormatter.h"/>
+    <ClInclude Include="include\Poco\Data\SQLChannel.h"/>
+    <ClInclude Include="include\Poco\Data\Statement.h"/>
+    <ClInclude Include="include\Poco\Data\StatementCreator.h"/>
+    <ClInclude Include="include\Poco\Data\StatementImpl.h"/>
+    <ClInclude Include="include\Poco\Data\Time.h"/>
+    <ClInclude Include="include\Poco\Data\Transaction.h"/>
+    <ClInclude Include="include\Poco\Data\TypeHandler.h"/>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\AbstractBinder.cpp" />
-    <ClCompile Include="src\AbstractBinding.cpp" />
-    <ClCompile Include="src\AbstractExtraction.cpp" />
-    <ClCompile Include="src\AbstractExtractor.cpp" />
-    <ClCompile Include="src\AbstractPreparation.cpp" />
-    <ClCompile Include="src\AbstractPreparator.cpp" />
-    <ClCompile Include="src\ArchiveStrategy.cpp" />
-    <ClCompile Include="src\Bulk.cpp" />
-    <ClCompile Include="src\Connector.cpp" />
-    <ClCompile Include="src\DataException.cpp" />
-    <ClCompile Include="src\Date.cpp" />
-    <ClCompile Include="src\DynamicLOB.cpp" />
-    <ClCompile Include="src\JSONRowFormatter.cpp" />
-    <ClCompile Include="src\Limit.cpp" />
-    <ClCompile Include="src\MetaColumn.cpp" />
-    <ClCompile Include="src\PooledSessionHolder.cpp" />
-    <ClCompile Include="src\PooledSessionImpl.cpp" />
-    <ClCompile Include="src\Position.cpp" />
-    <ClCompile Include="src\Range.cpp" />
-    <ClCompile Include="src\RecordSet.cpp" />
-    <ClCompile Include="src\Row.cpp" />
-    <ClCompile Include="src\RowFilter.cpp" />
-    <ClCompile Include="src\RowFormatter.cpp" />
-    <ClCompile Include="src\RowIterator.cpp" />
-    <ClCompile Include="src\Session.cpp" />
-    <ClCompile Include="src\SessionFactory.cpp" />
-    <ClCompile Include="src\SessionImpl.cpp" />
-    <ClCompile Include="src\SessionPool.cpp" />
-    <ClCompile Include="src\SessionPoolContainer.cpp" />
-    <ClCompile Include="src\SimpleRowFormatter.cpp" />
-    <ClCompile Include="src\SQLChannel.cpp" />
-    <ClCompile Include="src\Statement.cpp" />
-    <ClCompile Include="src\StatementCreator.cpp" />
-    <ClCompile Include="src\StatementImpl.cpp" />
-    <ClCompile Include="src\Time.cpp" />
-    <ClCompile Include="src\Transaction.cpp" />
+    <ClCompile Include="src\AbstractBinder.cpp"/>
+    <ClCompile Include="src\AbstractBinding.cpp"/>
+    <ClCompile Include="src\AbstractExtraction.cpp"/>
+    <ClCompile Include="src\AbstractExtractor.cpp"/>
+    <ClCompile Include="src\AbstractPreparation.cpp"/>
+    <ClCompile Include="src\AbstractPreparator.cpp"/>
+    <ClCompile Include="src\ArchiveStrategy.cpp"/>
+    <ClCompile Include="src\Bulk.cpp"/>
+    <ClCompile Include="src\Connector.cpp"/>
+    <ClCompile Include="src\DataException.cpp"/>
+    <ClCompile Include="src\Date.cpp"/>
+    <ClCompile Include="src\DynamicLOB.cpp"/>
+    <ClCompile Include="src\JSONRowFormatter.cpp"/>
+    <ClCompile Include="src\Limit.cpp"/>
+    <ClCompile Include="src\MetaColumn.cpp"/>
+    <ClCompile Include="src\PooledSessionHolder.cpp"/>
+    <ClCompile Include="src\PooledSessionImpl.cpp"/>
+    <ClCompile Include="src\Position.cpp"/>
+    <ClCompile Include="src\Range.cpp"/>
+    <ClCompile Include="src\RecordSet.cpp"/>
+    <ClCompile Include="src\Row.cpp"/>
+    <ClCompile Include="src\RowFilter.cpp"/>
+    <ClCompile Include="src\RowFormatter.cpp"/>
+    <ClCompile Include="src\RowIterator.cpp"/>
+    <ClCompile Include="src\Session.cpp"/>
+    <ClCompile Include="src\SessionFactory.cpp"/>
+    <ClCompile Include="src\SessionImpl.cpp"/>
+    <ClCompile Include="src\SessionPool.cpp"/>
+    <ClCompile Include="src\SessionPoolContainer.cpp"/>
+    <ClCompile Include="src\SimpleRowFormatter.cpp"/>
+    <ClCompile Include="src\SQLChannel.cpp"/>
+    <ClCompile Include="src\Statement.cpp"/>
+    <ClCompile Include="src\StatementCreator.cpp"/>
+    <ClCompile Include="src\StatementImpl.cpp"/>
+    <ClCompile Include="src\Time.cpp"/>
+    <ClCompile Include="src\Transaction.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/Data/Data_x64_vs120.vcxproj.filters b/Data/Data_x64_vs120.vcxproj.filters
index 23f6e42ad0..4e03cefab7 100644
--- a/Data/Data_x64_vs120.vcxproj.filters
+++ b/Data/Data_x64_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DataCore">
-      <UniqueIdentifier>{3db17930-0098-4c7c-9ffc-308de3b05863}</UniqueIdentifier>
+      <UniqueIdentifier>{03057cf0-0a45-4f05-b3f1-49efe69676b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Header Files">
-      <UniqueIdentifier>{e6d79dca-ec63-42f2-a2aa-29d02a26bb3f}</UniqueIdentifier>
+      <UniqueIdentifier>{3ab9e6b0-fe0f-459c-8a11-e5abab3ba5e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="DataCore\Source Files">
-      <UniqueIdentifier>{412f4b4c-ccc2-4147-bcbc-db67fcd992df}</UniqueIdentifier>
+      <UniqueIdentifier>{f65032c5-960b-4de0-a633-4e866549ede3}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling">
-      <UniqueIdentifier>{ec157c71-4d2c-4052-97ce-5d2f1de40122}</UniqueIdentifier>
+      <UniqueIdentifier>{4ad5318f-4fd1-40cc-8ab7-b793d43f7235}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Header Files">
-      <UniqueIdentifier>{ff5a6a54-6d9b-4fc8-8350-c1f54c789295}</UniqueIdentifier>
+      <UniqueIdentifier>{958bdce1-8813-4dc8-9b20-f66ac7489960}</UniqueIdentifier>
     </Filter>
     <Filter Include="SessionPooling\Source Files">
-      <UniqueIdentifier>{db703cd2-b565-4058-8b67-5ae8606163c1}</UniqueIdentifier>
+      <UniqueIdentifier>{5439178f-11b9-4417-bbe3-55840d9e4676}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{1a9e7bc5-1910-4cf2-a681-9965d08553d6}</UniqueIdentifier>
+      <UniqueIdentifier>{e7d1d571-4a86-4db3-8689-5c16fce4db5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{208ef637-6927-40ca-9e0c-2b60bbc81129}</UniqueIdentifier>
+      <UniqueIdentifier>{8632f9be-aff4-4f36-8d38-9a0d7ea6aa3f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{734e9191-0bec-46c5-b757-20a997803fec}</UniqueIdentifier>
+      <UniqueIdentifier>{433c5e7f-11d4-415f-8640-1e2d0b75af57}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,6 +93,9 @@
     <ClInclude Include="include\Poco\Data\Extraction.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
+      <Filter>DataCore\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Data\Limit.h">
       <Filter>DataCore\Header Files</Filter>
     </ClInclude>
@@ -177,9 +180,6 @@
     <ClInclude Include="include\Poco\Data\SQLChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
-      <Filter>DataCore\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AbstractBinder.cpp">
@@ -215,6 +215,9 @@
     <ClCompile Include="src\DynamicLOB.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONRowFormatter.cpp">
+      <Filter>DataCore\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Limit.cpp">
       <Filter>DataCore\Source Files</Filter>
     </ClCompile>
@@ -287,8 +290,5 @@
     <ClCompile Include="src\SQLChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\JSONRowFormatter.cpp">
-      <Filter>DataCore\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Data/Data_x64_vs90.vcproj b/Data/Data_x64_vs90.vcproj
index 87ca5e1a3c..4e4a254d62 100644
--- a/Data/Data_x64_vs90.vcproj
+++ b/Data/Data_x64_vs90.vcproj
@@ -439,6 +439,8 @@
 					RelativePath=".\include\Poco\Data\DynamicLOB.h"/>
 				<File
 					RelativePath=".\include\Poco\Data\Extraction.h"/>
+				<File
+					RelativePath=".\include\Poco\Data\JSONRowFormatter.h"/>
 				<File
 					RelativePath=".\include\Poco\Data\Limit.h"/>
 				<File
@@ -508,6 +510,8 @@
 					RelativePath=".\src\Date.cpp"/>
 				<File
 					RelativePath=".\src\DynamicLOB.cpp"/>
+				<File
+					RelativePath=".\src\JSONRowFormatter.cpp"/>
 				<File
 					RelativePath=".\src\Limit.cpp"/>
 				<File
diff --git a/Data/ODBC/ODBC.make b/Data/ODBC/ODBC.make
index 81805dab10..13c7fc197b 100644
--- a/Data/ODBC/ODBC.make
+++ b/Data/ODBC/ODBC.make
@@ -58,6 +58,6 @@ COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
 COMMONFLAGS += -Wno-deprecated-declarations
 
 else
-$(error No ODBC library found. Please install unixODBC or iODBC or specify POCO_ODBC_LIB and try again)
+$(error No ODBC library found. Please install unixODBC or iODBC or specify POCO_ODBC_LIB or set the correct libodbc library path by using --odbc-lib as option to 'configure' script and try again)
 endif
 
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
index 90243a1f62..d51de92d8e 100644
--- a/Foundation/CMakeLists.txt
+++ b/Foundation/CMakeLists.txt
@@ -22,14 +22,14 @@ POCO_HEADERS_AUTO( SRCS include/Poco/AndroidLogChannel.h )
 # For Windows CE we need to disable these
 if(WINCE)
 POCO_SOURCES_AUTO_PLAT( SRCS OFF
-    src/WindowsConsoleChannel.cpp
-    src/EventLogChannel.cpp
-    )
+	src/WindowsConsoleChannel.cpp
+	src/EventLogChannel.cpp
+	)
 else()
 POCO_SOURCES_AUTO_PLAT( SRCS WIN32
-    src/WindowsConsoleChannel.cpp
-    src/EventLogChannel.cpp
-    )
+	src/WindowsConsoleChannel.cpp
+	src/EventLogChannel.cpp
+	)
 endif()
 
 # Messages
@@ -38,97 +38,138 @@ POCO_MESSAGES( SRCS Logging src/pocomsg.mc)
 # If POCO_UNBUNDLED is enabled we try to find the required packages
 # The configuration will fail if the packages are not found
 if (POCO_UNBUNDLED)
-    find_package(PCRE REQUIRED)
-    set(SYSLIBS ${SYSLIBS} ${PCRE_LIBRARIES})
-    include_directories(${PCRE_INCLUDE_DIRS})
-
-    #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library
-    POCO_SOURCES( SRCS RegExp
-        src/pcre_ucd.c
-        src/pcre_tables.c
-    )
-
-    find_package(ZLIB REQUIRED)
-    set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES})
-    include_directories(${ZLIB_INCLUDE_DIRS})
+	find_package(PCRE REQUIRED)
+	set(SYSLIBS ${SYSLIBS} ${PCRE_LIBRARIES})
+	include_directories(${PCRE_INCLUDE_DIRS})
+
+	#HACK: Unicode.cpp requires functions from these files. The can't be taken from the library
+	POCO_SOURCES( SRCS RegExp
+		src/pcre_ucd.c
+		src/pcre_tables.c
+	)
+
+	find_package(ZLIB REQUIRED)
+	set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES})
+	include_directories(${ZLIB_INCLUDE_DIRS})
 else()
-    # pcre
-    POCO_SOURCES( SRCS pcre
-        src/pcre_config.c
-        src/pcre_byte_order.c
-        src/pcre_chartables.c
-        src/pcre_compile.c
-        src/pcre_exec.c
-        src/pcre_fullinfo.c
-        src/pcre_globals.c
-        src/pcre_maketables.c
-        src/pcre_newline.c
-        src/pcre_ord2utf8.c
-        src/pcre_study.c
-        src/pcre_tables.c
-        src/pcre_dfa_exec.c
-        src/pcre_get.c
-        src/pcre_jit_compile.c
-        src/pcre_refcount.c
-        src/pcre_string_utils.c
-        src/pcre_version.c
-        src/pcre_ucd.c
-        src/pcre_valid_utf8.c
-        src/pcre_xclass.c
-    )
-
-    # zlib
-    POCO_HEADERS( SRCS zlib
-        include/Poco/zconf.h
-        include/Poco/zlib.h
-        )
-
-    POCO_SOURCES( SRCS zlib
-        src/adler32.c
-        src/compress.c
-        src/crc32.c
-        src/deflate.c
-        src/infback.c
-        src/inffast.c
-        src/inflate.c
-        src/inftrees.c
-        src/trees.c
-        src/zutil.c
-    )
+	# pcre
+	POCO_SOURCES( SRCS pcre
+		src/pcre_config.c
+		src/pcre_byte_order.c
+		src/pcre_chartables.c
+		src/pcre_compile.c
+		src/pcre_exec.c
+		src/pcre_fullinfo.c
+		src/pcre_globals.c
+		src/pcre_maketables.c
+		src/pcre_newline.c
+		src/pcre_ord2utf8.c
+		src/pcre_study.c
+		src/pcre_tables.c
+		src/pcre_dfa_exec.c
+		src/pcre_get.c
+		src/pcre_jit_compile.c
+		src/pcre_refcount.c
+		src/pcre_string_utils.c
+		src/pcre_version.c
+		src/pcre_ucd.c
+		src/pcre_valid_utf8.c
+		src/pcre_xclass.c
+	)
+
+	# zlib
+	POCO_HEADERS( SRCS zlib
+		include/Poco/zconf.h
+		include/Poco/zlib.h
+		)
+
+	POCO_SOURCES( SRCS zlib
+		src/adler32.c
+		src/compress.c
+		src/crc32.c
+		src/deflate.c
+		src/infback.c
+		src/inffast.c
+		src/inflate.c
+		src/inftrees.c
+		src/trees.c
+		src/zutil.c
+	)
 endif (POCO_UNBUNDLED)
 
 if(WIN32)
-    set(SYSLIBS ${SYSLIBS} iphlpapi)
+	set(SYSLIBS ${SYSLIBS} iphlpapi)
 endif(WIN32)
 if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
-    set_target_properties( "${LIBNAME}" PROPERTIES LINK_FLAGS "-library=stlport4")
+	set_target_properties( "${LIBNAME}" PROPERTIES LINK_FLAGS "-library=stlport4")
 endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
 
 # TODO: Why is this here?
 add_definitions( -DPCRE_STATIC)
 
+# For SetAffinity
+if(UNIX AND NOT APPLE)
+	INCLUDE (CheckFunctionExists)
+	INCLUDE (CheckCXXSourceCompiles)
+	INCLUDE (CheckLibraryExists)
+	CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "pthread.h" HAVE_PTHREAD_SETAFFINITY_NP)
+	#set(CMAKE_EXTRA_INCLUDE_FILES pthread.h)
+	#CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP)
+	if(NOT HAVE_PTHREAD_SETAFFINITY_NP)
+		message(STATUS "Platform has not PTHREAD_SETAFFINITY_NP")
+	else(HAVE_PTHREAD_SETAFFINITY_NP)
+		add_definitions(-DHAVE_PTHREAD_SETAFFINITY_NP)
+		CHECK_CXX_SOURCE_COMPILES("
+		#include <sched.h>
+		int main() {
+			cpu_set_t cpumask;
+			sched_setaffinity( 0, sizeof(cpumask), &cpumask );
+			return 0;
+		}" HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+
+		if(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+			message(STATUS "Platform has THREE PARAM at PTHREAD_SETAFFINITY_NP")
+			add_definitions(-DHAVE_THREE_PARAM_SCHED_SETAFFINITY)
+		else(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+			CHECK_CXX_SOURCE_COMPILES("
+			#include <sched.h>
+			int main() {
+				cpu_set_t cpumask;
+				sched_setaffinity( 0, &cpumask );
+				return 0;
+			}" HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+
+			if(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+				message(STATUS "Platform has TWO PARAM at PTHREAD_SETAFFINITY_NP")
+				add_definitions(-DHAVE_TWO_PARAM_SCHED_SETAFFINITY)
+			endif(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+
+		endif(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+	endif(NOT HAVE_PTHREAD_SETAFFINITY_NP)
+endif(UNIX AND NOT APPLE)
+
 add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS})
 add_library( "${POCO_LIBNAME}" ALIAS "${LIBNAME}")
 set_target_properties( "${LIBNAME}"
-    PROPERTIES
-    VERSION ${PROJECT_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
-    OUTPUT_NAME ${POCO_LIBNAME}
-    DEFINE_SYMBOL Foundation_EXPORTS
-    )
+	PROPERTIES
+	VERSION ${PROJECT_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
+	OUTPUT_NAME ${POCO_LIBNAME}
+	DEFINE_SYMBOL Foundation_EXPORTS
+	)
 
 target_link_libraries( "${LIBNAME}" ${SYSLIBS})
 target_include_directories( "${LIBNAME}"
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:include>
-    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
-    )
+	PUBLIC
+		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+		$<INSTALL_INTERFACE:include>
+	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
+	)
 
 POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-    add_subdirectory( samples )
-    add_subdirectory( testsuite )
+	add_subdirectory( samples )
+	add_subdirectory( testsuite )
 endif ()
 
diff --git a/Foundation/Foundation.progen b/Foundation/Foundation.progen
new file mode 100644
index 0000000000..9e457f28c2
--- /dev/null
+++ b/Foundation/Foundation.progen
@@ -0,0 +1,19 @@
+vc.project.guid = B01196CC-B693-4548-8464-2FF60499E73F
+vc.project.name = Foundation
+vc.project.target = Poco${vc.project.name}
+vc.project.type = library
+vc.project.pocobase = ..
+vc.project.outdir = ${vc.project.pocobase}
+vc.project.platforms = Win32, x64, WinCE
+vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
+vc.project.prototype = ${vc.project.name}_vs90.vcproj
+vc.project.compiler.include = 
+vc.project.compiler.defines = 
+vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
+vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
+vc.project.linker.dependencies.x64 = iphlpapi.lib
+vc.project.linker.dependencies.WinCE = iphlpapi.lib
+vc.solution.create = true
+vc.solution.include = testsuite\\TestSuite
diff --git a/Foundation/Foundation_CE_vs90.sln b/Foundation/Foundation_CE_vs90.sln
index f22ac1b633..8874d73f43 100644
--- a/Foundation/Foundation_CE_vs90.sln
+++ b/Foundation/Foundation_CE_vs90.sln
@@ -1,105 +1,58 @@
-
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_CE_vs90.vcproj", "{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_CE_vs90.vcproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_CE_vs90.vcproj", "{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021} = {6B7B98F8-C08B-4DD7-985F-6A101FEFB021}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_CE_vs90.vcproj", "{C383A3C0-989A-4A03-B54D-7A850ED786C9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021} = {6B7B98F8-C08B-4DD7-985F-6A101FEFB021}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_CE_vs90.vcproj", "{483CB510-16C7-4C85-86B7-D79119C4A0FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021} = {6B7B98F8-C08B-4DD7-985F-6A101FEFB021}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I)
-		debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I)
-		debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I)
 		release_shared|Digi JumpStart (ARMV4I) = release_shared|Digi JumpStart (ARMV4I)
-		release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I)
+		debug_static_mt|Digi JumpStart (ARMV4I) = debug_static_mt|Digi JumpStart (ARMV4I)
 		release_static_mt|Digi JumpStart (ARMV4I) = release_static_mt|Digi JumpStart (ARMV4I)
+		debug_static_md|Digi JumpStart (ARMV4I) = debug_static_md|Digi JumpStart (ARMV4I)
+		release_static_md|Digi JumpStart (ARMV4I) = release_static_md|Digi JumpStart (ARMV4I)
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I)
-		{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I)
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I)
-		{C383A3C0-989A-4A03-B54D-7A850ED786C9}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I)
-		{483CB510-16C7-4C85-86B7-D79119C4A0FB}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I)
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I)
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I)
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_CE_vs90.vcproj b/Foundation/Foundation_CE_vs90.vcproj
index 7046ec9646..d42741aa30 100644
--- a/Foundation/Foundation_CE_vs90.vcproj
+++ b/Foundation/Foundation_CE_vs90.vcproj
@@ -1,50 +1,40 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
 	Name="Foundation"
-	ProjectGUID="{6B7B98F8-C08B-4DD7-985F-6A101FEFB021}"
+	Version="9.00"
+	ProjectType="Visual C++"
+	ProjectGUID="{B01196CC-B693-4548-8464-2FF60499E73F}"
 	RootNamespace="Foundation"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Digi JumpStart (ARMV4I)"
-		/>
+			Name="Digi JumpStart (ARMV4I)"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
+	<ToolFiles/>
 	<Configurations>
 		<Configuration
 			Name="debug_shared|Digi JumpStart (ARMV4I)"
-			OutputDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
+				TargetEnvironment="1"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include;.\wcelibcex-1.0\src"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;PCRE_STATIC;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Foundation_EXPORTS"
 				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="3"
@@ -52,96 +42,79 @@
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4800"
+				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
 				InterworkCalls="false"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"
-			/>
+				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/FORCE:MULTIPLE "
 				AdditionalDependencies="iphlpapi.lib"
-				OutputFile="..\bin\$(PlatformName)\Poco$(ProjectName)d.dll"
+				OutputFile="..\bin\$(PlatformName)\PocoFoundationd.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib\$(PlatformName)"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\$(PlatformName)\Poco$(ProjectName)d.pdb"
+				ProgramDatabaseFile="..\bin\$(PlatformName)\PocoFoundationd.pdb"
 				SubSystem="0"
 				StackReserveSize="65536"
 				StackCommitSize="4096"
 				OptimizeReferences="0"
 				EnableCOMDATFolding="0"
 				RandomizedBaseAddress="1"
-				ImportLibrary="..\lib\$(PlatformName)\Poco$(ProjectName)d.lib"
-				TargetMachine="0"
-			/>
+				ImportLibrary="..\lib\$(PlatformName)\PocoFoundationd.lib"
+				TargetMachine="0"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCCodeSignTool"
-			/>
+				Name="VCCodeSignTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<DeploymentTool
 				ForceDirty="-1"
 				RemoteDirectory=""
 				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
+				AdditionalFiles=""/>
+			<DebuggerTool/>
 		</Configuration>
 		<Configuration
 			Name="release_shared|Digi JumpStart (ARMV4I)"
-			OutputDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
+				TargetEnvironment="1"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="4"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".\include;.\wcelibcex-1.0\src"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;PCRE_STATIC;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Foundation_EXPORTS"
 				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
@@ -149,24 +122,22 @@
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4800"
+				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
 				InterworkCalls="false"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"
-			/>
+				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/FORCE:MULTIPLE "
 				AdditionalDependencies="iphlpapi.lib"
-				OutputFile="..\bin\$(PlatformName)\Poco$(ProjectName).dll"
+				OutputFile="..\bin\$(PlatformName)\PocoFoundation.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib\$(PlatformName)"
 				GenerateManifest="true"
@@ -177,150 +148,117 @@
 				StackCommitSize="4096"
 				OptimizeReferences="0"
 				EnableCOMDATFolding="0"
-				ImportLibrary="..\lib\$(PlatformName)\Poco$(ProjectName).lib"
-				TargetMachine="0"
-			/>
+				ImportLibrary="..\lib\$(PlatformName)\PocoFoundation.lib"
+				TargetMachine="0"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCCodeSignTool"
-			/>
+				Name="VCCodeSignTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<DeploymentTool
 				ForceDirty="-1"
 				RemoteDirectory=""
 				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
+				AdditionalFiles=""/>
+			<DebuggerTool/>
 		</Configuration>
 		<Configuration
 			Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-			OutputDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
+				TargetEnvironment="1"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include;.\wcelibcex-1.0\src"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;PCRE_STATIC;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;"
 				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="1"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoFoundationmtd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4800"
+				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
 				InterworkCalls="false"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\Poco$(ProjectName)mtd.lib"
-			/>
+				OutputFile="..\lib\$(PlatformName)\PocoFoundationmtd.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCCodeSignTool"
-			/>
+				Name="VCCodeSignTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<DeploymentTool
 				ForceDirty="-1"
 				RemoteDirectory=""
 				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
+				AdditionalFiles=""/>
+			<DebuggerTool/>
 		</Configuration>
 		<Configuration
 			Name="release_static_mt|Digi JumpStart (ARMV4I)"
-			OutputDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
+				TargetEnvironment="1"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="4"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".\include;.\wcelibcex-1.0\src"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;PCRE_STATIC;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;"
 				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="0"
@@ -330,165 +268,128 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4800"
+				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
 				InterworkCalls="false"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\Poco$(ProjectName)mt.lib"
-			/>
+				OutputFile="..\lib\$(PlatformName)\PocoFoundationmt.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCCodeSignTool"
-			/>
+				Name="VCCodeSignTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<DeploymentTool
 				ForceDirty="-1"
 				RemoteDirectory=""
 				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
+				AdditionalFiles=""/>
+			<DebuggerTool/>
 		</Configuration>
 		<Configuration
 			Name="debug_static_md|Digi JumpStart (ARMV4I)"
-			OutputDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
+				TargetEnvironment="1"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include;.\wcelibcex-1.0\src"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;PCRE_STATIC;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;"
 				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoFoundationmdd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4800"
+				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
 				InterworkCalls="false"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\Poco$(ProjectName)mdd.lib"
-			/>
+				OutputFile="..\lib\$(PlatformName)\PocoFoundationmdd.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCCodeSignTool"
-			/>
+				Name="VCCodeSignTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<DeploymentTool
 				ForceDirty="-1"
 				RemoteDirectory=""
 				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
+				AdditionalFiles=""/>
+			<DebuggerTool/>
 		</Configuration>
 		<Configuration
 			Name="release_static_md|Digi JumpStart (ARMV4I)"
-			OutputDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
+				TargetEnvironment="1"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="4"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".\include;.\wcelibcex-1.0\src"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;PCRE_STATIC;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;"
 				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
@@ -498,6384 +399,3937 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4800"
+				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
 				InterworkCalls="false"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\Poco$(ProjectName)md.lib"
-			/>
+				OutputFile="..\lib\$(PlatformName)\PocoFoundationmd.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCCodeSignTool"
-			/>
+				Name="VCCodeSignTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<DeploymentTool
 				ForceDirty="-1"
 				RemoteDirectory=""
 				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
+				AdditionalFiles=""/>
+			<DebuggerTool/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
+	<References/>
 	<Files>
 		<Filter
-			Name="Streams"
-			>
+			Name="Core">
 			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\Base32Decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Base32Encoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Base64Decoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Base64Encoder.cpp"
-					>
-				</File>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\BinaryReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\BinaryWriter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\CountingStream.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DeflatingStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\Ascii.cpp"/>
 				<File
-					RelativePath=".\src\FIFOBufferStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\AtomicCounter.cpp"/>
 				<File
-					RelativePath=".\src\FileStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\Bugcheck.cpp"/>
 				<File
-					RelativePath=".\src\FileStream_POSIX.cpp"
-					>
+					RelativePath=".\src\ByteOrder.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FileStream_WIN32.cpp"
-					>
+					RelativePath=".\src\Checksum.cpp"/>
+				<File
+					RelativePath=".\src\Debugger.cpp"/>
+				<File
+					RelativePath=".\src\DirectoryIteratorStrategy.cpp"/>
+				<File
+					RelativePath=".\src\Environment.cpp"/>
+				<File
+					RelativePath=".\src\Environment_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\HexBinaryDecoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HexBinaryEncoder.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\InflatingStream.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\LineEndingConverter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\MemoryStream.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\NullStream.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\StreamCopier.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\StreamTokenizer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\TeeStream.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Token.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\Base32Decoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Base32Encoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Base64Decoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Base64Encoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\BinaryReader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\BinaryWriter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\BufferAllocator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\BufferedBidirectionalStreamBuf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\BufferedStreamBuf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\CountingStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\DeflatingStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FIFOBufferStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FileStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FileStream_POSIX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FileStream_WIN32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\HexBinaryDecoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\HexBinaryEncoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\InflatingStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\LineEndingConverter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\MemoryStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NullStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\StreamCopier.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\StreamTokenizer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\StreamUtil.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\TeeStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Token.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UnbufferedStreamBuf.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="zlib"
-				>
-				<File
-					RelativePath=".\src\adler32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\compress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\crc32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\crc32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\deflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\deflate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\infback.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\inffast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\inffast.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\inffixed.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\inflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\inflate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\inftrees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\inftrees.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\trees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\trees.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zconf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zutil.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zutil.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Threading"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\ActiveDispatcher.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Condition.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\ErrorHandler.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Event.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Event_POSIX.cpp"
-					>
+					RelativePath=".\src\Environment_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Event_WIN32.cpp"
-					>
+					RelativePath=".\src\Environment_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Mutex.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Mutex_POSIX.cpp"
-					>
+					RelativePath=".\src\Environment_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Mutex_WIN32.cpp"
-					>
+					RelativePath=".\src\Error.cpp"/>
+				<File
+					RelativePath=".\src\Exception.cpp"/>
+				<File
+					RelativePath=".\src\Format.cpp"/>
+				<File
+					RelativePath=".\src\FPEnvironment.cpp"/>
+				<File
+					RelativePath=".\src\FPEnvironment_C99.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Mutex_WINCE.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_DEC.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Runnable.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\RWLock.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\RWLock_POSIX.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\RWLock_WIN32.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_SUN.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\RWLock_WINCE.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Semaphore.cpp"
-					>
-				</File>
+					RelativePath=".\src\JSONString.cpp"/>
+				<File
+					RelativePath=".\src\MemoryPool.cpp"/>
+				<File
+					RelativePath=".\src\NestedDiagnosticContext.cpp"/>
+				<File
+					RelativePath=".\src\NumberFormatter.cpp"/>
+				<File
+					RelativePath=".\src\NumberParser.cpp"/>
+				<File
+					RelativePath=".\src\NumericString.cpp"/>
+				<File
+					RelativePath=".\src\RefCountedObject.cpp"/>
 				<File
-					RelativePath=".\src\Semaphore_POSIX.cpp"
-					>
+					RelativePath=".\src\SortedDirectoryIterator.cpp"/>
+				<File
+					RelativePath=".\src\String.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Semaphore_WIN32.cpp"
-					>
+					RelativePath=".\src\StringTokenizer.cpp"/>
+				<File
+					RelativePath=".\src\Void.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\Any.h"/>
+				<File
+					RelativePath=".\include\Poco\Ascii.h"/>
+				<File
+					RelativePath=".\include\Poco\AtomicCounter.h"/>
+				<File
+					RelativePath=".\include\Poco\AutoPtr.h"/>
+				<File
+					RelativePath=".\include\Poco\AutoReleasePool.h"/>
+				<File
+					RelativePath=".\include\Poco\Buffer.h"/>
+				<File
+					RelativePath=".\include\Poco\Bugcheck.h"/>
+				<File
+					RelativePath=".\include\Poco\ByteOrder.h"/>
+				<File
+					RelativePath=".\include\Poco\Checksum.h"/>
+				<File
+					RelativePath=".\include\Poco\Config.h"/>
+				<File
+					RelativePath=".\include\Poco\Debugger.h"/>
+				<File
+					RelativePath=".\include\Poco\DynamicAny.h"/>
+				<File
+					RelativePath=".\include\Poco\DynamicAnyHolder.h"/>
+				<File
+					RelativePath=".\include\Poco\DynamicFactory.h"/>
+				<File
+					RelativePath=".\include\Poco\Environment.h"/>
+				<File
+					RelativePath=".\include\Poco\Environment_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\Environment_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\Environment_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\Environment_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\Error.h"/>
+				<File
+					RelativePath=".\include\Poco\Exception.h"/>
+				<File
+					RelativePath=".\include\Poco\FIFOBuffer.h"/>
+				<File
+					RelativePath=".\include\Poco\Format.h"/>
+				<File
+					RelativePath=".\include\Poco\Foundation.h"/>
+				<File
+					RelativePath=".\include\Poco\FPEnvironment.h"/>
+				<File
+					RelativePath=".\include\Poco\FPEnvironment_C99.h"/>
+				<File
+					RelativePath=".\include\Poco\FPEnvironment_DEC.h"/>
+				<File
+					RelativePath=".\include\Poco\FPEnvironment_DUMMY.h"/>
+				<File
+					RelativePath=".\include\Poco\FPEnvironment_SUN.h"/>
+				<File
+					RelativePath=".\include\Poco\FPEnvironment_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\Instantiator.h"/>
+				<File
+					RelativePath=".\include\Poco\JSONString.h"/>
+				<File
+					RelativePath=".\include\Poco\MemoryPool.h"/>
+				<File
+					RelativePath=".\include\Poco\MetaProgramming.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedTuple.h"/>
+				<File
+					RelativePath=".\include\Poco\NestedDiagnosticContext.h"/>
+				<File
+					RelativePath=".\include\Poco\Nullable.h"/>
+				<File
+					RelativePath=".\include\Poco\NumberFormatter.h"/>
+				<File
+					RelativePath=".\include\Poco\NumberParser.h"/>
+				<File
+					RelativePath=".\include\Poco\NumericString.h"/>
+				<File
+					RelativePath=".\include\Poco\ObjectPool.h"/>
+				<File
+					RelativePath=".\include\Poco\Optional.h"/>
+				<File
+					RelativePath=".\include\Poco\Platform.h"/>
+				<File
+					RelativePath=".\include\Poco\Platform_POSIX.h"/>
+				<File
+					RelativePath=".\include\Poco\Platform_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\Platform_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\Poco.h"/>
+				<File
+					RelativePath=".\include\Poco\RefCountedObject.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedPtr.h"/>
+				<File
+					RelativePath=".\include\Poco\SingletonHolder.h"/>
+				<File
+					RelativePath=".\include\Poco\SortedDirectoryIterator.h"/>
+				<File
+					RelativePath=".\include\Poco\String.h"/>
+				<File
+					RelativePath=".\include\Poco\StringTokenizer.h"/>
+				<File
+					RelativePath=".\include\Poco\Tuple.h"/>
+				<File
+					RelativePath=".\include\Poco\TypeList.h"/>
+				<File
+					RelativePath=".\include\Poco\Types.h"/>
+				<File
+					RelativePath=".\include\Poco\UnWindows.h"/>
+				<File
+					RelativePath=".\include\Poco\Version.h"/>
+				<File
+					RelativePath=".\include\Poco\Void.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Streams">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\Base32Decoder.cpp"/>
+				<File
+					RelativePath=".\src\Base32Encoder.cpp"/>
+				<File
+					RelativePath=".\src\Base64Decoder.cpp"/>
+				<File
+					RelativePath=".\src\Base64Encoder.cpp"/>
+				<File
+					RelativePath=".\src\BinaryReader.cpp"/>
+				<File
+					RelativePath=".\src\BinaryWriter.cpp"/>
+				<File
+					RelativePath=".\src\CountingStream.cpp"/>
+				<File
+					RelativePath=".\src\DeflatingStream.cpp"/>
+				<File
+					RelativePath=".\src\FIFOBufferStream.cpp"/>
+				<File
+					RelativePath=".\src\FileStream.cpp"/>
+				<File
+					RelativePath=".\src\FileStream_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SignalHandler.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\SynchronizedObject.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Thread.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Thread_POSIX.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\Thread_WIN32.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\Thread_WINCE.cpp"
-					>
+					RelativePath=".\src\FileStream_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\ThreadLocal.cpp"
-					>
-				</File>
+					RelativePath=".\src\HexBinaryDecoder.cpp"/>
 				<File
-					RelativePath=".\src\ThreadPool.cpp"
-					>
-				</File>
+					RelativePath=".\src\HexBinaryEncoder.cpp"/>
 				<File
-					RelativePath=".\src\ThreadTarget.cpp"
-					>
-				</File>
+					RelativePath=".\src\InflatingStream.cpp"/>
 				<File
-					RelativePath=".\src\Timer.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
+					RelativePath=".\src\LineEndingConverter.cpp"/>
 				<File
-					RelativePath=".\include\Poco\ActiveDispatcher.h"
-					>
-				</File>
+					RelativePath=".\src\MemoryStream.cpp"/>
 				<File
-					RelativePath=".\include\Poco\ActiveMethod.h"
-					>
-				</File>
+					RelativePath=".\src\NullStream.cpp"/>
 				<File
-					RelativePath=".\include\Poco\ActiveResult.h"
-					>
-				</File>
+					RelativePath=".\src\StreamCopier.cpp"/>
 				<File
-					RelativePath=".\include\Poco\ActiveRunnable.h"
-					>
-				</File>
+					RelativePath=".\src\StreamTokenizer.cpp"/>
 				<File
-					RelativePath=".\include\Poco\ActiveStarter.h"
-					>
-				</File>
+					RelativePath=".\src\TeeStream.cpp"/>
 				<File
-					RelativePath=".\include\Poco\Activity.h"
-					>
-				</File>
+					RelativePath=".\src\Token.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Condition.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base32Decoder.h"/>
 				<File
-					RelativePath=".\include\Poco\ErrorHandler.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base32Encoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Event.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base64Decoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Event_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base64Encoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Event_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BinaryReader.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BinaryWriter.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferAllocator.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferedBidirectionalStreamBuf.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex_WINCE.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferedStreamBuf.h"/>
 				<File
-					RelativePath=".\include\Poco\Runnable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\CountingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\RunnableAdapter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DeflatingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock_WINCE.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HexBinaryDecoder.h"/>
 				<File
-					RelativePath=".\include\Poco\ScopedLock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HexBinaryEncoder.h"/>
 				<File
-					RelativePath=".\include\Poco\ScopedUnlock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\InflatingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LineEndingConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MemoryStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NullStream.h"/>
 				<File
-					RelativePath=".\include\Poco\SignalHandler.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamCopier.h"/>
 				<File
-					RelativePath=".\include\Poco\SynchronizedObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamTokenizer.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamUtil.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TeeStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Token.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread_WINCE.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnbufferedStreamBuf.h"/>
+			</Filter>
+			<Filter
+				Name="zlib">
 				<File
-					RelativePath=".\include\Poco\ThreadLocal.h"
-					>
-				</File>
+					RelativePath=".\src\adler32.c"/>
 				<File
-					RelativePath=".\include\Poco\ThreadPool.h"
-					>
-				</File>
+					RelativePath=".\src\compress.c"/>
 				<File
-					RelativePath=".\include\Poco\ThreadTarget.h"
-					>
-				</File>
+					RelativePath=".\src\crc32.c"/>
 				<File
-					RelativePath=".\include\Poco\Timer.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Crypt"
-			>
-			<Filter
-				Name="Source Files"
-				>
+					RelativePath=".\src\crc32.h"/>
 				<File
-					RelativePath=".\src\DigestEngine.cpp"
-					>
-				</File>
+					RelativePath=".\src\deflate.c"/>
 				<File
-					RelativePath=".\src\DigestStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\deflate.h"/>
 				<File
-					RelativePath=".\src\MD4Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\infback.c"/>
 				<File
-					RelativePath=".\src\MD5Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\inffast.c"/>
 				<File
-					RelativePath=".\src\Random.cpp"
-					>
-				</File>
+					RelativePath=".\src\inffast.h"/>
 				<File
-					RelativePath=".\src\RandomStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\inffixed.h"/>
 				<File
-					RelativePath=".\src\SHA1Engine.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
+					RelativePath=".\src\inflate.c"/>
 				<File
-					RelativePath=".\include\Poco\DigestEngine.h"
-					>
-				</File>
+					RelativePath=".\src\inflate.h"/>
 				<File
-					RelativePath=".\include\Poco\DigestStream.h"
-					>
-				</File>
+					RelativePath=".\src\inftrees.c"/>
 				<File
-					RelativePath=".\include\Poco\HMACEngine.h"
-					>
-				</File>
+					RelativePath=".\src\inftrees.h"/>
 				<File
-					RelativePath=".\include\Poco\MD4Engine.h"
-					>
-				</File>
+					RelativePath=".\src\trees.c"/>
 				<File
-					RelativePath=".\include\Poco\MD5Engine.h"
-					>
-				</File>
+					RelativePath=".\src\trees.h"/>
 				<File
-					RelativePath=".\include\Poco\PBKDF2Engine.h"
-					>
-				</File>
+					RelativePath=".\src\zconf.h"/>
 				<File
-					RelativePath=".\include\Poco\Random.h"
-					>
-				</File>
+					RelativePath=".\src\zlib.h"/>
 				<File
-					RelativePath=".\include\Poco\RandomStream.h"
-					>
-				</File>
+					RelativePath=".\src\zutil.c"/>
 				<File
-					RelativePath=".\include\Poco\SHA1Engine.h"
-					>
-				</File>
+					RelativePath=".\src\zutil.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="SharedLibrary"
-			>
+			Name="Threading">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Manifest.cpp"
-					>
-				</File>
+					RelativePath=".\src\ActiveDispatcher.cpp"/>
 				<File
-					RelativePath=".\src\SharedLibrary.cpp"
-					>
-				</File>
+					RelativePath=".\src\Condition.cpp"/>
+				<File
+					RelativePath=".\src\ErrorHandler.cpp"/>
+				<File
+					RelativePath=".\src\Event.cpp"/>
 				<File
-					RelativePath=".\src\SharedLibrary_HPUX.cpp"
-					>
+					RelativePath=".\src\Event_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_UNIX.cpp"
-					>
+					RelativePath=".\src\Event_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_VMS.cpp"
-					>
+					RelativePath=".\src\Mutex.cpp"/>
+				<File
+					RelativePath=".\src\Mutex_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_WIN32.cpp"
-					>
+					RelativePath=".\src\Mutex_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_WIN32U.cpp"
-					>
+					RelativePath=".\src\Runnable.cpp"/>
+				<File
+					RelativePath=".\src\RWLock.cpp"/>
+				<File
+					RelativePath=".\src\RWLock_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\ClassLibrary.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ClassLoader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Manifest.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\MetaObject.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedLibrary.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedLibrary_HPUX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedLibrary_UNIX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedLibrary_VMS.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedLibrary_WIN32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedLibrary_WIN32U.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="RegularExpression"
-			>
-			<Filter
-				Name="PCRE Header Files"
-				>
-				<File
-					RelativePath=".\src\pcre.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_config.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_internal.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\ucp.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\RegularExpression.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\RegularExpression.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="PCRE Source Files"
-				>
-				<File
-					RelativePath=".\src\pcre_chartables.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_compile.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_exec.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_fullinfo.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_globals.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_maketables.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_newline.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_ord2utf8.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_study.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_tables.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_byte_order.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_config.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_dfa_exec.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_get.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_jit_compile.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_version.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_refcount.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_string_utils.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_ucd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_valid_utf8.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pcre_xclass.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Logging"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\ArchiveStrategy.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\AsyncChannel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Channel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Configurable.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\ConsoleChannel.cpp"
-					>
-				</File>
 				<File
-					RelativePath=".\src\EventLogChannel.cpp"
-					>
+					RelativePath=".\src\RWLock_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FileChannel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Formatter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\FormattingChannel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\LogFile.cpp"
-					>
-				</File>
+					RelativePath=".\src\Semaphore.cpp"/>
 				<File
-					RelativePath=".\src\LogFile_STD.cpp"
-					>
+					RelativePath=".\src\Semaphore_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_VMS.cpp"
-					>
+					RelativePath=".\src\Semaphore_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_WIN32.cpp"
-					>
+					RelativePath=".\src\SignalHandler.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_WIN32U.cpp"
-					>
+					RelativePath=".\src\SynchronizedObject.cpp"/>
+				<File
+					RelativePath=".\src\Thread.cpp"/>
+				<File
+					RelativePath=".\src\Thread_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Logger.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\LoggingFactory.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\LoggingRegistry.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\LogStream.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Message.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\NullChannel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\OpcomChannel.cpp"
-					>
+					RelativePath=".\src\Thread_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PatternFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadLocal.cpp"/>
 				<File
-					RelativePath=".\src\PurgeStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadPool.cpp"/>
 				<File
-					RelativePath=".\src\RotateStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadTarget.cpp"/>
 				<File
-					RelativePath=".\src\SimpleFileChannel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\SplitterChannel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\StreamChannel.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\SyslogChannel.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\WindowsConsoleChannel.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
+					RelativePath=".\src\Timer.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ArchiveStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveDispatcher.h"/>
 				<File
-					RelativePath=".\include\Poco\AsyncChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveMethod.h"/>
 				<File
-					RelativePath=".\include\Poco\Channel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveResult.h"/>
 				<File
-					RelativePath=".\include\Poco\Configurable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveRunnable.h"/>
 				<File
-					RelativePath=".\include\Poco\ConsoleChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveStarter.h"/>
 				<File
-					RelativePath=".\include\Poco\EventLogChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Activity.h"/>
 				<File
-					RelativePath=".\include\Poco\FileChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Condition.h"/>
 				<File
-					RelativePath=".\include\Poco\Formatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ErrorHandler.h"/>
 				<File
-					RelativePath=".\include\Poco\FormattingChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_STD.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Logger.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Runnable.h"/>
 				<File
-					RelativePath=".\include\Poco\LoggingFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RunnableAdapter.h"/>
 				<File
-					RelativePath=".\include\Poco\LoggingRegistry.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock.h"/>
 				<File
-					RelativePath=".\include\Poco\LogStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Message.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\NullChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ScopedLock.h"/>
 				<File
-					RelativePath=".\include\Poco\OpcomChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ScopedUnlock.h"/>
 				<File
-					RelativePath=".\include\Poco\PatternFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore.h"/>
 				<File
-					RelativePath=".\src\pocomsg.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\PurgeStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\RotateStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SignalHandler.h"/>
 				<File
-					RelativePath=".\include\Poco\SimpleFileChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SynchronizedObject.h"/>
 				<File
-					RelativePath=".\include\Poco\SplitterChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\SyslogChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\WindowsConsoleChannel.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Message Files"
-				>
+					RelativePath=".\include\Poco\ThreadLocal.h"/>
 				<File
-					RelativePath=".\src\pocomsg.mc"
-					>
-				</File>
+					RelativePath=".\include\Poco\ThreadPool.h"/>
+				<File
+					RelativePath=".\include\Poco\ThreadTarget.h"/>
+				<File
+					RelativePath=".\include\Poco\Timer.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Notifications"
-			>
+			Name="Crypt">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\AbstractObserver.cpp"
-					>
-				</File>
+					RelativePath=".\src\DigestEngine.cpp"/>
 				<File
-					RelativePath=".\src\Notification.cpp"
-					>
-				</File>
+					RelativePath=".\src\DigestStream.cpp"/>
 				<File
-					RelativePath=".\src\NotificationCenter.cpp"
-					>
-				</File>
+					RelativePath=".\src\MD4Engine.cpp"/>
 				<File
-					RelativePath=".\src\NotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\MD5Engine.cpp"/>
 				<File
-					RelativePath=".\src\PriorityNotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\Random.cpp"/>
 				<File
-					RelativePath=".\src\TimedNotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\RandomStream.cpp"/>
+				<File
+					RelativePath=".\src\SHA1Engine.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\AbstractObserver.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DigestEngine.h"/>
 				<File
-					RelativePath=".\include\Poco\NObserver.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DigestStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Notification.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HMACEngine.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationCenter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MD4Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MD5Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\Observer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PBKDF2Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityNotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Random.h"/>
 				<File
-					RelativePath=".\include\Poco\TimedNotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RandomStream.h"/>
+				<File
+					RelativePath=".\include\Poco\SHA1Engine.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Filesystem"
-			>
+			Name="SharedLibrary">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\DirectoryIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\Manifest.cpp"/>
 				<File
-					RelativePath=".\src\DirectoryIterator_UNIX.cpp"
-					>
+					RelativePath=".\src\SharedLibrary.cpp"/>
+				<File
+					RelativePath=".\src\SharedLibrary_HPUX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_VMS.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_WIN32.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_WIN32U.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryWatcher.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\File.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\File_UNIX.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\ClassLibrary.h"/>
+				<File
+					RelativePath=".\include\Poco\ClassLoader.h"/>
+				<File
+					RelativePath=".\include\Poco\Manifest.h"/>
+				<File
+					RelativePath=".\include\Poco\MetaObject.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedLibrary.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedLibrary_HPUX.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedLibrary_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedLibrary_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedLibrary_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedLibrary_WIN32U.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="RegularExpression">
+			<Filter
+				Name="PCRE Header Files">
+				<File
+					RelativePath=".\src\pcre.h"/>
+				<File
+					RelativePath=".\src\pcre_config.h"/>
+				<File
+					RelativePath=".\src\pcre_internal.h"/>
+				<File
+					RelativePath=".\src\ucp.h"/>
+			</Filter>
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\RegularExpression.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\RegularExpression.h"/>
+			</Filter>
+			<Filter
+				Name="PCRE Source Files">
+				<File
+					RelativePath=".\src\pcre_byte_order.c"/>
+				<File
+					RelativePath=".\src\pcre_chartables.c"/>
+				<File
+					RelativePath=".\src\pcre_compile.c"/>
+				<File
+					RelativePath=".\src\pcre_config.c"/>
+				<File
+					RelativePath=".\src\pcre_dfa_exec.c"/>
+				<File
+					RelativePath=".\src\pcre_exec.c"/>
+				<File
+					RelativePath=".\src\pcre_fullinfo.c"/>
+				<File
+					RelativePath=".\src\pcre_get.c"/>
+				<File
+					RelativePath=".\src\pcre_globals.c"/>
+				<File
+					RelativePath=".\src\pcre_jit_compile.c"/>
+				<File
+					RelativePath=".\src\pcre_maketables.c"/>
+				<File
+					RelativePath=".\src\pcre_newline.c"/>
+				<File
+					RelativePath=".\src\pcre_ord2utf8.c"/>
+				<File
+					RelativePath=".\src\pcre_refcount.c"/>
+				<File
+					RelativePath=".\src\pcre_string_utils.c"/>
+				<File
+					RelativePath=".\src\pcre_study.c"/>
+				<File
+					RelativePath=".\src\pcre_tables.c"/>
+				<File
+					RelativePath=".\src\pcre_ucd.c"/>
+				<File
+					RelativePath=".\src\pcre_valid_utf8.c"/>
 				<File
-					RelativePath=".\src\File_VMS.cpp"
-					>
+					RelativePath=".\src\pcre_version.c"/>
+				<File
+					RelativePath=".\src\pcre_xclass.c"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Logging">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\ArchiveStrategy.cpp"/>
+				<File
+					RelativePath=".\src\AsyncChannel.cpp"/>
+				<File
+					RelativePath=".\src\Channel.cpp"/>
+				<File
+					RelativePath=".\src\Configurable.cpp"/>
+				<File
+					RelativePath=".\src\ConsoleChannel.cpp"/>
+				<File
+					RelativePath=".\src\EventLogChannel.cpp"/>
+				<File
+					RelativePath=".\src\FileChannel.cpp"/>
+				<File
+					RelativePath=".\src\Formatter.cpp"/>
+				<File
+					RelativePath=".\src\FormattingChannel.cpp"/>
+				<File
+					RelativePath=".\src\LogFile.cpp"/>
+				<File
+					RelativePath=".\src\LogFile_STD.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_WIN32.cpp"
-					>
+					RelativePath=".\src\LogFile_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_WIN32U.cpp"
-					>
+					RelativePath=".\src\LogFile_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_WINCE.cpp"
-					>
+					RelativePath=".\src\LogFile_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Glob.cpp"
-					>
-				</File>
+					RelativePath=".\src\Logger.cpp"/>
 				<File
-					RelativePath=".\src\Path.cpp"
-					>
-				</File>
+					RelativePath=".\src\LoggingFactory.cpp"/>
 				<File
-					RelativePath=".\src\Path_UNIX.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
+					RelativePath=".\src\LoggingRegistry.cpp"/>
+				<File
+					RelativePath=".\src\LogStream.cpp"/>
 				<File
-					RelativePath=".\src\Path_VMS.cpp"
-					>
+					RelativePath=".\src\Message.cpp"/>
+				<File
+					RelativePath=".\src\NullChannel.cpp"/>
+				<File
+					RelativePath=".\src\OpcomChannel.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_WIN32.cpp"
-					>
+					RelativePath=".\src\PatternFormatter.cpp"/>
+				<File
+					RelativePath=".\src\PurgeStrategy.cpp"/>
+				<File
+					RelativePath=".\src\RotateStrategy.cpp"/>
+				<File
+					RelativePath=".\src\SimpleFileChannel.cpp"/>
+				<File
+					RelativePath=".\src\SplitterChannel.cpp"/>
+				<File
+					RelativePath=".\src\StreamChannel.cpp"/>
+				<File
+					RelativePath=".\src\SyslogChannel.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_WIN32U.cpp"
-					>
+					RelativePath=".\src\WindowsConsoleChannel.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\ArchiveStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\AsyncChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\Channel.h"/>
+				<File
+					RelativePath=".\include\Poco\Configurable.h"/>
+				<File
+					RelativePath=".\include\Poco\ConsoleChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\EventLogChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\FileChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\Formatter.h"/>
+				<File
+					RelativePath=".\include\Poco\FormattingChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\LogFile.h"/>
+				<File
+					RelativePath=".\include\Poco\LogFile_STD.h"/>
+				<File
+					RelativePath=".\include\Poco\LogFile_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\LogFile_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\LogFile_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\Logger.h"/>
+				<File
+					RelativePath=".\include\Poco\LoggingFactory.h"/>
+				<File
+					RelativePath=".\include\Poco\LoggingRegistry.h"/>
+				<File
+					RelativePath=".\include\Poco\LogStream.h"/>
+				<File
+					RelativePath=".\include\Poco\Message.h"/>
+				<File
+					RelativePath=".\include\Poco\NullChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\OpcomChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\PatternFormatter.h"/>
+				<File
+					RelativePath=".\src\pocomsg.h"/>
+				<File
+					RelativePath=".\include\Poco\PurgeStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\RotateStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\SimpleFileChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\SplitterChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\StreamChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\SyslogChannel.h"/>
+				<File
+					RelativePath=".\include\Poco\WindowsConsoleChannel.h"/>
+			</Filter>
+			<Filter
+				Name="Message Files">
+				<File
+					RelativePath=".\src\pocomsg.mc">
 					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_shared|Digi JumpStart (ARMV4I)">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCustomBuildTool"
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						Name="release_shared|Digi JumpStart (ARMV4I)">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCustomBuildTool"
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Digi JumpStart (ARMV4I)">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCustomBuildTool"
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Digi JumpStart (ARMV4I)">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCustomBuildTool"
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Digi JumpStart (ARMV4I)">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCustomBuildTool"
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Digi JumpStart (ARMV4I)">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCustomBuildTool"
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 				</File>
+			</Filter>
+			<Filter
+				Name="Resource Files">
 				<File
-					RelativePath=".\src\Path_WINCE.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\TemporaryFile.cpp"
-					>
-				</File>
+					RelativePath=".\src\pocomsg.rc"/>
 			</Filter>
+		</Filter>
+		<Filter
+			Name="Notifications">
 			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\DirectoryIterator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\DirectoryIterator_UNIX.h"
-					>
-				</File>
+				Name="Source Files">
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_VMS.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\DirectoryIterator_WIN32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\DirectoryIterator_WIN32U.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\DirectoryWatcher.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\File.h"
-					>
-				</File>
+					RelativePath=".\src\AbstractObserver.cpp"/>
 				<File
-					RelativePath=".\include\Poco\File_UNIX.h"
-					>
-				</File>
+					RelativePath=".\src\Notification.cpp"/>
 				<File
-					RelativePath=".\include\Poco\File_VMS.h"
-					>
-				</File>
+					RelativePath=".\src\NotificationCenter.cpp"/>
 				<File
-					RelativePath=".\include\Poco\File_WIN32.h"
-					>
-				</File>
+					RelativePath=".\src\NotificationQueue.cpp"/>
 				<File
-					RelativePath=".\include\Poco\File_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\src\PriorityNotificationQueue.cpp"/>
 				<File
-					RelativePath=".\include\Poco\File_WINCE.h"
-					>
-				</File>
+					RelativePath=".\src\TimedNotificationQueue.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Glob.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractObserver.h"/>
 				<File
-					RelativePath=".\include\Poco\Path.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NObserver.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Notification.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationCenter.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationQueue.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Observer.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_WINCE.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityNotificationQueue.h"/>
 				<File
-					RelativePath=".\include\Poco\TemporaryFile.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TimedNotificationQueue.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Processes"
-			>
+			Name="Filesystem">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\NamedEvent.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryIterator.cpp"/>
 				<File
-					RelativePath=".\src\NamedEvent_UNIX.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_VMS.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_WIN32.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_WIN32U.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryWatcher.cpp"/>
 				<File
-					RelativePath=".\src\NamedMutex_UNIX.cpp"
-					>
+					RelativePath=".\src\File.cpp"/>
+				<File
+					RelativePath=".\src\File_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_VMS.cpp"
-					>
+					RelativePath=".\src\File_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_WIN32.cpp"
-					>
+					RelativePath=".\src\File_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_WIN32U.cpp"
-					>
+					RelativePath=".\src\File_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Pipe.cpp"
-					>
-				</File>
+					RelativePath=".\src\Glob.cpp"/>
 				<File
-					RelativePath=".\src\PipeImpl.cpp"
-					>
-				</File>
+					RelativePath=".\src\Path.cpp"/>
 				<File
-					RelativePath=".\src\PipeImpl_DUMMY.cpp"
-					>
+					RelativePath=".\src\Path_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeImpl_POSIX.cpp"
-					>
+					RelativePath=".\src\Path_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeImpl_WIN32.cpp"
-					>
+					RelativePath=".\src\Path_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeStream.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Process.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Process_UNIX.cpp"
-					>
+					RelativePath=".\src\Path_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_VMS.cpp"
-					>
+					RelativePath=".\src\TemporaryFile.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\DirectoryIterator.h"/>
+				<File
+					RelativePath=".\include\Poco\DirectoryIterator_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\DirectoryIterator_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\DirectoryIterator_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\DirectoryIterator_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\DirectoryWatcher.h"/>
+				<File
+					RelativePath=".\include\Poco\File.h"/>
+				<File
+					RelativePath=".\include\Poco\File_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\File_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\File_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\File_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\Glob.h"/>
+				<File
+					RelativePath=".\include\Poco\Path.h"/>
+				<File
+					RelativePath=".\include\Poco\Path_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\Path_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\Path_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\Path_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\TemporaryFile.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Processes">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\NamedEvent.cpp"/>
+				<File
+					RelativePath=".\src\NamedEvent_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_WIN32.cpp"
-					>
+					RelativePath=".\src\NamedEvent_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_WIN32U.cpp"
-					>
+					RelativePath=".\src\NamedEvent_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_WINCE.cpp"
-					>
+					RelativePath=".\src\NamedEvent_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory.cpp"
-					>
-				</File>
+					RelativePath=".\src\NamedMutex.cpp"/>
 				<File
-					RelativePath=".\src\SharedMemory_DUMMY.cpp"
-					>
+					RelativePath=".\src\NamedMutex_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory_POSIX.cpp"
-					>
+					RelativePath=".\src\NamedMutex_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory_WIN32.cpp"
-					>
+					RelativePath=".\src\NamedMutex_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\NamedEvent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedEvent_UNIX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedEvent_VMS.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedEvent_WIN32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedEvent_WIN32U.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedMutex.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedMutex_UNIX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedMutex_VMS.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedMutex_WIN32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NamedMutex_WIN32U.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Pipe.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PipeImpl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PipeImpl_DUMMY.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PipeImpl_POSIX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PipeImpl_WIN32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PipeStream.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Process.h"
-					>
-				</File>
 				<File
-					RelativePath=".\include\Poco\Process_UNIX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Process_VMS.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Process_WIN32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Process_WIN32U.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Process_WINCE.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedMemory.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedMemory_DUMMY.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedMemory_POSIX.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SharedMemory_WIN32.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="UUID"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\UUID.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\UUIDGenerator.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\UUID.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UUIDGenerator.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="DateTime"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\Clock.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DateTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DateTimeFormat.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DateTimeFormatter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DateTimeParser.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\LocalDateTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Stopwatch.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Timespan.cpp"
-					>
+					RelativePath=".\src\NamedMutex_WIN32U.cpp">
+					<FileConfiguration
+						Name="debug_shared|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_shared|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_static_mt|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="debug_static_md|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_static_md|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Timestamp.cpp"
-					>
-				</File>
+					RelativePath=".\src\Pipe.cpp"/>
 				<File
-					RelativePath=".\src\Timezone.cpp"
-					>
-				</File>
+					RelativePath=".\src\PipeImpl.cpp"/>
 				<File
-					RelativePath=".\src\Timezone_UNIX.cpp"
-					>
+					RelativePath=".\src\PipeImpl_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Timezone_WIN32.cpp"
-					>
+					RelativePath=".\src\PipeImpl_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Timezone_WINCE.cpp"
-					>
+					RelativePath=".\src\PipeImpl_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
 				<File
-					RelativePath=".\include\Poco\Clock.h"
-					>
-				</File>
+					RelativePath=".\src\PipeStream.cpp"/>
 				<File
-					RelativePath=".\include\Poco\DateTime.h"
-					>
-				</File>
+					RelativePath=".\src\Process.cpp"/>
 				<File
-					RelativePath=".\include\Poco\DateTimeFormat.h"
-					>
+					RelativePath=".\src\Process_UNIX.cpp">
+					<FileConfiguration
+						Name="debug_shared|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_shared|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_static_mt|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="debug_static_md|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_static_md|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\include\Poco\DateTimeFormatter.h"
-					>
+					RelativePath=".\src\Process_VMS.cpp">
+					<FileConfiguration
+						Name="debug_shared|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_shared|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_static_mt|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="debug_static_md|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="release_static_md|Digi JumpStart (ARMV4I)"
+						ExcludedFromBuild="true">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\include\Poco\DateTimeParser.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\LocalDateTime.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Stopwatch.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Timespan.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Timestamp.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Timezone.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Text"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\Ascii.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\ASCIIEncoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Latin1Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Latin2Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Latin9Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\StreamConverter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\TextBufferIterator.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\TextConverter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\TextEncoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\TextIterator.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Unicode.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\UnicodeConverter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\UTF16Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\UTF32Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\UTF8Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\UTF8String.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Windows1250Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Windows1251Encoding.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Windows1252Encoding.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\Ascii.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ASCIIEncoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Latin1Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Latin2Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ListMap.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Latin9Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\StreamConverter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\TextBufferIterator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\TextConverter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\TextEncoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\TextIterator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Unicode.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UnicodeConverter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UTF16Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UTF32Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UTF8Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UTF8String.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Windows1250Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Windows1251Encoding.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Windows1252Encoding.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="URI"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\FileStreamFactory.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\URI.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\URIStreamFactory.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\URIStreamOpener.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\FileStreamFactory.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\URI.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\URIStreamFactory.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\URIStreamOpener.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Tasks"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\Task.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\TaskManager.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\TaskNotification.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\Task.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\TaskManager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\TaskNotification.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Events"
-			>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\AbstractDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\AbstractEvent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\AbstractPriorityDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\BasicEvent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\DefaultStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\DirectoryIteratorStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Delegate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\EventArgs.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Expire.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FIFOEvent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FIFOStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FunctionDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\FunctionPriorityDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\NotificationStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PriorityDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PriorityEvent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PriorityExpire.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\PriorityStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\RecursiveDirectoryIterator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\RecursiveDirectoryIteratorImpl.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\EventArgs.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Cache"
-			>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\AbstractCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\AbstractStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\AccessExpirationDecorator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\AccessExpireCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\AccessExpireLRUCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\AccessExpireStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ExpirationDecorator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ExpireCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ExpireLRUCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ExpireStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\KeyValueArgs.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\LRUCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\LRUStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\StrategyCollection.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireLRUCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UniqueExpireCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UniqueExpireLRUCache.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\UniqueExpireStrategy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\ValidArgs.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Hashing"
-			>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\include\Poco\Hash.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\HashFunction.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\HashMap.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\HashSet.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\HashStatistic.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\HashTable.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\LinearHashTable.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\SimpleHashTable.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\Hash.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\HashStatistic.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="wcelibcex"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_abort.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_access.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_asctime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_bsearch.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_clock.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_ctime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_directorymanagement.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_errno.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_findfile.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_getenv.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_getopt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_gettimeofday.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_lfind.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_localtime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_mkdir.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_mktime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_path.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_rename.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_rewind.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_rmdir.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_setlocale.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_stat.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_strerror.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_time.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_timesys.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_unlink.c"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_winbase.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\errno.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\fcntl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_direct.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_errno.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_fcntl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_io.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_stat.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_stdio.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_stdlib.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_string.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_time.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_timesys.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_types.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_unistd.h"
-					>
-				</File>
-				<File
-					RelativePath=".\wcelibcex-1.0\src\wce_winbase.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Core"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath=".\src\AtomicCounter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Bugcheck.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\ByteOrder.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Checksum.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Debugger.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Environment.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Environment_UNIX.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\Environment_VMS.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\Environment_WIN32.cpp"
-					>
-					<FileConfiguration
-						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\Environment_WIN32U.cpp"
-					>
+					RelativePath=".\src\Process_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Environment_WINCE.cpp"
-					>
+					RelativePath=".\src\Process_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Error.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Exception.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\Format.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\FPEnvironment.cpp"
-					>
-				</File>
+					RelativePath=".\src\SharedMemory.cpp"/>
 				<File
-					RelativePath=".\src\FPEnvironment_C99.cpp"
-					>
+					RelativePath=".\src\SharedMemory_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_DEC.cpp"
-					>
+					RelativePath=".\src\SharedMemory_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_DUMMY.cpp"
-					>
+					RelativePath=".\src\SharedMemory_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\NamedEvent.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedEvent_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedEvent_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedEvent_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedEvent_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedMutex.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedMutex_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedMutex_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedMutex_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\NamedMutex_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\Pipe.h"/>
+				<File
+					RelativePath=".\include\Poco\PipeImpl.h"/>
+				<File
+					RelativePath=".\include\Poco\PipeImpl_DUMMY.h"/>
 				<File
-					RelativePath=".\src\FPEnvironment_SUN.cpp"
-					>
+					RelativePath=".\include\Poco\PipeImpl_POSIX.h"/>
+				<File
+					RelativePath=".\include\Poco\PipeImpl_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\PipeStream.h"/>
+				<File
+					RelativePath=".\include\Poco\Process.h"/>
+				<File
+					RelativePath=".\include\Poco\Process_UNIX.h"/>
+				<File
+					RelativePath=".\include\Poco\Process_VMS.h"/>
+				<File
+					RelativePath=".\include\Poco\Process_WIN32.h"/>
+				<File
+					RelativePath=".\include\Poco\Process_WIN32U.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedMemory.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedMemory_DUMMY.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedMemory_POSIX.h"/>
+				<File
+					RelativePath=".\include\Poco\SharedMemory_WIN32.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="UUID">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\UUID.cpp"/>
+				<File
+					RelativePath=".\src\UUIDGenerator.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\UUID.h"/>
+				<File
+					RelativePath=".\include\Poco\UUIDGenerator.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="DateTime">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\Clock.cpp"/>
+				<File
+					RelativePath=".\src\DateTime.cpp"/>
+				<File
+					RelativePath=".\src\DateTimeFormat.cpp"/>
+				<File
+					RelativePath=".\src\DateTimeFormatter.cpp"/>
+				<File
+					RelativePath=".\src\DateTimeParser.cpp"/>
+				<File
+					RelativePath=".\src\LocalDateTime.cpp"/>
+				<File
+					RelativePath=".\src\Stopwatch.cpp"/>
+				<File
+					RelativePath=".\src\Timespan.cpp"/>
+				<File
+					RelativePath=".\src\Timestamp.cpp"/>
+				<File
+					RelativePath=".\src\Timezone.cpp"/>
+				<File
+					RelativePath=".\src\Timezone_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_WIN32.cpp"
-					>
+					RelativePath=".\src\Timezone_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_mt|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="debug_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_static_md|Digi JumpStart (ARMV4I)"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
+			</Filter>
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\src\MemoryPool.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\Clock.h"/>
 				<File
-					RelativePath=".\src\NestedDiagnosticContext.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTime.h"/>
 				<File
-					RelativePath=".\src\NumberFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeFormat.h"/>
 				<File
-					RelativePath=".\src\NumberParser.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeFormatter.h"/>
 				<File
-					RelativePath=".\src\RefCountedObject.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeParser.h"/>
 				<File
-					RelativePath=".\src\SortedDirectoryIterator.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\LocalDateTime.h"/>
 				<File
-					RelativePath=".\src\String.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\Stopwatch.h"/>
 				<File
-					RelativePath=".\src\NumericString.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timespan.h"/>
 				<File
-					RelativePath=".\src\DirectoryIteratorStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timestamp.h"/>
 				<File
-					RelativePath=".\src\StringTokenizer.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timezone.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Text">
+			<Filter
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Void.cpp"
-					>
-				</File>
+					RelativePath=".\src\ASCIIEncoding.cpp"/>
+				<File
+					RelativePath=".\src\Latin1Encoding.cpp"/>
+				<File
+					RelativePath=".\src\Latin2Encoding.cpp"/>
+				<File
+					RelativePath=".\src\Latin9Encoding.cpp"/>
+				<File
+					RelativePath=".\src\StreamConverter.cpp"/>
+				<File
+					RelativePath=".\src\TextBufferIterator.cpp"/>
+				<File
+					RelativePath=".\src\TextConverter.cpp"/>
+				<File
+					RelativePath=".\src\TextEncoding.cpp"/>
+				<File
+					RelativePath=".\src\TextIterator.cpp"/>
+				<File
+					RelativePath=".\src\Unicode.cpp"/>
+				<File
+					RelativePath=".\src\UnicodeConverter.cpp"/>
+				<File
+					RelativePath=".\src\UTF16Encoding.cpp"/>
+				<File
+					RelativePath=".\src\UTF32Encoding.cpp"/>
+				<File
+					RelativePath=".\src\UTF8Encoding.cpp"/>
+				<File
+					RelativePath=".\src\UTF8String.cpp"/>
+				<File
+					RelativePath=".\src\Windows1250Encoding.cpp"/>
+				<File
+					RelativePath=".\src\Windows1251Encoding.cpp"/>
+				<File
+					RelativePath=".\src\Windows1252Encoding.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Any.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ASCIIEncoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Array.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin1Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\AtomicCounter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin2Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\AutoPtr.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin9Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\AutoReleasePool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ListMap.h"/>
 				<File
-					RelativePath=".\include\Poco\Buffer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\Bugcheck.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextBufferIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\ByteOrder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\Checksum.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextEncoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Config.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\Debugger.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Unicode.h"/>
 				<File
-					RelativePath=".\include\Poco\DynamicFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnicodeConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF16Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF32Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF8Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF8String.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1250Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_WINCE.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1251Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Error.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1252Encoding.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="URI">
+			<Filter
+				Name="Source Files">
 				<File
-					RelativePath=".\include\Poco\Exception.h"
-					>
-				</File>
+					RelativePath=".\src\FileStreamFactory.cpp"/>
 				<File
-					RelativePath=".\include\Poco\FIFOBuffer.h"
-					>
-				</File>
+					RelativePath=".\src\URI.cpp"/>
 				<File
-					RelativePath=".\include\Poco\Format.h"
-					>
-				</File>
+					RelativePath=".\src\URIStreamFactory.cpp"/>
 				<File
-					RelativePath=".\include\Poco\Foundation.h"
-					>
-				</File>
+					RelativePath=".\src\URIStreamOpener.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\FPEnvironment.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStreamFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_C99.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URI.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_DEC.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URIStreamFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_DUMMY.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URIStreamOpener.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Tasks">
+			<Filter
+				Name="Source Files">
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_SUN.h"
-					>
-				</File>
+					RelativePath=".\src\Task.cpp"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_WIN32.h"
-					>
-				</File>
+					RelativePath=".\src\TaskManager.cpp"/>
 				<File
-					RelativePath=".\include\Poco\Instantiator.h"
-					>
-				</File>
+					RelativePath=".\src\TaskNotification.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\MemoryPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Task.h"/>
 				<File
-					RelativePath=".\include\Poco\MetaProgramming.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TaskManager.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedTuple.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TaskNotification.h"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Events">
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\NestedDiagnosticContext.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\Nullable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\NumberFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractPriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\NumberParser.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BasicEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\NumericString.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DefaultStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\ObjectPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Delegate.h"/>
 				<File
-					RelativePath=".\include\Poco\Optional.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIteratorStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\EventArgs.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Expire.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\Poco.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FunctionDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\RefCountedObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FunctionPriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedPtr.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\SingletonHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\SortedDirectoryIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\String.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityExpire.h"/>
 				<File
-					RelativePath=".\include\Poco\StringTokenizer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\Tuple.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RecursiveDirectoryIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\TypeList.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RecursiveDirectoryIteratorImpl.h"/>
+			</Filter>
+			<Filter
+				Name="Source Files">
 				<File
-					RelativePath=".\include\Poco\Types.h"
-					>
-				</File>
+					RelativePath=".\src\EventArgs.cpp"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Cache">
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\UnWindows.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UTFString.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\Version.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpirationDecorator.h"/>
 				<File
-					RelativePath=".\include\Poco\Void.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpireCache.h"/>
+				<File
+					RelativePath=".\include\Poco\AccessExpireLRUCache.h"/>
+				<File
+					RelativePath=".\include\Poco\AccessExpireStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\ExpirationDecorator.h"/>
+				<File
+					RelativePath=".\include\Poco\ExpireCache.h"/>
+				<File
+					RelativePath=".\include\Poco\ExpireLRUCache.h"/>
+				<File
+					RelativePath=".\include\Poco\ExpireStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\KeyValueArgs.h"/>
+				<File
+					RelativePath=".\include\Poco\LRUCache.h"/>
+				<File
+					RelativePath=".\include\Poco\LRUStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\StrategyCollection.h"/>
+				<File
+					RelativePath=".\include\Poco\UniqueAccessExpireCache.h"/>
+				<File
+					RelativePath=".\include\Poco\UniqueAccessExpireLRUCache.h"/>
+				<File
+					RelativePath=".\include\Poco\UniqueAccessExpireStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\UniqueExpireCache.h"/>
+				<File
+					RelativePath=".\include\Poco\UniqueExpireLRUCache.h"/>
+				<File
+					RelativePath=".\include\Poco\UniqueExpireStrategy.h"/>
+				<File
+					RelativePath=".\include\Poco\ValidArgs.h"/>
 			</Filter>
+			<Filter
+				Name="Source Files"/>
 		</Filter>
 		<Filter
-			Name="Dynamic"
-			>
+			Name="Hashing">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Dynamic\Pair.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Hash.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\Struct.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashFunction.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\Var.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashMap.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\VarHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashSet.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\VarIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashStatistic.h"/>
+				<File
+					RelativePath=".\include\Poco\HashTable.h"/>
+				<File
+					RelativePath=".\include\Poco\LinearHashTable.h"/>
+				<File
+					RelativePath=".\include\Poco\SimpleHashTable.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Var.cpp"
-					>
-				</File>
+					RelativePath=".\src\Hash.cpp"/>
 				<File
-					RelativePath=".\src\VarHolder.cpp"
-					>
-				</File>
+					RelativePath=".\src\HashStatistic.cpp"/>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Dynamic">
+			<Filter
+				Name="Header Files">
 				<File
-					RelativePath=".\src\VarIterator.cpp"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\Pair.h"/>
+				<File
+					RelativePath=".\include\Poco\Dynamic\Struct.h"/>
+				<File
+					RelativePath=".\include\Poco\Dynamic\Var.h"/>
+				<File
+					RelativePath=".\include\Poco\Dynamic\VarHolder.h"/>
+				<File
+					RelativePath=".\include\Poco\Dynamic\VarIterator.h"/>
+			</Filter>
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\Var.cpp"/>
+				<File
+					RelativePath=".\src\VarHolder.cpp"/>
+				<File
+					RelativePath=".\src\VarIterator.cpp"/>
 			</Filter>
 		</Filter>
+		<File
+			RelativePath="..\DLLVersion.rc">
+			<FileConfiguration
+				Name="debug_shared|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="release_shared|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="debug_static_mt|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="release_static_mt|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="debug_static_md|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="release_static_md|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+		</File>
 	</Files>
-	<Globals>
-	</Globals>
+	<Globals/>
 </VisualStudioProject>
diff --git a/Foundation/Foundation_WEC2013_vs110.sln b/Foundation/Foundation_WEC2013_vs110.sln
index 7c9cea1953..45b33bc456 100644
--- a/Foundation/Foundation_WEC2013_vs110.sln
+++ b/Foundation/Foundation_WEC2013_vs110.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_WEC2013_vs110.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj b/Foundation/Foundation_WEC2013_vs110.vcxproj
index 73be297697..fe8aa7855d 100644
--- a/Foundation/Foundation_WEC2013_vs110.vcxproj
+++ b/Foundation/Foundation_WEC2013_vs110.vcxproj
@@ -321,9 +321,25 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\Environment_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Error.cpp" />
     <ClCompile Include="src\Exception.cpp" />
     <ClCompile Include="src\FIFOBufferStream.cpp" />
+    <ClCompile Include="src\File_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Format.cpp" />
     <ClCompile Include="src\FPEnvironment.cpp" />
     <ClCompile Include="src\FPEnvironment_C99.cpp">
@@ -366,8 +382,17 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp" />
     <ClCompile Include="src\Latin2Encoding.cpp" />
     <ClCompile Include="src\MemoryPool.cpp" />
+    <ClCompile Include="src\Mutex_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\NestedDiagnosticContext.cpp" />
     <ClCompile Include="src\NumberFormatter.cpp" />
     <ClCompile Include="src\NumberParser.cpp" />
@@ -379,7 +404,23 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\Process_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp" />
+    <ClCompile Include="src\RWLock_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\SortedDirectoryIterator.cpp" />
     <ClCompile Include="src\String.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
@@ -392,6 +433,14 @@
     <ClCompile Include="src\NumericString.cpp" />
     <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
     <ClCompile Include="src\StringTokenizer.cpp" />
+    <ClCompile Include="src\Thread_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Timezone_WINCE.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</ExcludedFromBuild>
@@ -1039,6 +1088,7 @@
     <ClInclude Include="include\Poco\DynamicAny.h" />
     <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
     <ClInclude Include="include\Poco\DynamicFactory.h" />
+    <ClInclude Include="include\Poco\DynamicStruct.h" />
     <ClInclude Include="include\Poco\Dynamic\Pair.h" />
     <ClInclude Include="include\Poco\Dynamic\Struct.h" />
     <ClInclude Include="include\Poco\Dynamic\Var.h" />
@@ -1049,10 +1099,12 @@
     <ClInclude Include="include\Poco\Environment_VMS.h" />
     <ClInclude Include="include\Poco\Environment_WIN32.h" />
     <ClInclude Include="include\Poco\Environment_WIN32U.h" />
+    <ClInclude Include="include\Poco\Environment_WINCE.h" />
     <ClInclude Include="include\Poco\Error.h" />
     <ClInclude Include="include\Poco\Exception.h" />
     <ClInclude Include="include\Poco\FIFOBuffer.h" />
     <ClInclude Include="include\Poco\FIFOBufferStream.h" />
+    <ClInclude Include="include\Poco\File_WINCE.h" />
     <ClInclude Include="include\Poco\Format.h" />
     <ClInclude Include="include\Poco\Foundation.h" />
     <ClInclude Include="include\Poco\FPEnvironment.h" />
@@ -1062,10 +1114,12 @@
     <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
     <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
     <ClInclude Include="include\Poco\Instantiator.h" />
+    <ClInclude Include="include\Poco\JSONString.h" />
     <ClInclude Include="include\Poco\Latin2Encoding.h" />
     <ClInclude Include="include\Poco\ListMap.h" />
     <ClInclude Include="include\Poco\MemoryPool.h" />
     <ClInclude Include="include\Poco\MetaProgramming.h" />
+    <ClInclude Include="include\Poco\Mutex_WINCE.h" />
     <ClInclude Include="include\Poco\NamedTuple.h" />
     <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
     <ClInclude Include="include\Poco\Nullable.h" />
@@ -1082,15 +1136,18 @@
     <ClInclude Include="include\Poco\Platform_WIN32.h" />
     <ClInclude Include="include\Poco\Poco.h" />
     <ClInclude Include="include\Poco\PriorityStrategy.h" />
+    <ClInclude Include="include\Poco\Process_WINCE.h" />
     <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
     <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
     <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
     <ClInclude Include="include\Poco\RefCountedObject.h" />
+    <ClInclude Include="include\Poco\RWLock_WINCE.h" />
     <ClInclude Include="include\Poco\SharedPtr.h" />
     <ClInclude Include="include\Poco\SingletonHolder.h" />
     <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
     <ClInclude Include="include\Poco\String.h" />
     <ClInclude Include="include\Poco\StringTokenizer.h" />
+    <ClInclude Include="include\Poco\Thread_WINCE.h" />
     <ClInclude Include="include\Poco\Tuple.h" />
     <ClInclude Include="include\Poco\TypeList.h" />
     <ClInclude Include="include\Poco\Types.h" />
diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters
index 0fb28536c9..069737efa7 100644
--- a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters
+++ b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters
@@ -936,6 +936,27 @@
     <ClCompile Include="src\Path_WINCE.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Environment_WINCE.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Mutex_WINCE.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RWLock_WINCE.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Thread_WINCE.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\File_WINCE.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Process_WINCE.cpp">
+      <Filter>Processes\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1925,6 +1946,30 @@
     <ClInclude Include="include\Poco\Path_WINCE.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DynamicStruct.h">
+      <Filter>Dynamic\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Environment_WINCE.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\File_WINCE.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Mutex_WINCE.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RWLock_WINCE.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Thread_WINCE.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\JSONString.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Process_WINCE.h">
+      <Filter>Processes\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_WEC2013_vs120.sln b/Foundation/Foundation_WEC2013_vs120.sln
index 84195a7cbe..02b71138f6 100644
--- a/Foundation/Foundation_WEC2013_vs120.sln
+++ b/Foundation/Foundation_WEC2013_vs120.sln
@@ -1,6 +1,7 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
+VisualStudioVersion = 12.0.30825.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_WEC2013_vs120.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_WEC2013_vs120.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj b/Foundation/Foundation_WEC2013_vs120.vcxproj
index 48eaf3ee63..dc813edcb5 100644
--- a/Foundation/Foundation_WEC2013_vs120.vcxproj
+++ b/Foundation/Foundation_WEC2013_vs120.vcxproj
@@ -321,9 +321,25 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\Environment_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Error.cpp" />
     <ClCompile Include="src\Exception.cpp" />
     <ClCompile Include="src\FIFOBufferStream.cpp" />
+    <ClCompile Include="src\File_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Format.cpp" />
     <ClCompile Include="src\FPEnvironment.cpp" />
     <ClCompile Include="src\FPEnvironment_C99.cpp">
@@ -366,8 +382,17 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp" />
     <ClCompile Include="src\Latin2Encoding.cpp" />
     <ClCompile Include="src\MemoryPool.cpp" />
+    <ClCompile Include="src\Mutex_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\NestedDiagnosticContext.cpp" />
     <ClCompile Include="src\NumberFormatter.cpp" />
     <ClCompile Include="src\NumberParser.cpp" />
@@ -379,7 +404,23 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\Process_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp" />
+    <ClCompile Include="src\RWLock_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\SortedDirectoryIterator.cpp" />
     <ClCompile Include="src\String.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
@@ -392,6 +433,14 @@
     <ClCompile Include="src\NumericString.cpp" />
     <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
     <ClCompile Include="src\StringTokenizer.cpp" />
+    <ClCompile Include="src\Thread_WINCE.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Timezone_WINCE.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</ExcludedFromBuild>
@@ -1039,6 +1088,7 @@
     <ClInclude Include="include\Poco\DynamicAny.h" />
     <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
     <ClInclude Include="include\Poco\DynamicFactory.h" />
+    <ClInclude Include="include\Poco\DynamicStruct.h" />
     <ClInclude Include="include\Poco\Dynamic\Pair.h" />
     <ClInclude Include="include\Poco\Dynamic\Struct.h" />
     <ClInclude Include="include\Poco\Dynamic\Var.h" />
@@ -1049,10 +1099,12 @@
     <ClInclude Include="include\Poco\Environment_VMS.h" />
     <ClInclude Include="include\Poco\Environment_WIN32.h" />
     <ClInclude Include="include\Poco\Environment_WIN32U.h" />
+    <ClInclude Include="include\Poco\Environment_WINCE.h" />
     <ClInclude Include="include\Poco\Error.h" />
     <ClInclude Include="include\Poco\Exception.h" />
     <ClInclude Include="include\Poco\FIFOBuffer.h" />
     <ClInclude Include="include\Poco\FIFOBufferStream.h" />
+    <ClInclude Include="include\Poco\File_WINCE.h" />
     <ClInclude Include="include\Poco\Format.h" />
     <ClInclude Include="include\Poco\Foundation.h" />
     <ClInclude Include="include\Poco\FPEnvironment.h" />
@@ -1062,10 +1114,12 @@
     <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
     <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
     <ClInclude Include="include\Poco\Instantiator.h" />
+    <ClInclude Include="include\Poco\JSONString.h" />
     <ClInclude Include="include\Poco\Latin2Encoding.h" />
     <ClInclude Include="include\Poco\ListMap.h" />
     <ClInclude Include="include\Poco\MemoryPool.h" />
     <ClInclude Include="include\Poco\MetaProgramming.h" />
+    <ClInclude Include="include\Poco\Mutex_WINCE.h" />
     <ClInclude Include="include\Poco\NamedTuple.h" />
     <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
     <ClInclude Include="include\Poco\Nullable.h" />
@@ -1082,15 +1136,18 @@
     <ClInclude Include="include\Poco\Platform_WIN32.h" />
     <ClInclude Include="include\Poco\Poco.h" />
     <ClInclude Include="include\Poco\PriorityStrategy.h" />
+    <ClInclude Include="include\Poco\Process_WINCE.h" />
     <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
     <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
     <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
     <ClInclude Include="include\Poco\RefCountedObject.h" />
+    <ClInclude Include="include\Poco\RWLock_WINCE.h" />
     <ClInclude Include="include\Poco\SharedPtr.h" />
     <ClInclude Include="include\Poco\SingletonHolder.h" />
     <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
     <ClInclude Include="include\Poco\String.h" />
     <ClInclude Include="include\Poco\StringTokenizer.h" />
+    <ClInclude Include="include\Poco\Thread_WINCE.h" />
     <ClInclude Include="include\Poco\Tuple.h" />
     <ClInclude Include="include\Poco\TypeList.h" />
     <ClInclude Include="include\Poco\Types.h" />
diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters
index 0fb28536c9..a6735546e8 100644
--- a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters
+++ b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters
@@ -936,6 +936,27 @@
     <ClCompile Include="src\Path_WINCE.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Environment_WINCE.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\File_WINCE.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Mutex_WINCE.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RWLock_WINCE.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Thread_WINCE.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Process_WINCE.cpp">
+      <Filter>Processes\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1925,6 +1946,30 @@
     <ClInclude Include="include\Poco\Path_WINCE.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DynamicStruct.h">
+      <Filter>Dynamic\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\File_WINCE.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\JSONString.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Mutex_WINCE.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RWLock_WINCE.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Thread_WINCE.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Process_WINCE.h">
+      <Filter>Processes\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Environment_WINCE.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_vs100.sln b/Foundation/Foundation_vs100.sln
index 613b077c2a..fd795b8565 100644
--- a/Foundation/Foundation_vs100.sln
+++ b/Foundation/Foundation_vs100.sln
@@ -1,23 +1,20 @@
-
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs100.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs100.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs100.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs100.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs100.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs100.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
@@ -30,18 +27,42 @@ Global
 		release_static_mt|Win32 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
@@ -66,18 +87,6 @@ Global
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_vs100.vcxproj b/Foundation/Foundation_vs100.vcxproj
index 525323d22c..cac71bac6f 100644
--- a/Foundation/Foundation_vs100.vcxproj
+++ b/Foundation/Foundation_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">
@@ -28,24 +28,24 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Foundation</ProjectName>
-    <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
+    <ProjectGuid>{B01196CC-B693-4548-8464-2FF60499E73F}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -57,30 +57,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <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"/>
+  </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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">..\bin\</OutDir>
@@ -89,14 +86,14 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\Foundation\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">..\lib\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\Foundation\$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\Foundation\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoFoundationd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoFoundationmtd</TargetName>
@@ -108,7 +105,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -117,21 +114,24 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoFoundationd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>..\bin\PocoFoundationd.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\lib\PocoFoundationd.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
@@ -142,124 +142,111 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoFoundation.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <ImportLibrary>..\lib\PocoFoundation.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
+      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmd.lib</OutputFile>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <ProgramDataBaseFileName>..\lib\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <ProgramDataBaseFileName>..\lib\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -267,36 +254,30 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\Ascii.cpp" />
-    <ClCompile Include="src\AtomicCounter.cpp" />
-    <ClCompile Include="src\Base32Decoder.cpp" />
-    <ClCompile Include="src\Base32Encoder.cpp" />
-    <ClCompile Include="src\Bugcheck.cpp" />
+    <ClCompile Include="src\Ascii.cpp"/>
+    <ClCompile Include="src\AtomicCounter.cpp"/>
+    <ClCompile Include="src\Bugcheck.cpp"/>
     <ClCompile Include="src\ByteOrder.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -305,10 +286,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Checksum.cpp" />
-    <ClCompile Include="src\Debugger.cpp" />
-    <ClCompile Include="src\DirectoryWatcher.cpp" />
-    <ClCompile Include="src\Environment.cpp" />
+    <ClCompile Include="src\Checksum.cpp"/>
+    <ClCompile Include="src\Debugger.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp"/>
+    <ClCompile Include="src\Environment.cpp"/>
     <ClCompile Include="src\Environment_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -341,11 +322,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Error.cpp" />
-    <ClCompile Include="src\Exception.cpp" />
-    <ClCompile Include="src\FIFOBufferStream.cpp" />
-    <ClCompile Include="src\Format.cpp" />
-    <ClCompile Include="src\FPEnvironment.cpp" />
+    <ClCompile Include="src\Error.cpp"/>
+    <ClCompile Include="src\Exception.cpp"/>
+    <ClCompile Include="src\Format.cpp"/>
+    <ClCompile Include="src\FPEnvironment.cpp"/>
     <ClCompile Include="src\FPEnvironment_C99.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -386,15 +366,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp" />
-    <ClCompile Include="src\MemoryPool.cpp" />
-    <ClCompile Include="src\NestedDiagnosticContext.cpp" />
-    <ClCompile Include="src\NumberFormatter.cpp" />
-    <ClCompile Include="src\NumberParser.cpp" />
-    <ClCompile Include="src\NumericString.cpp" />
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
-    <ClCompile Include="src\RefCountedObject.cpp" />
-    <ClCompile Include="src\SortedDirectoryIterator.cpp" />
+    <ClCompile Include="src\JSONString.cpp"/>
+    <ClCompile Include="src\MemoryPool.cpp"/>
+    <ClCompile Include="src\NestedDiagnosticContext.cpp"/>
+    <ClCompile Include="src\NumberFormatter.cpp"/>
+    <ClCompile Include="src\NumberParser.cpp"/>
+    <ClCompile Include="src\NumericString.cpp"/>
+    <ClCompile Include="src\RefCountedObject.cpp"/>
+    <ClCompile Include="src\SortedDirectoryIterator.cpp"/>
     <ClCompile Include="src\String.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -403,19 +382,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\StringTokenizer.cpp" />
-    <ClCompile Include="src\UTF32Encoding.cpp" />
-    <ClCompile Include="src\Var.cpp" />
-    <ClCompile Include="src\VarHolder.cpp" />
-    <ClCompile Include="src\VarIterator.cpp" />
-    <ClCompile Include="src\Void.cpp" />
-    <ClCompile Include="src\Base64Decoder.cpp" />
-    <ClCompile Include="src\Base64Encoder.cpp" />
-    <ClCompile Include="src\BinaryReader.cpp" />
-    <ClCompile Include="src\BinaryWriter.cpp" />
-    <ClCompile Include="src\CountingStream.cpp" />
-    <ClCompile Include="src\DeflatingStream.cpp" />
-    <ClCompile Include="src\FileStream.cpp" />
+    <ClCompile Include="src\StringTokenizer.cpp"/>
+    <ClCompile Include="src\Void.cpp"/>
+    <ClCompile Include="src\Base32Decoder.cpp"/>
+    <ClCompile Include="src\Base32Encoder.cpp"/>
+    <ClCompile Include="src\Base64Decoder.cpp"/>
+    <ClCompile Include="src\Base64Encoder.cpp"/>
+    <ClCompile Include="src\BinaryReader.cpp"/>
+    <ClCompile Include="src\BinaryWriter.cpp"/>
+    <ClCompile Include="src\CountingStream.cpp"/>
+    <ClCompile Include="src\DeflatingStream.cpp"/>
+    <ClCompile Include="src\FIFOBufferStream.cpp"/>
+    <ClCompile Include="src\FileStream.cpp"/>
     <ClCompile Include="src\FileStream_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -432,32 +410,30 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\HexBinaryDecoder.cpp" />
-    <ClCompile Include="src\HexBinaryEncoder.cpp" />
-    <ClCompile Include="src\InflatingStream.cpp" />
-    <ClCompile Include="src\LineEndingConverter.cpp" />
-    <ClCompile Include="src\MemoryStream.cpp" />
-    <ClCompile Include="src\NullStream.cpp" />
-    <ClCompile Include="src\StreamCopier.cpp" />
-    <ClCompile Include="src\StreamTokenizer.cpp" />
-    <ClCompile Include="src\TeeStream.cpp" />
-    <ClCompile Include="src\Token.cpp" />
-    <ClCompile Include="src\adler32.c" />
-    <ClCompile Include="src\compress.c" />
-    <ClCompile Include="src\crc32.c" />
-    <ClCompile Include="src\deflate.c" />
-    <ClCompile Include="src\infback.c" />
-    <ClCompile Include="src\inffast.c" />
-    <ClCompile Include="src\inflate.c" />
-    <ClCompile Include="src\inftrees.c" />
-    <ClCompile Include="src\trees.c" />
-    <ClCompile Include="src\Windows1250Encoding.cpp" />
-    <ClCompile Include="src\Windows1251Encoding.cpp" />
-    <ClCompile Include="src\zutil.c" />
-    <ClCompile Include="src\ActiveDispatcher.cpp" />
-    <ClCompile Include="src\Condition.cpp" />
-    <ClCompile Include="src\ErrorHandler.cpp" />
-    <ClCompile Include="src\Event.cpp" />
+    <ClCompile Include="src\HexBinaryDecoder.cpp"/>
+    <ClCompile Include="src\HexBinaryEncoder.cpp"/>
+    <ClCompile Include="src\InflatingStream.cpp"/>
+    <ClCompile Include="src\LineEndingConverter.cpp"/>
+    <ClCompile Include="src\MemoryStream.cpp"/>
+    <ClCompile Include="src\NullStream.cpp"/>
+    <ClCompile Include="src\StreamCopier.cpp"/>
+    <ClCompile Include="src\StreamTokenizer.cpp"/>
+    <ClCompile Include="src\TeeStream.cpp"/>
+    <ClCompile Include="src\Token.cpp"/>
+    <ClCompile Include="src\adler32.c"/>
+    <ClCompile Include="src\compress.c"/>
+    <ClCompile Include="src\crc32.c"/>
+    <ClCompile Include="src\deflate.c"/>
+    <ClCompile Include="src\infback.c"/>
+    <ClCompile Include="src\inffast.c"/>
+    <ClCompile Include="src\inflate.c"/>
+    <ClCompile Include="src\inftrees.c"/>
+    <ClCompile Include="src\trees.c"/>
+    <ClCompile Include="src\zutil.c"/>
+    <ClCompile Include="src\ActiveDispatcher.cpp"/>
+    <ClCompile Include="src\Condition.cpp"/>
+    <ClCompile Include="src\ErrorHandler.cpp"/>
+    <ClCompile Include="src\Event.cpp"/>
     <ClCompile Include="src\Event_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -474,7 +450,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Mutex.cpp" />
+    <ClCompile Include="src\Mutex.cpp"/>
     <ClCompile Include="src\Mutex_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -491,8 +467,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Runnable.cpp" />
-    <ClCompile Include="src\RWLock.cpp" />
+    <ClCompile Include="src\Runnable.cpp"/>
+    <ClCompile Include="src\RWLock.cpp"/>
     <ClCompile Include="src\RWLock_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -509,7 +485,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Semaphore.cpp" />
+    <ClCompile Include="src\Semaphore.cpp"/>
     <ClCompile Include="src\Semaphore_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -534,8 +510,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SynchronizedObject.cpp" />
-    <ClCompile Include="src\Thread.cpp" />
+    <ClCompile Include="src\SynchronizedObject.cpp"/>
+    <ClCompile Include="src\Thread.cpp"/>
     <ClCompile Include="src\Thread_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -552,19 +528,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ThreadLocal.cpp" />
-    <ClCompile Include="src\ThreadPool.cpp" />
-    <ClCompile Include="src\ThreadTarget.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
-    <ClCompile Include="src\DigestEngine.cpp" />
-    <ClCompile Include="src\DigestStream.cpp" />
-    <ClCompile Include="src\MD4Engine.cpp" />
-    <ClCompile Include="src\MD5Engine.cpp" />
-    <ClCompile Include="src\Random.cpp" />
-    <ClCompile Include="src\RandomStream.cpp" />
-    <ClCompile Include="src\SHA1Engine.cpp" />
-    <ClCompile Include="src\Manifest.cpp" />
-    <ClCompile Include="src\SharedLibrary.cpp" />
+    <ClCompile Include="src\ThreadLocal.cpp"/>
+    <ClCompile Include="src\ThreadPool.cpp"/>
+    <ClCompile Include="src\ThreadTarget.cpp"/>
+    <ClCompile Include="src\Timer.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\DigestStream.cpp"/>
+    <ClCompile Include="src\MD4Engine.cpp"/>
+    <ClCompile Include="src\MD5Engine.cpp"/>
+    <ClCompile Include="src\Random.cpp"/>
+    <ClCompile Include="src\RandomStream.cpp"/>
+    <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\Manifest.cpp"/>
+    <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -605,38 +581,38 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\RegularExpression.cpp" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
-    <ClCompile Include="src\ArchiveStrategy.cpp" />
-    <ClCompile Include="src\AsyncChannel.cpp" />
-    <ClCompile Include="src\Channel.cpp" />
-    <ClCompile Include="src\Configurable.cpp" />
-    <ClCompile Include="src\ConsoleChannel.cpp" />
-    <ClCompile Include="src\EventLogChannel.cpp" />
-    <ClCompile Include="src\FileChannel.cpp" />
-    <ClCompile Include="src\Formatter.cpp" />
-    <ClCompile Include="src\FormattingChannel.cpp" />
-    <ClCompile Include="src\LogFile.cpp" />
+    <ClCompile Include="src\RegularExpression.cpp"/>
+    <ClCompile Include="src\pcre_byte_order.c"/>
+    <ClCompile Include="src\pcre_chartables.c"/>
+    <ClCompile Include="src\pcre_compile.c"/>
+    <ClCompile Include="src\pcre_config.c"/>
+    <ClCompile Include="src\pcre_dfa_exec.c"/>
+    <ClCompile Include="src\pcre_exec.c"/>
+    <ClCompile Include="src\pcre_fullinfo.c"/>
+    <ClCompile Include="src\pcre_get.c"/>
+    <ClCompile Include="src\pcre_globals.c"/>
+    <ClCompile Include="src\pcre_jit_compile.c"/>
+    <ClCompile Include="src\pcre_maketables.c"/>
+    <ClCompile Include="src\pcre_newline.c"/>
+    <ClCompile Include="src\pcre_ord2utf8.c"/>
+    <ClCompile Include="src\pcre_refcount.c"/>
+    <ClCompile Include="src\pcre_string_utils.c"/>
+    <ClCompile Include="src\pcre_study.c"/>
+    <ClCompile Include="src\pcre_tables.c"/>
+    <ClCompile Include="src\pcre_ucd.c"/>
+    <ClCompile Include="src\pcre_valid_utf8.c"/>
+    <ClCompile Include="src\pcre_version.c"/>
+    <ClCompile Include="src\pcre_xclass.c"/>
+    <ClCompile Include="src\ArchiveStrategy.cpp"/>
+    <ClCompile Include="src\AsyncChannel.cpp"/>
+    <ClCompile Include="src\Channel.cpp"/>
+    <ClCompile Include="src\Configurable.cpp"/>
+    <ClCompile Include="src\ConsoleChannel.cpp"/>
+    <ClCompile Include="src\EventLogChannel.cpp"/>
+    <ClCompile Include="src\FileChannel.cpp"/>
+    <ClCompile Include="src\Formatter.cpp"/>
+    <ClCompile Include="src\FormattingChannel.cpp"/>
+    <ClCompile Include="src\LogFile.cpp"/>
     <ClCompile Include="src\LogFile_STD.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -669,12 +645,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Logger.cpp" />
-    <ClCompile Include="src\LoggingFactory.cpp" />
-    <ClCompile Include="src\LoggingRegistry.cpp" />
-    <ClCompile Include="src\LogStream.cpp" />
-    <ClCompile Include="src\Message.cpp" />
-    <ClCompile Include="src\NullChannel.cpp" />
+    <ClCompile Include="src\Logger.cpp"/>
+    <ClCompile Include="src\LoggingFactory.cpp"/>
+    <ClCompile Include="src\LoggingRegistry.cpp"/>
+    <ClCompile Include="src\LogStream.cpp"/>
+    <ClCompile Include="src\Message.cpp"/>
+    <ClCompile Include="src\NullChannel.cpp"/>
     <ClCompile Include="src\OpcomChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -683,12 +659,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\PurgeStrategy.cpp" />
-    <ClCompile Include="src\RotateStrategy.cpp" />
-    <ClCompile Include="src\SimpleFileChannel.cpp" />
-    <ClCompile Include="src\SplitterChannel.cpp" />
-    <ClCompile Include="src\StreamChannel.cpp" />
+    <ClCompile Include="src\PatternFormatter.cpp"/>
+    <ClCompile Include="src\PurgeStrategy.cpp"/>
+    <ClCompile Include="src\RotateStrategy.cpp"/>
+    <ClCompile Include="src\SimpleFileChannel.cpp"/>
+    <ClCompile Include="src\SplitterChannel.cpp"/>
+    <ClCompile Include="src\StreamChannel.cpp"/>
     <ClCompile Include="src\SyslogChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -697,14 +673,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\WindowsConsoleChannel.cpp" />
-    <ClCompile Include="src\AbstractObserver.cpp" />
-    <ClCompile Include="src\Notification.cpp" />
-    <ClCompile Include="src\NotificationCenter.cpp" />
-    <ClCompile Include="src\NotificationQueue.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueue.cpp" />
-    <ClCompile Include="src\TimedNotificationQueue.cpp" />
-    <ClCompile Include="src\DirectoryIterator.cpp" />
+    <ClCompile Include="src\WindowsConsoleChannel.cpp"/>
+    <ClCompile Include="src\AbstractObserver.cpp"/>
+    <ClCompile Include="src\Notification.cpp"/>
+    <ClCompile Include="src\NotificationCenter.cpp"/>
+    <ClCompile Include="src\NotificationQueue.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueue.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueue.cpp"/>
+    <ClCompile Include="src\DirectoryIterator.cpp"/>
     <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -737,7 +713,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\File.cpp" />
+    <ClCompile Include="src\DirectoryWatcher.cpp"/>
+    <ClCompile Include="src\File.cpp"/>
     <ClCompile Include="src\File_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -770,8 +747,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Glob.cpp" />
-    <ClCompile Include="src\Path.cpp" />
+    <ClCompile Include="src\Glob.cpp"/>
+    <ClCompile Include="src\Path.cpp"/>
     <ClCompile Include="src\Path_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -804,8 +781,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\TemporaryFile.cpp" />
-    <ClCompile Include="src\NamedEvent.cpp" />
+    <ClCompile Include="src\TemporaryFile.cpp"/>
+    <ClCompile Include="src\NamedEvent.cpp"/>
     <ClCompile Include="src\NamedEvent_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -838,7 +815,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NamedMutex.cpp" />
+    <ClCompile Include="src\NamedMutex.cpp"/>
     <ClCompile Include="src\NamedMutex_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -871,8 +848,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Pipe.cpp" />
-    <ClCompile Include="src\PipeImpl.cpp" />
+    <ClCompile Include="src\Pipe.cpp"/>
+    <ClCompile Include="src\PipeImpl.cpp"/>
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -897,8 +874,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PipeStream.cpp" />
-    <ClCompile Include="src\Process.cpp" />
+    <ClCompile Include="src\PipeStream.cpp"/>
+    <ClCompile Include="src\Process.cpp"/>
     <ClCompile Include="src\Process_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -931,7 +908,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SharedMemory.cpp" />
+    <ClCompile Include="src\SharedMemory.cpp"/>
     <ClCompile Include="src\SharedMemory_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -956,18 +933,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\UUID.cpp" />
-    <ClCompile Include="src\UUIDGenerator.cpp" />
-    <ClCompile Include="src\Clock.cpp" />
-    <ClCompile Include="src\DateTime.cpp" />
-    <ClCompile Include="src\DateTimeFormat.cpp" />
-    <ClCompile Include="src\DateTimeFormatter.cpp" />
-    <ClCompile Include="src\DateTimeParser.cpp" />
-    <ClCompile Include="src\LocalDateTime.cpp" />
-    <ClCompile Include="src\Stopwatch.cpp" />
-    <ClCompile Include="src\Timespan.cpp" />
-    <ClCompile Include="src\Timestamp.cpp" />
-    <ClCompile Include="src\Timezone.cpp" />
+    <ClCompile Include="src\UUID.cpp"/>
+    <ClCompile Include="src\UUIDGenerator.cpp"/>
+    <ClCompile Include="src\Clock.cpp"/>
+    <ClCompile Include="src\DateTime.cpp"/>
+    <ClCompile Include="src\DateTimeFormat.cpp"/>
+    <ClCompile Include="src\DateTimeFormatter.cpp"/>
+    <ClCompile Include="src\DateTimeParser.cpp"/>
+    <ClCompile Include="src\LocalDateTime.cpp"/>
+    <ClCompile Include="src\Stopwatch.cpp"/>
+    <ClCompile Include="src\Timespan.cpp"/>
+    <ClCompile Include="src\Timestamp.cpp"/>
+    <ClCompile Include="src\Timezone.cpp"/>
     <ClCompile Include="src\Timezone_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -984,392 +961,399 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ASCIIEncoding.cpp" />
-    <ClCompile Include="src\Latin1Encoding.cpp" />
-    <ClCompile Include="src\Latin9Encoding.cpp" />
-    <ClCompile Include="src\StreamConverter.cpp" />
-    <ClCompile Include="src\TextBufferIterator.cpp" />
-    <ClCompile Include="src\TextConverter.cpp" />
-    <ClCompile Include="src\TextEncoding.cpp" />
-    <ClCompile Include="src\TextIterator.cpp" />
-    <ClCompile Include="src\Unicode.cpp" />
-    <ClCompile Include="src\UnicodeConverter.cpp" />
-    <ClCompile Include="src\UTF16Encoding.cpp" />
-    <ClCompile Include="src\UTF8Encoding.cpp" />
-    <ClCompile Include="src\UTF8String.cpp" />
-    <ClCompile Include="src\Windows1252Encoding.cpp" />
-    <ClCompile Include="src\FileStreamFactory.cpp" />
-    <ClCompile Include="src\URI.cpp" />
-    <ClCompile Include="src\URIStreamFactory.cpp" />
-    <ClCompile Include="src\URIStreamOpener.cpp" />
-    <ClCompile Include="src\Task.cpp" />
-    <ClCompile Include="src\TaskManager.cpp" />
-    <ClCompile Include="src\TaskNotification.cpp" />
-    <ClCompile Include="src\EventArgs.cpp" />
-    <ClCompile Include="src\Hash.cpp" />
-    <ClCompile Include="src\HashStatistic.cpp" />
+    <ClCompile Include="src\ASCIIEncoding.cpp"/>
+    <ClCompile Include="src\Latin1Encoding.cpp"/>
+    <ClCompile Include="src\Latin2Encoding.cpp"/>
+    <ClCompile Include="src\Latin9Encoding.cpp"/>
+    <ClCompile Include="src\StreamConverter.cpp"/>
+    <ClCompile Include="src\TextBufferIterator.cpp"/>
+    <ClCompile Include="src\TextConverter.cpp"/>
+    <ClCompile Include="src\TextEncoding.cpp"/>
+    <ClCompile Include="src\TextIterator.cpp"/>
+    <ClCompile Include="src\Unicode.cpp"/>
+    <ClCompile Include="src\UnicodeConverter.cpp"/>
+    <ClCompile Include="src\UTF16Encoding.cpp"/>
+    <ClCompile Include="src\UTF32Encoding.cpp"/>
+    <ClCompile Include="src\UTF8Encoding.cpp"/>
+    <ClCompile Include="src\UTF8String.cpp"/>
+    <ClCompile Include="src\Windows1250Encoding.cpp"/>
+    <ClCompile Include="src\Windows1251Encoding.cpp"/>
+    <ClCompile Include="src\Windows1252Encoding.cpp"/>
+    <ClCompile Include="src\FileStreamFactory.cpp"/>
+    <ClCompile Include="src\URI.cpp"/>
+    <ClCompile Include="src\URIStreamFactory.cpp"/>
+    <ClCompile Include="src\URIStreamOpener.cpp"/>
+    <ClCompile Include="src\Task.cpp"/>
+    <ClCompile Include="src\TaskManager.cpp"/>
+    <ClCompile Include="src\TaskNotification.cpp"/>
+    <ClCompile Include="src\EventArgs.cpp"/>
+    <ClCompile Include="src\Hash.cpp"/>
+    <ClCompile Include="src\HashStatistic.cpp"/>
+    <ClCompile Include="src\Var.cpp"/>
+    <ClCompile Include="src\VarHolder.cpp"/>
+    <ClCompile Include="src\VarIterator.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Any.h" />
-    <ClInclude Include="include\Poco\Array.h" />
-    <ClInclude Include="include\Poco\Ascii.h" />
-    <ClInclude Include="include\Poco\AtomicCounter.h" />
-    <ClInclude Include="include\Poco\AutoPtr.h" />
-    <ClInclude Include="include\Poco\AutoReleasePool.h" />
-    <ClInclude Include="include\Poco\Base32Decoder.h" />
-    <ClInclude Include="include\Poco\Base32Encoder.h" />
-    <ClInclude Include="include\Poco\Buffer.h" />
-    <ClInclude Include="include\Poco\Bugcheck.h" />
-    <ClInclude Include="include\Poco\ByteOrder.h" />
-    <ClInclude Include="include\Poco\Checksum.h" />
-    <ClInclude Include="include\Poco\Config.h" />
-    <ClInclude Include="include\Poco\DirectoryWatcher.h" />
-    <ClInclude Include="include\Poco\Debugger.h" />
-    <ClInclude Include="include\Poco\DynamicAny.h" />
-    <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
-    <ClInclude Include="include\Poco\DynamicFactory.h" />
-    <ClInclude Include="include\Poco\Dynamic\Pair.h" />
-    <ClInclude Include="include\Poco\Dynamic\Struct.h" />
-    <ClInclude Include="include\Poco\Dynamic\Var.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
-    <ClInclude Include="include\Poco\Environment.h" />
-    <ClInclude Include="include\Poco\Environment_UNIX.h" />
-    <ClInclude Include="include\Poco\Environment_VMS.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-    <ClInclude Include="include\Poco\Error.h" />
-    <ClInclude Include="include\Poco\Exception.h" />
-    <ClInclude Include="include\Poco\FIFOBuffer.h" />
-    <ClInclude Include="include\Poco\FIFOBufferStream.h" />
-    <ClInclude Include="include\Poco\Format.h" />
-    <ClInclude Include="include\Poco\Foundation.h" />
-    <ClInclude Include="include\Poco\FPEnvironment.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_C99.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DEC.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
-    <ClInclude Include="include\Poco\Instantiator.h" />
-    <ClInclude Include="include\Poco\Latin2Encoding.h" />
-    <ClInclude Include="include\Poco\ListMap.h" />
-    <ClInclude Include="include\Poco\MemoryPool.h" />
-    <ClInclude Include="include\Poco\MetaProgramming.h" />
-    <ClInclude Include="include\Poco\NamedTuple.h" />
-    <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
-    <ClInclude Include="include\Poco\Nullable.h" />
-    <ClInclude Include="include\Poco\NumberFormatter.h" />
-    <ClInclude Include="include\Poco\NumberParser.h" />
-    <ClInclude Include="include\Poco\NumericString.h" />
-    <ClInclude Include="include\Poco\ObjectPool.h" />
-    <ClInclude Include="include\Poco\Optional.h" />
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
-    <ClInclude Include="include\Poco\Platform.h" />
-    <ClInclude Include="include\Poco\Platform_POSIX.h" />
-    <ClInclude Include="include\Poco\Platform_VMS.h" />
-    <ClInclude Include="include\Poco\Platform_WIN32.h" />
-    <ClInclude Include="include\Poco\Poco.h" />
-    <ClInclude Include="include\Poco\PriorityStrategy.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
-    <ClInclude Include="include\poco\DirectoryIteratorStrategy.h" />
-    <ClInclude Include="include\Poco\RefCountedObject.h" />
-    <ClInclude Include="include\Poco\SharedPtr.h" />
-    <ClInclude Include="include\Poco\SingletonHolder.h" />
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\String.h" />
-    <ClInclude Include="include\Poco\StringTokenizer.h" />
-    <ClInclude Include="include\Poco\Tuple.h" />
-    <ClInclude Include="include\Poco\TypeList.h" />
-    <ClInclude Include="include\Poco\Types.h" />
-    <ClInclude Include="include\Poco\UnWindows.h" />
-    <ClInclude Include="include\Poco\UTF32Encoding.h" />
-    <ClInclude Include="include\Poco\UTFString.h" />
-    <ClInclude Include="include\Poco\Version.h" />
-    <ClInclude Include="include\Poco\Void.h" />
-    <ClInclude Include="include\Poco\Base64Decoder.h" />
-    <ClInclude Include="include\Poco\Base64Encoder.h" />
-    <ClInclude Include="include\Poco\BinaryReader.h" />
-    <ClInclude Include="include\Poco\BinaryWriter.h" />
-    <ClInclude Include="include\Poco\BufferAllocator.h" />
-    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h" />
-    <ClInclude Include="include\Poco\BufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\CountingStream.h" />
-    <ClInclude Include="include\Poco\DeflatingStream.h" />
-    <ClInclude Include="include\Poco\FileStream.h" />
-    <ClInclude Include="include\Poco\FileStream_POSIX.h" />
-    <ClInclude Include="include\Poco\FileStream_WIN32.h" />
-    <ClInclude Include="include\Poco\HexBinaryDecoder.h" />
-    <ClInclude Include="include\Poco\HexBinaryEncoder.h" />
-    <ClInclude Include="include\Poco\InflatingStream.h" />
-    <ClInclude Include="include\Poco\LineEndingConverter.h" />
-    <ClInclude Include="include\Poco\MemoryStream.h" />
-    <ClInclude Include="include\Poco\NullStream.h" />
-    <ClInclude Include="include\Poco\StreamCopier.h" />
-    <ClInclude Include="include\Poco\StreamTokenizer.h" />
-    <ClInclude Include="include\Poco\StreamUtil.h" />
-    <ClInclude Include="include\Poco\TeeStream.h" />
-    <ClInclude Include="include\Poco\Token.h" />
-    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\Windows1250Encoding.h" />
-    <ClInclude Include="include\Poco\Windows1251Encoding.h" />
-    <ClInclude Include="src\crc32.h" />
-    <ClInclude Include="src\deflate.h" />
-    <ClInclude Include="src\inffast.h" />
-    <ClInclude Include="src\inffixed.h" />
-    <ClInclude Include="src\inflate.h" />
-    <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\zconf.h" />
-    <ClInclude Include="src\zlib.h" />
-    <ClInclude Include="src\zutil.h" />
-    <ClInclude Include="include\Poco\ActiveDispatcher.h" />
-    <ClInclude Include="include\Poco\ActiveMethod.h" />
-    <ClInclude Include="include\Poco\ActiveResult.h" />
-    <ClInclude Include="include\Poco\ActiveRunnable.h" />
-    <ClInclude Include="include\Poco\ActiveStarter.h" />
-    <ClInclude Include="include\Poco\Activity.h" />
-    <ClInclude Include="include\Poco\Condition.h" />
-    <ClInclude Include="include\Poco\ErrorHandler.h" />
-    <ClInclude Include="include\Poco\Event.h" />
-    <ClInclude Include="include\Poco\Event_POSIX.h" />
-    <ClInclude Include="include\Poco\Event_WIN32.h" />
-    <ClInclude Include="include\Poco\Mutex.h" />
-    <ClInclude Include="include\Poco\Mutex_POSIX.h" />
-    <ClInclude Include="include\Poco\Mutex_WIN32.h" />
-    <ClInclude Include="include\Poco\Runnable.h" />
-    <ClInclude Include="include\Poco\RunnableAdapter.h" />
-    <ClInclude Include="include\Poco\RWLock.h" />
-    <ClInclude Include="include\Poco\RWLock_POSIX.h" />
-    <ClInclude Include="include\Poco\RWLock_WIN32.h" />
-    <ClInclude Include="include\Poco\ScopedLock.h" />
-    <ClInclude Include="include\Poco\ScopedUnlock.h" />
-    <ClInclude Include="include\Poco\Semaphore.h" />
-    <ClInclude Include="include\Poco\Semaphore_POSIX.h" />
-    <ClInclude Include="include\Poco\Semaphore_WIN32.h" />
-    <ClInclude Include="include\Poco\SignalHandler.h" />
-    <ClInclude Include="include\Poco\SynchronizedObject.h" />
-    <ClInclude Include="include\Poco\Thread.h" />
-    <ClInclude Include="include\Poco\Thread_POSIX.h" />
-    <ClInclude Include="include\Poco\Thread_WIN32.h" />
-    <ClInclude Include="include\Poco\ThreadLocal.h" />
-    <ClInclude Include="include\Poco\ThreadPool.h" />
-    <ClInclude Include="include\Poco\ThreadTarget.h" />
-    <ClInclude Include="include\Poco\Timer.h" />
-    <ClInclude Include="include\Poco\DigestEngine.h" />
-    <ClInclude Include="include\Poco\DigestStream.h" />
-    <ClInclude Include="include\Poco\HMACEngine.h" />
-    <ClInclude Include="include\Poco\MD4Engine.h" />
-    <ClInclude Include="include\Poco\MD5Engine.h" />
-    <ClInclude Include="include\Poco\Random.h" />
-    <ClInclude Include="include\Poco\RandomStream.h" />
-    <ClInclude Include="include\Poco\SHA1Engine.h" />
-    <ClInclude Include="include\Poco\ClassLibrary.h" />
-    <ClInclude Include="include\Poco\ClassLoader.h" />
-    <ClInclude Include="include\Poco\Manifest.h" />
-    <ClInclude Include="include\Poco\MetaObject.h" />
-    <ClInclude Include="include\Poco\SharedLibrary.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_VMS.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
-    <ClInclude Include="src\ucp.h" />
-    <ClInclude Include="include\Poco\RegularExpression.h" />
-    <ClInclude Include="include\Poco\ArchiveStrategy.h" />
-    <ClInclude Include="include\Poco\AsyncChannel.h" />
-    <ClInclude Include="include\Poco\Channel.h" />
-    <ClInclude Include="include\Poco\Configurable.h" />
-    <ClInclude Include="include\Poco\ConsoleChannel.h" />
-    <ClInclude Include="include\Poco\EventLogChannel.h" />
-    <ClInclude Include="include\Poco\FileChannel.h" />
-    <ClInclude Include="include\Poco\Formatter.h" />
-    <ClInclude Include="include\Poco\FormattingChannel.h" />
-    <ClInclude Include="include\Poco\LogFile.h" />
-    <ClInclude Include="include\Poco\LogFile_STD.h" />
-    <ClInclude Include="include\Poco\LogFile_VMS.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
-    <ClInclude Include="include\Poco\Logger.h" />
-    <ClInclude Include="include\Poco\LoggingFactory.h" />
-    <ClInclude Include="include\Poco\LoggingRegistry.h" />
-    <ClInclude Include="include\Poco\LogStream.h" />
-    <ClInclude Include="include\Poco\Message.h" />
-    <ClInclude Include="include\Poco\NullChannel.h" />
-    <ClInclude Include="include\Poco\OpcomChannel.h" />
-    <ClInclude Include="include\Poco\PatternFormatter.h" />
-    <ClInclude Include="src\pocomsg.h" />
-    <ClInclude Include="include\Poco\PurgeStrategy.h" />
-    <ClInclude Include="include\Poco\RotateStrategy.h" />
-    <ClInclude Include="include\Poco\SimpleFileChannel.h" />
-    <ClInclude Include="include\Poco\SplitterChannel.h" />
-    <ClInclude Include="include\Poco\StreamChannel.h" />
-    <ClInclude Include="include\Poco\SyslogChannel.h" />
-    <ClInclude Include="include\Poco\WindowsConsoleChannel.h" />
-    <ClInclude Include="include\Poco\AbstractObserver.h" />
-    <ClInclude Include="include\Poco\NObserver.h" />
-    <ClInclude Include="include\Poco\Notification.h" />
-    <ClInclude Include="include\Poco\NotificationCenter.h" />
-    <ClInclude Include="include\Poco\NotificationQueue.h" />
-    <ClInclude Include="include\Poco\Observer.h" />
-    <ClInclude Include="include\Poco\PriorityNotificationQueue.h" />
-    <ClInclude Include="include\Poco\TimedNotificationQueue.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
-    <ClInclude Include="include\Poco\File.h" />
-    <ClInclude Include="include\Poco\File_UNIX.h" />
-    <ClInclude Include="include\Poco\File_VMS.h" />
-    <ClInclude Include="include\Poco\File_WIN32.h" />
-    <ClInclude Include="include\Poco\File_WIN32U.h" />
-    <ClInclude Include="include\Poco\Glob.h" />
-    <ClInclude Include="include\Poco\Path.h" />
-    <ClInclude Include="include\Poco\Path_UNIX.h" />
-    <ClInclude Include="include\Poco\Path_VMS.h" />
-    <ClInclude Include="include\Poco\Path_WIN32.h" />
-    <ClInclude Include="include\Poco\Path_WIN32U.h" />
-    <ClInclude Include="include\Poco\TemporaryFile.h" />
-    <ClInclude Include="include\Poco\NamedEvent.h" />
-    <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedEvent_VMS.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
-    <ClInclude Include="include\Poco\NamedMutex.h" />
-    <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedMutex_VMS.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
-    <ClInclude Include="include\Poco\Pipe.h" />
-    <ClInclude Include="include\Poco\PipeImpl.h" />
-    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h" />
-    <ClInclude Include="include\Poco\PipeImpl_POSIX.h" />
-    <ClInclude Include="include\Poco\PipeImpl_WIN32.h" />
-    <ClInclude Include="include\Poco\PipeStream.h" />
-    <ClInclude Include="include\Poco\Process.h" />
-    <ClInclude Include="include\Poco\Process_UNIX.h" />
-    <ClInclude Include="include\Poco\Process_VMS.h" />
-    <ClInclude Include="include\Poco\Process_WIN32.h" />
-    <ClInclude Include="include\Poco\Process_WIN32U.h" />
-    <ClInclude Include="include\Poco\SharedMemory.h" />
-    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />
-    <ClInclude Include="include\Poco\SharedMemory_POSIX.h" />
-    <ClInclude Include="include\Poco\SharedMemory_WIN32.h" />
-    <ClInclude Include="include\Poco\UUID.h" />
-    <ClInclude Include="include\Poco\UUIDGenerator.h" />
-    <ClInclude Include="include\Poco\Clock.h" />
-    <ClInclude Include="include\Poco\DateTime.h" />
-    <ClInclude Include="include\Poco\DateTimeFormat.h" />
-    <ClInclude Include="include\Poco\DateTimeFormatter.h" />
-    <ClInclude Include="include\Poco\DateTimeParser.h" />
-    <ClInclude Include="include\Poco\LocalDateTime.h" />
-    <ClInclude Include="include\Poco\Stopwatch.h" />
-    <ClInclude Include="include\Poco\Timespan.h" />
-    <ClInclude Include="include\Poco\Timestamp.h" />
-    <ClInclude Include="include\Poco\Timezone.h" />
-    <ClInclude Include="include\Poco\ASCIIEncoding.h" />
-    <ClInclude Include="include\Poco\Latin1Encoding.h" />
-    <ClInclude Include="include\Poco\Latin9Encoding.h" />
-    <ClInclude Include="include\Poco\StreamConverter.h" />
-    <ClInclude Include="include\Poco\TextBufferIterator.h" />
-    <ClInclude Include="include\Poco\TextConverter.h" />
-    <ClInclude Include="include\Poco\TextEncoding.h" />
-    <ClInclude Include="include\Poco\TextIterator.h" />
-    <ClInclude Include="include\Poco\Unicode.h" />
-    <ClInclude Include="include\Poco\UnicodeConverter.h" />
-    <ClInclude Include="include\Poco\UTF16Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8String.h" />
-    <ClInclude Include="include\Poco\Windows1252Encoding.h" />
-    <ClInclude Include="include\Poco\FileStreamFactory.h" />
-    <ClInclude Include="include\Poco\URI.h" />
-    <ClInclude Include="include\Poco\URIStreamFactory.h" />
-    <ClInclude Include="include\Poco\URIStreamOpener.h" />
-    <ClInclude Include="include\Poco\Task.h" />
-    <ClInclude Include="include\Poco\TaskManager.h" />
-    <ClInclude Include="include\Poco\TaskNotification.h" />
-    <ClInclude Include="include\Poco\AbstractDelegate.h" />
-    <ClInclude Include="include\Poco\AbstractEvent.h" />
-    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\BasicEvent.h" />
-    <ClInclude Include="include\Poco\DefaultStrategy.h" />
-    <ClInclude Include="include\Poco\Delegate.h" />
-    <ClInclude Include="include\Poco\EventArgs.h" />
-    <ClInclude Include="include\Poco\Expire.h" />
-    <ClInclude Include="include\Poco\FIFOEvent.h" />
-    <ClInclude Include="include\Poco\FIFOStrategy.h" />
-    <ClInclude Include="include\Poco\FunctionDelegate.h" />
-    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\NotificationStrategy.h" />
-    <ClInclude Include="include\Poco\PriorityDelegate.h" />
-    <ClInclude Include="include\Poco\PriorityEvent.h" />
-    <ClInclude Include="include\Poco\PriorityExpire.h" />
-    <ClInclude Include="include\Poco\AbstractCache.h" />
-    <ClInclude Include="include\Poco\AbstractStrategy.h" />
-    <ClInclude Include="include\Poco\AccessExpireCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\ExpireCache.h" />
-    <ClInclude Include="include\Poco\ExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\ExpireStrategy.h" />
-    <ClInclude Include="include\Poco\KeyValueArgs.h" />
-    <ClInclude Include="include\Poco\LRUCache.h" />
-    <ClInclude Include="include\Poco\LRUStrategy.h" />
-    <ClInclude Include="include\Poco\StrategyCollection.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\UniqueExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ValidArgs.h" />
-    <ClInclude Include="include\Poco\Hash.h" />
-    <ClInclude Include="include\Poco\HashFunction.h" />
-    <ClInclude Include="include\Poco\HashMap.h" />
-    <ClInclude Include="include\Poco\HashSet.h" />
-    <ClInclude Include="include\Poco\HashStatistic.h" />
-    <ClInclude Include="include\Poco\HashTable.h" />
-    <ClInclude Include="include\Poco\LinearHashTable.h" />
-    <ClInclude Include="include\Poco\SimpleHashTable.h" />
+    <ClInclude Include="include\Poco\Any.h"/>
+    <ClInclude Include="include\Poco\Ascii.h"/>
+    <ClInclude Include="include\Poco\AtomicCounter.h"/>
+    <ClInclude Include="include\Poco\AutoPtr.h"/>
+    <ClInclude Include="include\Poco\AutoReleasePool.h"/>
+    <ClInclude Include="include\Poco\Buffer.h"/>
+    <ClInclude Include="include\Poco\Bugcheck.h"/>
+    <ClInclude Include="include\Poco\ByteOrder.h"/>
+    <ClInclude Include="include\Poco\Checksum.h"/>
+    <ClInclude Include="include\Poco\Config.h"/>
+    <ClInclude Include="include\Poco\Debugger.h"/>
+    <ClInclude Include="include\Poco\DynamicAny.h"/>
+    <ClInclude Include="include\Poco\DynamicAnyHolder.h"/>
+    <ClInclude Include="include\Poco\DynamicFactory.h"/>
+    <ClInclude Include="include\Poco\Environment.h"/>
+    <ClInclude Include="include\Poco\Environment_UNIX.h"/>
+    <ClInclude Include="include\Poco\Environment_VMS.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Error.h"/>
+    <ClInclude Include="include\Poco\Exception.h"/>
+    <ClInclude Include="include\Poco\FIFOBuffer.h"/>
+    <ClInclude Include="include\Poco\Format.h"/>
+    <ClInclude Include="include\Poco\Foundation.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_C99.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DEC.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_SUN.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Instantiator.h"/>
+    <ClInclude Include="include\Poco\JSONString.h"/>
+    <ClInclude Include="include\Poco\MemoryPool.h"/>
+    <ClInclude Include="include\Poco\MetaProgramming.h"/>
+    <ClInclude Include="include\Poco\NamedTuple.h"/>
+    <ClInclude Include="include\Poco\NestedDiagnosticContext.h"/>
+    <ClInclude Include="include\Poco\Nullable.h"/>
+    <ClInclude Include="include\Poco\NumberFormatter.h"/>
+    <ClInclude Include="include\Poco\NumberParser.h"/>
+    <ClInclude Include="include\Poco\NumericString.h"/>
+    <ClInclude Include="include\Poco\ObjectPool.h"/>
+    <ClInclude Include="include\Poco\Optional.h"/>
+    <ClInclude Include="include\Poco\Platform.h"/>
+    <ClInclude Include="include\Poco\Platform_POSIX.h"/>
+    <ClInclude Include="include\Poco\Platform_VMS.h"/>
+    <ClInclude Include="include\Poco\Platform_WIN32.h"/>
+    <ClInclude Include="include\Poco\Poco.h"/>
+    <ClInclude Include="include\Poco\RefCountedObject.h"/>
+    <ClInclude Include="include\Poco\SharedPtr.h"/>
+    <ClInclude Include="include\Poco\SingletonHolder.h"/>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\String.h"/>
+    <ClInclude Include="include\Poco\StringTokenizer.h"/>
+    <ClInclude Include="include\Poco\Tuple.h"/>
+    <ClInclude Include="include\Poco\TypeList.h"/>
+    <ClInclude Include="include\Poco\Types.h"/>
+    <ClInclude Include="include\Poco\UnWindows.h"/>
+    <ClInclude Include="include\Poco\Version.h"/>
+    <ClInclude Include="include\Poco\Void.h"/>
+    <ClInclude Include="include\Poco\Base32Decoder.h"/>
+    <ClInclude Include="include\Poco\Base32Encoder.h"/>
+    <ClInclude Include="include\Poco\Base64Decoder.h"/>
+    <ClInclude Include="include\Poco\Base64Encoder.h"/>
+    <ClInclude Include="include\Poco\BinaryReader.h"/>
+    <ClInclude Include="include\Poco\BinaryWriter.h"/>
+    <ClInclude Include="include\Poco\BufferAllocator.h"/>
+    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h"/>
+    <ClInclude Include="include\Poco\BufferedStreamBuf.h"/>
+    <ClInclude Include="include\Poco\CountingStream.h"/>
+    <ClInclude Include="include\Poco\DeflatingStream.h"/>
+    <ClInclude Include="include\Poco\FileStream.h"/>
+    <ClInclude Include="include\Poco\FileStream_POSIX.h"/>
+    <ClInclude Include="include\Poco\FileStream_WIN32.h"/>
+    <ClInclude Include="include\Poco\HexBinaryDecoder.h"/>
+    <ClInclude Include="include\Poco\HexBinaryEncoder.h"/>
+    <ClInclude Include="include\Poco\InflatingStream.h"/>
+    <ClInclude Include="include\Poco\LineEndingConverter.h"/>
+    <ClInclude Include="include\Poco\MemoryStream.h"/>
+    <ClInclude Include="include\Poco\NullStream.h"/>
+    <ClInclude Include="include\Poco\StreamCopier.h"/>
+    <ClInclude Include="include\Poco\StreamTokenizer.h"/>
+    <ClInclude Include="include\Poco\StreamUtil.h"/>
+    <ClInclude Include="include\Poco\TeeStream.h"/>
+    <ClInclude Include="include\Poco\Token.h"/>
+    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h"/>
+    <ClInclude Include="src\crc32.h"/>
+    <ClInclude Include="src\deflate.h"/>
+    <ClInclude Include="src\inffast.h"/>
+    <ClInclude Include="src\inffixed.h"/>
+    <ClInclude Include="src\inflate.h"/>
+    <ClInclude Include="src\inftrees.h"/>
+    <ClInclude Include="src\trees.h"/>
+    <ClInclude Include="src\zconf.h"/>
+    <ClInclude Include="src\zlib.h"/>
+    <ClInclude Include="src\zutil.h"/>
+    <ClInclude Include="include\Poco\ActiveDispatcher.h"/>
+    <ClInclude Include="include\Poco\ActiveMethod.h"/>
+    <ClInclude Include="include\Poco\ActiveResult.h"/>
+    <ClInclude Include="include\Poco\ActiveRunnable.h"/>
+    <ClInclude Include="include\Poco\ActiveStarter.h"/>
+    <ClInclude Include="include\Poco\Activity.h"/>
+    <ClInclude Include="include\Poco\Condition.h"/>
+    <ClInclude Include="include\Poco\ErrorHandler.h"/>
+    <ClInclude Include="include\Poco\Event.h"/>
+    <ClInclude Include="include\Poco\Event_POSIX.h"/>
+    <ClInclude Include="include\Poco\Event_WIN32.h"/>
+    <ClInclude Include="include\Poco\Mutex.h"/>
+    <ClInclude Include="include\Poco\Mutex_POSIX.h"/>
+    <ClInclude Include="include\Poco\Mutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\Runnable.h"/>
+    <ClInclude Include="include\Poco\RunnableAdapter.h"/>
+    <ClInclude Include="include\Poco\RWLock.h"/>
+    <ClInclude Include="include\Poco\RWLock_POSIX.h"/>
+    <ClInclude Include="include\Poco\RWLock_WIN32.h"/>
+    <ClInclude Include="include\Poco\ScopedLock.h"/>
+    <ClInclude Include="include\Poco\ScopedUnlock.h"/>
+    <ClInclude Include="include\Poco\Semaphore.h"/>
+    <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
+    <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
+    <ClInclude Include="include\Poco\SignalHandler.h"/>
+    <ClInclude Include="include\Poco\SynchronizedObject.h"/>
+    <ClInclude Include="include\Poco\Thread.h"/>
+    <ClInclude Include="include\Poco\Thread_POSIX.h"/>
+    <ClInclude Include="include\Poco\Thread_WIN32.h"/>
+    <ClInclude Include="include\Poco\ThreadLocal.h"/>
+    <ClInclude Include="include\Poco\ThreadPool.h"/>
+    <ClInclude Include="include\Poco\ThreadTarget.h"/>
+    <ClInclude Include="include\Poco\Timer.h"/>
+    <ClInclude Include="include\Poco\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\DigestStream.h"/>
+    <ClInclude Include="include\Poco\HMACEngine.h"/>
+    <ClInclude Include="include\Poco\MD4Engine.h"/>
+    <ClInclude Include="include\Poco\MD5Engine.h"/>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h"/>
+    <ClInclude Include="include\Poco\Random.h"/>
+    <ClInclude Include="include\Poco\RandomStream.h"/>
+    <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\ClassLibrary.h"/>
+    <ClInclude Include="include\Poco\ClassLoader.h"/>
+    <ClInclude Include="include\Poco\Manifest.h"/>
+    <ClInclude Include="include\Poco\MetaObject.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_VMS.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"/>
+    <ClInclude Include="src\pcre.h"/>
+    <ClInclude Include="src\pcre_config.h"/>
+    <ClInclude Include="src\pcre_internal.h"/>
+    <ClInclude Include="src\ucp.h"/>
+    <ClInclude Include="include\Poco\RegularExpression.h"/>
+    <ClInclude Include="include\Poco\ArchiveStrategy.h"/>
+    <ClInclude Include="include\Poco\AsyncChannel.h"/>
+    <ClInclude Include="include\Poco\Channel.h"/>
+    <ClInclude Include="include\Poco\Configurable.h"/>
+    <ClInclude Include="include\Poco\ConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\EventLogChannel.h"/>
+    <ClInclude Include="include\Poco\FileChannel.h"/>
+    <ClInclude Include="include\Poco\Formatter.h"/>
+    <ClInclude Include="include\Poco\FormattingChannel.h"/>
+    <ClInclude Include="include\Poco\LogFile.h"/>
+    <ClInclude Include="include\Poco\LogFile_STD.h"/>
+    <ClInclude Include="include\Poco\LogFile_VMS.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Logger.h"/>
+    <ClInclude Include="include\Poco\LoggingFactory.h"/>
+    <ClInclude Include="include\Poco\LoggingRegistry.h"/>
+    <ClInclude Include="include\Poco\LogStream.h"/>
+    <ClInclude Include="include\Poco\Message.h"/>
+    <ClInclude Include="include\Poco\NullChannel.h"/>
+    <ClInclude Include="include\Poco\OpcomChannel.h"/>
+    <ClInclude Include="include\Poco\PatternFormatter.h"/>
+    <ClInclude Include="src\pocomsg.h"/>
+    <ClInclude Include="include\Poco\PurgeStrategy.h"/>
+    <ClInclude Include="include\Poco\RotateStrategy.h"/>
+    <ClInclude Include="include\Poco\SimpleFileChannel.h"/>
+    <ClInclude Include="include\Poco\SplitterChannel.h"/>
+    <ClInclude Include="include\Poco\StreamChannel.h"/>
+    <ClInclude Include="include\Poco\SyslogChannel.h"/>
+    <ClInclude Include="include\Poco\WindowsConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\AbstractObserver.h"/>
+    <ClInclude Include="include\Poco\NObserver.h"/>
+    <ClInclude Include="include\Poco\Notification.h"/>
+    <ClInclude Include="include\Poco\NotificationCenter.h"/>
+    <ClInclude Include="include\Poco\NotificationQueue.h"/>
+    <ClInclude Include="include\Poco\Observer.h"/>
+    <ClInclude Include="include\Poco\PriorityNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\TimedNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"/>
+    <ClInclude Include="include\Poco\DirectoryWatcher.h"/>
+    <ClInclude Include="include\Poco\File.h"/>
+    <ClInclude Include="include\Poco\File_UNIX.h"/>
+    <ClInclude Include="include\Poco\File_VMS.h"/>
+    <ClInclude Include="include\Poco\File_WIN32.h"/>
+    <ClInclude Include="include\Poco\File_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Glob.h"/>
+    <ClInclude Include="include\Poco\Path.h"/>
+    <ClInclude Include="include\Poco\Path_UNIX.h"/>
+    <ClInclude Include="include\Poco\Path_VMS.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32U.h"/>
+    <ClInclude Include="include\Poco\TemporaryFile.h"/>
+    <ClInclude Include="include\Poco\NamedEvent.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h"/>
+    <ClInclude Include="include\Poco\NamedMutex.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Pipe.h"/>
+    <ClInclude Include="include\Poco\PipeImpl.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_POSIX.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_WIN32.h"/>
+    <ClInclude Include="include\Poco\PipeStream.h"/>
+    <ClInclude Include="include\Poco\Process.h"/>
+    <ClInclude Include="include\Poco\Process_UNIX.h"/>
+    <ClInclude Include="include\Poco\Process_VMS.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32U.h"/>
+    <ClInclude Include="include\Poco\SharedMemory.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_POSIX.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_WIN32.h"/>
+    <ClInclude Include="include\Poco\UUID.h"/>
+    <ClInclude Include="include\Poco\UUIDGenerator.h"/>
+    <ClInclude Include="include\Poco\Clock.h"/>
+    <ClInclude Include="include\Poco\DateTime.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormat.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormatter.h"/>
+    <ClInclude Include="include\Poco\DateTimeParser.h"/>
+    <ClInclude Include="include\Poco\LocalDateTime.h"/>
+    <ClInclude Include="include\Poco\Stopwatch.h"/>
+    <ClInclude Include="include\Poco\Timespan.h"/>
+    <ClInclude Include="include\Poco\Timestamp.h"/>
+    <ClInclude Include="include\Poco\Timezone.h"/>
+    <ClInclude Include="include\Poco\ASCIIEncoding.h"/>
+    <ClInclude Include="include\Poco\Latin1Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin2Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin9Encoding.h"/>
+    <ClInclude Include="include\Poco\ListMap.h"/>
+    <ClInclude Include="include\Poco\StreamConverter.h"/>
+    <ClInclude Include="include\Poco\TextBufferIterator.h"/>
+    <ClInclude Include="include\Poco\TextConverter.h"/>
+    <ClInclude Include="include\Poco\TextEncoding.h"/>
+    <ClInclude Include="include\Poco\TextIterator.h"/>
+    <ClInclude Include="include\Poco\Unicode.h"/>
+    <ClInclude Include="include\Poco\UnicodeConverter.h"/>
+    <ClInclude Include="include\Poco\UTF16Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF32Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8String.h"/>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1252Encoding.h"/>
+    <ClInclude Include="include\Poco\FileStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URI.h"/>
+    <ClInclude Include="include\Poco\URIStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URIStreamOpener.h"/>
+    <ClInclude Include="include\Poco\Task.h"/>
+    <ClInclude Include="include\Poco\TaskManager.h"/>
+    <ClInclude Include="include\Poco\TaskNotification.h"/>
+    <ClInclude Include="include\Poco\AbstractDelegate.h"/>
+    <ClInclude Include="include\Poco\AbstractEvent.h"/>
+    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\BasicEvent.h"/>
+    <ClInclude Include="include\Poco\DefaultStrategy.h"/>
+    <ClInclude Include="include\Poco\Delegate.h"/>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h"/>
+    <ClInclude Include="include\Poco\EventArgs.h"/>
+    <ClInclude Include="include\Poco\Expire.h"/>
+    <ClInclude Include="include\Poco\FIFOEvent.h"/>
+    <ClInclude Include="include\Poco\FIFOStrategy.h"/>
+    <ClInclude Include="include\Poco\FunctionDelegate.h"/>
+    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\NotificationStrategy.h"/>
+    <ClInclude Include="include\Poco\PriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\PriorityEvent.h"/>
+    <ClInclude Include="include\Poco\PriorityExpire.h"/>
+    <ClInclude Include="include\Poco\PriorityStrategy.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h"/>
+    <ClInclude Include="include\Poco\AbstractCache.h"/>
+    <ClInclude Include="include\Poco\AbstractStrategy.h"/>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\AccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\ExpireCache.h"/>
+    <ClInclude Include="include\Poco\ExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\ExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\KeyValueArgs.h"/>
+    <ClInclude Include="include\Poco\LRUCache.h"/>
+    <ClInclude Include="include\Poco\LRUStrategy.h"/>
+    <ClInclude Include="include\Poco\StrategyCollection.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ValidArgs.h"/>
+    <ClInclude Include="include\Poco\Hash.h"/>
+    <ClInclude Include="include\Poco\HashFunction.h"/>
+    <ClInclude Include="include\Poco\HashMap.h"/>
+    <ClInclude Include="include\Poco\HashSet.h"/>
+    <ClInclude Include="include\Poco\HashStatistic.h"/>
+    <ClInclude Include="include\Poco\HashTable.h"/>
+    <ClInclude Include="include\Poco\LinearHashTable.h"/>
+    <ClInclude Include="include\Poco\SimpleHashTable.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Pair.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Struct.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Var.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarHolder.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarIterator.h"/>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\pocomsg.mc">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
+</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ResourceCompile Include="src\pocomsg.rc"/>
     <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>
-    <ResourceCompile Include="src\pocomsg.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters
index 17453be34c..9a57ad645c 100644
--- a/Foundation/Foundation_vs100.vcxproj.filters
+++ b/Foundation/Foundation_vs100.vcxproj.filters
@@ -2,190 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{185c1200-1c1b-4fc7-9da0-b650d0c1bf77}</UniqueIdentifier>
+      <UniqueIdentifier>{8a9d8b37-9499-4ebf-a920-cb5481594345}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{e4438cfb-753c-4882-b6a7-37f1b2eb7924}</UniqueIdentifier>
+      <UniqueIdentifier>{9d437f49-4b9d-4678-99be-6e74ed58cf94}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{5fef2634-dac7-4251-8cc6-685a55fb6b69}</UniqueIdentifier>
+      <UniqueIdentifier>{6e766d39-b932-4eee-b193-aa0f6922c028}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{27c4af78-bbb6-41df-a186-f2a592f6dd7e}</UniqueIdentifier>
+      <UniqueIdentifier>{80d1d7c0-25b0-414e-a6ba-9d5e673eafb7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{faa6333e-8acd-42d3-b72c-37cd0e19d162}</UniqueIdentifier>
+      <UniqueIdentifier>{719d9138-a1ff-46d7-84fc-4daa8104bd53}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d5c0096d-097d-40c2-ac9e-c52501bca586}</UniqueIdentifier>
+      <UniqueIdentifier>{a712dbcf-3469-44e1-a0ac-7bd5fd6d891f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\zlib">
-      <UniqueIdentifier>{341c25b8-2c02-4356-98af-e9cdc028d65d}</UniqueIdentifier>
+      <UniqueIdentifier>{a4bcf474-02c2-4829-803c-1cca6f47c887}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{dcfb473d-2dc0-419b-82e5-49a02e866436}</UniqueIdentifier>
+      <UniqueIdentifier>{5b2b24b3-662f-48e4-800e-5d03e7b70fc7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8}</UniqueIdentifier>
+      <UniqueIdentifier>{42b76073-c8d9-48c8-8d91-1aae49d792ed}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{2cf5d5b6-8945-4a08-8382-b1ae4760d23c}</UniqueIdentifier>
+      <UniqueIdentifier>{35a7e2eb-614a-4399-949a-0c430676c884}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{d7d8f3d7-1f4d-40b3-b2be-69b169947e81}</UniqueIdentifier>
+      <UniqueIdentifier>{c15d4c2c-9890-4f7c-a6ae-d6d3f4f4b355}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{4eac0cd3-fa98-44f0-ba4b-126eea40690d}</UniqueIdentifier>
+      <UniqueIdentifier>{89d096d6-8bb2-45a5-8eb4-f6fe97315441}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{641198e1-de95-4b94-8f88-740c2b199cf7}</UniqueIdentifier>
+      <UniqueIdentifier>{e9b702a7-7996-404d-9d43-de09b6376501}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{69ead8e2-e830-4352-b858-3b7fa83c6f69}</UniqueIdentifier>
+      <UniqueIdentifier>{ff4d64a4-bb72-431f-989e-480f067f41de}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{86878c35-6789-4bed-96b4-27ddf9c57acd}</UniqueIdentifier>
+      <UniqueIdentifier>{71bf4d77-a088-4a98-ab8d-3185e8ec9ee6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{7de594c4-642c-4ac5-b236-7056ccaa6191}</UniqueIdentifier>
+      <UniqueIdentifier>{31e2cf37-b8b8-4068-b43c-eecbf0102de4}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression">
-      <UniqueIdentifier>{74d499e8-5aec-4f63-9522-26bc8b2e4e1e}</UniqueIdentifier>
+      <UniqueIdentifier>{040e6e5d-fd97-4fc7-8c4a-5466e8d695fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{aad0de07-cbb7-4cf9-acbb-46b3c529ef72}</UniqueIdentifier>
+      <UniqueIdentifier>{1d20c128-c3b2-4552-b75b-80ebf1446c4b}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Source Files">
-      <UniqueIdentifier>{59eea661-94fe-4cfa-a84a-3ed55d6fc6c2}</UniqueIdentifier>
+      <UniqueIdentifier>{a323de5e-8d8b-45ee-9e9e-bfbf34c1190c}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
-      <UniqueIdentifier>{0b1828a5-18ba-4155-a8f9-2c488e582c0d}</UniqueIdentifier>
+      <UniqueIdentifier>{4a5c7edc-c701-4559-9e14-5ec68f472aa5}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{ddc6a944-851d-4fae-9ae2-58c7abb800ae}</UniqueIdentifier>
+      <UniqueIdentifier>{63dba980-55e6-4057-9af3-7b9261eede8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{96f5ad60-2335-463a-8e23-da1476ed46f2}</UniqueIdentifier>
+      <UniqueIdentifier>{dff2c175-f905-43a9-9e22-554950306cc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{06229b8b-13a0-43b1-8f11-53373321e5cd}</UniqueIdentifier>
+      <UniqueIdentifier>{f2730476-80f0-4e0d-895d-3c76990435c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{5274aca5-2472-4212-a11a-7d23ff583083}</UniqueIdentifier>
+      <UniqueIdentifier>{9c9b2aa9-00dc-498f-b8ec-d1ea47d0ca21}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Message Files">
-      <UniqueIdentifier>{c9340af5-5ac1-4082-8fee-f6343b9ab2e2}</UniqueIdentifier>
+      <UniqueIdentifier>{9f4e837b-6bd0-44a4-a7a0-07a506f0dd86}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Resource Files">
-      <UniqueIdentifier>{d723209d-84d0-4890-ac64-4949699f6e3a}</UniqueIdentifier>
+      <UniqueIdentifier>{fb9fc0c0-e625-4e5e-aa11-2581bd0e65a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{44de33ce-ef79-4671-8258-65dc5ef863b8}</UniqueIdentifier>
+      <UniqueIdentifier>{8dd643c9-7218-4383-a995-77ec9ff7ac85}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{39e651e5-e5c8-454d-b1f9-456c809dcf92}</UniqueIdentifier>
+      <UniqueIdentifier>{644c9ff1-3eb9-4dd7-b548-70218fc58e74}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{732e2c8f-a8af-4318-9ab9-0d8d62afae54}</UniqueIdentifier>
+      <UniqueIdentifier>{9d5748fb-afc1-4e4f-a85c-29288b93e892}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{5d4bc826-9b0a-4014-9302-cc9f88646ff6}</UniqueIdentifier>
+      <UniqueIdentifier>{0635e326-4b84-49f9-8a44-51fdf68e8f39}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{b8210208-8698-4cda-94fd-3e906f9ca78f}</UniqueIdentifier>
+      <UniqueIdentifier>{509855ed-c537-42a8-a429-6762103e5e16}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{af751147-0509-4d3c-9ab3-b20c20974341}</UniqueIdentifier>
+      <UniqueIdentifier>{5f9b5599-80e9-4820-8833-e290bfee7b58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{359ad015-e38e-423e-877e-c827eed229f2}</UniqueIdentifier>
+      <UniqueIdentifier>{afccfe33-d2b2-4121-ae74-d791766e0420}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{3a817f74-6edb-4098-a29b-8347840a09ae}</UniqueIdentifier>
+      <UniqueIdentifier>{2bb4a0f1-8807-42b1-80f1-3225fd9b8bb4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{a07318ae-554f-44ec-bdfd-6fe0929c3dd3}</UniqueIdentifier>
+      <UniqueIdentifier>{4252f5e9-1966-4389-97b7-2b8105ae183e}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{ece427ab-b6ef-4700-9a42-312b8507a010}</UniqueIdentifier>
+      <UniqueIdentifier>{da50288d-a64b-4bf3-a79b-453696111661}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{eb8ddeab-7b2f-4537-aa4a-939268a1a9a4}</UniqueIdentifier>
+      <UniqueIdentifier>{8e8a0f46-f93c-40df-a90d-a8099084b80c}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{4bcbbcd9-3409-4bcc-b999-f9e360d45a09}</UniqueIdentifier>
+      <UniqueIdentifier>{7ebad2af-94d9-44b0-99b7-e265f1e90e0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{48f74d8c-d6a2-4e5a-a322-55702b35b221}</UniqueIdentifier>
+      <UniqueIdentifier>{1975932d-10bf-4859-8c50-347afbe3b82a}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{6c702a6b-e1d8-4d6e-9c48-dab631371287}</UniqueIdentifier>
+      <UniqueIdentifier>{9f2fb399-aa93-49c5-a161-eb5a18b14500}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{e3e8d759-a950-40ed-9271-17bf7e9baa8e}</UniqueIdentifier>
+      <UniqueIdentifier>{7c545a37-a2dc-4c93-af64-1d57a32bd911}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{3ef3d3a4-84a1-4026-85dd-53e71f3f820f}</UniqueIdentifier>
+      <UniqueIdentifier>{de464833-9460-4ce1-8a8c-964081a0fa20}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{665d566f-5f8f-45d0-b883-a43185dc8ab8}</UniqueIdentifier>
+      <UniqueIdentifier>{0c66a46f-1cc8-451f-b783-ecc4f6225063}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{51e1620d-85e0-493d-819f-960bc0957f0f}</UniqueIdentifier>
+      <UniqueIdentifier>{0777c598-4158-4bc7-ba82-fc2b6cb61ca2}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{ee3f4314-64e7-420c-88d5-df016f15dd4f}</UniqueIdentifier>
+      <UniqueIdentifier>{30eadd08-eb57-4758-ad23-aeb83a7810fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{bc06eae9-3602-448d-8290-4a9a68adbe8b}</UniqueIdentifier>
+      <UniqueIdentifier>{fe4eace2-9e6c-4156-adaa-f64bc8342f15}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{1a21c5ef-d4a6-42dc-94be-5a0a791ba589}</UniqueIdentifier>
+      <UniqueIdentifier>{9dad5c50-ec7c-4dbd-882a-e429a8d09085}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{dafee4e1-a8e0-4af9-bd00-378430a364ea}</UniqueIdentifier>
+      <UniqueIdentifier>{d343f2d3-6a22-4f36-8e7f-a86b9ebc4939}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{cb46df12-6010-4ef6-9f85-937585263f3e}</UniqueIdentifier>
+      <UniqueIdentifier>{545dfe07-1de5-4009-95d8-12862ec30b91}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{50d1f7a3-d675-41b8-8370-2718b2e95c2f}</UniqueIdentifier>
+      <UniqueIdentifier>{19727168-aa32-437a-99d6-7fa1074157a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events">
-      <UniqueIdentifier>{f2886094-2ba3-402c-b5a8-dbfa0500e3d3}</UniqueIdentifier>
+      <UniqueIdentifier>{df8f0860-3532-4844-92ce-bcdc208cebb4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Header Files">
-      <UniqueIdentifier>{7237275f-8924-4f26-96de-066ba722f9c6}</UniqueIdentifier>
+      <UniqueIdentifier>{5b3feeb1-92e6-4a60-bd3a-64a2f11ffe35}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Source Files">
-      <UniqueIdentifier>{cdb9c09a-2a19-4203-a6f4-87455a799508}</UniqueIdentifier>
+      <UniqueIdentifier>{a177179a-d9f5-4b83-b0e7-8eb0a9d4f61b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{040f6767-8762-4b80-9db2-45a2b18c1d86}</UniqueIdentifier>
+      <UniqueIdentifier>{5e6e4dcb-3eab-4d1d-b345-43da345a230a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{3fd772e7-f8cf-42fb-8b1b-5c49b9f79562}</UniqueIdentifier>
+      <UniqueIdentifier>{7db87755-f033-48f4-b7b1-71c8d5bbdec5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{6e184876-2a72-4dd8-87e0-a42022d17513}</UniqueIdentifier>
+      <UniqueIdentifier>{63bb362d-63df-4707-85f3-2e40848140ea}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{251118a8-6f5b-4f8f-b19f-b953058b3820}</UniqueIdentifier>
+      <UniqueIdentifier>{7a813522-06e9-46a9-b171-bbb24c76d92e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{20c16777-1fc6-4272-bf38-fef730596f73}</UniqueIdentifier>
+      <UniqueIdentifier>{f52ab3c3-1e9d-482b-9ae8-b173e604446f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{da88549e-329c-444c-85bb-b2339bc09505}</UniqueIdentifier>
+      <UniqueIdentifier>{fa5dfef7-7b5b-4ed2-ad71-4f8d5f1398f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{1ad862ca-df95-43f5-a87b-a714b9b84303}</UniqueIdentifier>
+      <UniqueIdentifier>{7e18ac06-a1dd-4f8a-b3fb-144a9050be5f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{918536bd-29fb-4b4f-a706-629925dbb66c}</UniqueIdentifier>
+      <UniqueIdentifier>{e40126ed-076a-401c-b56e-d6f2116db2d4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{4d00a3d6-7a50-4553-a62a-8eee081c9fb1}</UniqueIdentifier>
+      <UniqueIdentifier>{74f16959-56a6-4beb-a71f-396478317f37}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -207,6 +207,9 @@
     <ClCompile Include="src\Debugger.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Environment.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -222,6 +225,9 @@
     <ClCompile Include="src\Environment_WIN32U.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Error.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Exception.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -246,6 +252,9 @@
     <ClCompile Include="src\FPEnvironment_WIN32.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MemoryPool.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -258,9 +267,15 @@
     <ClCompile Include="src\NumberParser.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NumericString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SortedDirectoryIterator.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -270,6 +285,12 @@
     <ClCompile Include="src\Void.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Base32Decoder.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Base32Encoder.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Base64Decoder.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -288,6 +309,9 @@
     <ClCompile Include="src\DeflatingStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStream.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -477,6 +501,9 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_byte_order.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_chartables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -486,40 +513,31 @@
     <ClCompile Include="src\pcre_config.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_dfa_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_fullinfo.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
+    <ClCompile Include="src\pcre_get.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
+    <ClCompile Include="src\pcre_globals.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
+    <ClCompile Include="src\pcre_jit_compile.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
+    <ClCompile Include="src\pcre_maketables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
+    <ClCompile Include="src\pcre_newline.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
+    <ClCompile Include="src\pcre_ord2utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_refcount.c">
@@ -528,7 +546,10 @@
     <ClCompile Include="src\pcre_string_utils.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
+    <ClCompile Include="src\pcre_study.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre_tables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_ucd.c">
@@ -537,6 +558,9 @@
     <ClCompile Include="src\pcre_valid_utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_version.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_xclass.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -660,6 +684,9 @@
     <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryWatcher.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\File.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
@@ -819,6 +846,9 @@
     <ClCompile Include="src\Latin1Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Latin2Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Latin9Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -846,12 +876,21 @@
     <ClCompile Include="src\UTF16Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\UTF32Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\UTF8Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\UTF8String.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Windows1250Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Windows1251Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1252Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -885,9 +924,6 @@
     <ClCompile Include="src\HashStatistic.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryWatcher.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Var.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
@@ -897,39 +933,6 @@
     <ClCompile Include="src\VarIterator.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1250Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1251Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStream.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UTF32Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Error.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Base32Decoder.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Base32Encoder.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NumericString.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SortedDirectoryIterator.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -989,9 +992,15 @@
     <ClInclude Include="include\Poco\Environment_WIN32U.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Error.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\FIFOBuffer.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Format.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1019,6 +1028,9 @@
     <ClInclude Include="include\Poco\Instantiator.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\JSONString.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\MemoryPool.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1040,6 +1052,15 @@
     <ClInclude Include="include\Poco\NumberParser.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\NumericString.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\ObjectPool.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Optional.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Platform.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1064,6 +1085,9 @@
     <ClInclude Include="include\Poco\SingletonHolder.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\String.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1088,6 +1112,12 @@
     <ClInclude Include="include\Poco\Void.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Base32Decoder.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Base32Encoder.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Base64Decoder.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -1304,6 +1334,9 @@
     <ClInclude Include="include\Poco\MD5Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Random.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -1487,6 +1520,9 @@
     <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DirectoryWatcher.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\File.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
@@ -1640,9 +1676,15 @@
     <ClInclude Include="include\Poco\Latin1Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Latin2Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Latin9Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ListMap.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\StreamConverter.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1667,12 +1709,21 @@
     <ClInclude Include="include\Poco\UTF16Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\UTF32Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\UTF8Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\UTF8String.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1252Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1715,6 +1766,9 @@
     <ClInclude Include="include\Poco\Delegate.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\EventArgs.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
@@ -1745,12 +1799,24 @@
     <ClInclude Include="include\Poco\PriorityExpire.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PriorityStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AbstractCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\AbstractStrategy.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AccessExpireCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
@@ -1829,15 +1895,6 @@
     <ClInclude Include="include\Poco\SimpleHashTable.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PriorityStrategy.h">
-      <Filter>Events\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryWatcher.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\Pair.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
@@ -1853,66 +1910,6 @@
     <ClInclude Include="include\Poco\Dynamic\VarIterator.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Windows1250Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1251Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Array.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBuffer.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBufferStream.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTF32Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTFString.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\ObjectPool.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Latin2Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\NumericString.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Error.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Base32Decoder.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Base32Encoder.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Optional.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\ListMap.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\poco\DirectoryIteratorStrategy.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PBKDF2Engine.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_vs110.sln b/Foundation/Foundation_vs110.sln
index 21faa17af7..8fe68afca5 100644
--- a/Foundation/Foundation_vs110.sln
+++ b/Foundation/Foundation_vs110.sln
@@ -1,23 +1,20 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs110.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs110.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs110.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs110.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
@@ -30,18 +27,42 @@ Global
 		release_static_mt|Win32 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Build.0 = release_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
@@ -66,18 +87,6 @@ Global
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj
index 318f3bc0e8..9338db041a 100644
--- a/Foundation/Foundation_vs110.vcxproj
+++ b/Foundation/Foundation_vs110.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">
@@ -28,27 +28,27 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Foundation</ProjectName>
-    <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
+    <ProjectGuid>{B01196CC-B693-4548-8464-2FF60499E73F}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
@@ -63,46 +63,29 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <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"/>
+  </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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\Foundation\$(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\Foundation\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\Foundation\$(Configuration)\</IntDir>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoFoundationd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoFoundationmtd</TargetName>
@@ -110,11 +93,37 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoFoundationmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoFoundationmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
+    <OutDir>..\bin\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
+    <OutDir>..\bin\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,18 +132,18 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoFoundationd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>..\bin\PocoFoundationd.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\lib\PocoFoundationd.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
@@ -148,30 +157,24 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoFoundation.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -179,93 +182,77 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
+      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmd.lib</OutputFile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <ProgramDataBaseFileName>..\lib\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <ProgramDataBaseFileName>..\lib\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -273,46 +260,40 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\Ascii.cpp" />
-    <ClCompile Include="src\AtomicCounter.cpp" />
-    <ClCompile Include="src\Bugcheck.cpp" />
+    <ClCompile Include="src\Ascii.cpp"/>
+    <ClCompile Include="src\AtomicCounter.cpp"/>
+    <ClCompile Include="src\Bugcheck.cpp"/>
     <ClCompile Include="src\ByteOrder.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Checksum.cpp" />
-    <ClCompile Include="src\Debugger.cpp" />
-    <ClCompile Include="src\DirectoryWatcher.cpp" />
-    <ClCompile Include="src\Environment.cpp" />
+    <ClCompile Include="src\Checksum.cpp"/>
+    <ClCompile Include="src\Debugger.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp"/>
+    <ClCompile Include="src\Environment.cpp"/>
     <ClCompile Include="src\Environment_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -345,11 +326,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Error.cpp" />
-    <ClCompile Include="src\Exception.cpp" />
-    <ClCompile Include="src\FIFOBufferStream.cpp" />
-    <ClCompile Include="src\Format.cpp" />
-    <ClCompile Include="src\FPEnvironment.cpp" />
+    <ClCompile Include="src\Error.cpp"/>
+    <ClCompile Include="src\Exception.cpp"/>
+    <ClCompile Include="src\Format.cpp"/>
+    <ClCompile Include="src\FPEnvironment.cpp"/>
     <ClCompile Include="src\FPEnvironment_C99.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -390,38 +370,34 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp" />
-    <ClCompile Include="src\MemoryPool.cpp" />
-    <ClCompile Include="src\NestedDiagnosticContext.cpp" />
-    <ClCompile Include="src\NumberFormatter.cpp" />
-    <ClCompile Include="src\NumberParser.cpp" />
-    <ClCompile Include="src\RefCountedObject.cpp" />
-    <ClCompile Include="src\SortedDirectoryIterator.cpp" />
+    <ClCompile Include="src\JSONString.cpp"/>
+    <ClCompile Include="src\MemoryPool.cpp"/>
+    <ClCompile Include="src\NestedDiagnosticContext.cpp"/>
+    <ClCompile Include="src\NumberFormatter.cpp"/>
+    <ClCompile Include="src\NumberParser.cpp"/>
+    <ClCompile Include="src\NumericString.cpp"/>
+    <ClCompile Include="src\RefCountedObject.cpp"/>
+    <ClCompile Include="src\SortedDirectoryIterator.cpp"/>
     <ClCompile Include="src\String.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp" />
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
-    <ClCompile Include="src\StringTokenizer.cpp" />
-    <ClCompile Include="src\UTF32Encoding.cpp" />
-    <ClCompile Include="src\Var.cpp" />
-    <ClCompile Include="src\VarHolder.cpp" />
-    <ClCompile Include="src\VarIterator.cpp" />
-    <ClCompile Include="src\Void.cpp" />
-    <ClCompile Include="src\Base32Decoder.cpp" />
-    <ClCompile Include="src\Base32Encoder.cpp" />
-    <ClCompile Include="src\Base64Decoder.cpp" />
-    <ClCompile Include="src\Base64Encoder.cpp" />
-    <ClCompile Include="src\BinaryReader.cpp" />
-    <ClCompile Include="src\BinaryWriter.cpp" />
-    <ClCompile Include="src\CountingStream.cpp" />
-    <ClCompile Include="src\DeflatingStream.cpp" />
-    <ClCompile Include="src\FileStream.cpp" />
+    <ClCompile Include="src\StringTokenizer.cpp"/>
+    <ClCompile Include="src\Void.cpp"/>
+    <ClCompile Include="src\Base32Decoder.cpp"/>
+    <ClCompile Include="src\Base32Encoder.cpp"/>
+    <ClCompile Include="src\Base64Decoder.cpp"/>
+    <ClCompile Include="src\Base64Encoder.cpp"/>
+    <ClCompile Include="src\BinaryReader.cpp"/>
+    <ClCompile Include="src\BinaryWriter.cpp"/>
+    <ClCompile Include="src\CountingStream.cpp"/>
+    <ClCompile Include="src\DeflatingStream.cpp"/>
+    <ClCompile Include="src\FIFOBufferStream.cpp"/>
+    <ClCompile Include="src\FileStream.cpp"/>
     <ClCompile Include="src\FileStream_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -438,32 +414,30 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\HexBinaryDecoder.cpp" />
-    <ClCompile Include="src\HexBinaryEncoder.cpp" />
-    <ClCompile Include="src\InflatingStream.cpp" />
-    <ClCompile Include="src\LineEndingConverter.cpp" />
-    <ClCompile Include="src\MemoryStream.cpp" />
-    <ClCompile Include="src\NullStream.cpp" />
-    <ClCompile Include="src\StreamCopier.cpp" />
-    <ClCompile Include="src\StreamTokenizer.cpp" />
-    <ClCompile Include="src\TeeStream.cpp" />
-    <ClCompile Include="src\Token.cpp" />
-    <ClCompile Include="src\adler32.c" />
-    <ClCompile Include="src\compress.c" />
-    <ClCompile Include="src\crc32.c" />
-    <ClCompile Include="src\deflate.c" />
-    <ClCompile Include="src\infback.c" />
-    <ClCompile Include="src\inffast.c" />
-    <ClCompile Include="src\inflate.c" />
-    <ClCompile Include="src\inftrees.c" />
-    <ClCompile Include="src\trees.c" />
-    <ClCompile Include="src\Windows1250Encoding.cpp" />
-    <ClCompile Include="src\Windows1251Encoding.cpp" />
-    <ClCompile Include="src\zutil.c" />
-    <ClCompile Include="src\ActiveDispatcher.cpp" />
-    <ClCompile Include="src\Condition.cpp" />
-    <ClCompile Include="src\ErrorHandler.cpp" />
-    <ClCompile Include="src\Event.cpp" />
+    <ClCompile Include="src\HexBinaryDecoder.cpp"/>
+    <ClCompile Include="src\HexBinaryEncoder.cpp"/>
+    <ClCompile Include="src\InflatingStream.cpp"/>
+    <ClCompile Include="src\LineEndingConverter.cpp"/>
+    <ClCompile Include="src\MemoryStream.cpp"/>
+    <ClCompile Include="src\NullStream.cpp"/>
+    <ClCompile Include="src\StreamCopier.cpp"/>
+    <ClCompile Include="src\StreamTokenizer.cpp"/>
+    <ClCompile Include="src\TeeStream.cpp"/>
+    <ClCompile Include="src\Token.cpp"/>
+    <ClCompile Include="src\adler32.c"/>
+    <ClCompile Include="src\compress.c"/>
+    <ClCompile Include="src\crc32.c"/>
+    <ClCompile Include="src\deflate.c"/>
+    <ClCompile Include="src\infback.c"/>
+    <ClCompile Include="src\inffast.c"/>
+    <ClCompile Include="src\inflate.c"/>
+    <ClCompile Include="src\inftrees.c"/>
+    <ClCompile Include="src\trees.c"/>
+    <ClCompile Include="src\zutil.c"/>
+    <ClCompile Include="src\ActiveDispatcher.cpp"/>
+    <ClCompile Include="src\Condition.cpp"/>
+    <ClCompile Include="src\ErrorHandler.cpp"/>
+    <ClCompile Include="src\Event.cpp"/>
     <ClCompile Include="src\Event_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -480,7 +454,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Mutex.cpp" />
+    <ClCompile Include="src\Mutex.cpp"/>
     <ClCompile Include="src\Mutex_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -497,8 +471,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Runnable.cpp" />
-    <ClCompile Include="src\RWLock.cpp" />
+    <ClCompile Include="src\Runnable.cpp"/>
+    <ClCompile Include="src\RWLock.cpp"/>
     <ClCompile Include="src\RWLock_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -515,7 +489,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Semaphore.cpp" />
+    <ClCompile Include="src\Semaphore.cpp"/>
     <ClCompile Include="src\Semaphore_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -533,15 +507,15 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SignalHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SynchronizedObject.cpp" />
-    <ClCompile Include="src\Thread.cpp" />
+    <ClCompile Include="src\SynchronizedObject.cpp"/>
+    <ClCompile Include="src\Thread.cpp"/>
     <ClCompile Include="src\Thread_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -558,19 +532,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ThreadLocal.cpp" />
-    <ClCompile Include="src\ThreadPool.cpp" />
-    <ClCompile Include="src\ThreadTarget.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
-    <ClCompile Include="src\DigestEngine.cpp" />
-    <ClCompile Include="src\DigestStream.cpp" />
-    <ClCompile Include="src\MD4Engine.cpp" />
-    <ClCompile Include="src\MD5Engine.cpp" />
-    <ClCompile Include="src\Random.cpp" />
-    <ClCompile Include="src\RandomStream.cpp" />
-    <ClCompile Include="src\SHA1Engine.cpp" />
-    <ClCompile Include="src\Manifest.cpp" />
-    <ClCompile Include="src\SharedLibrary.cpp" />
+    <ClCompile Include="src\ThreadLocal.cpp"/>
+    <ClCompile Include="src\ThreadPool.cpp"/>
+    <ClCompile Include="src\ThreadTarget.cpp"/>
+    <ClCompile Include="src\Timer.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\DigestStream.cpp"/>
+    <ClCompile Include="src\MD4Engine.cpp"/>
+    <ClCompile Include="src\MD5Engine.cpp"/>
+    <ClCompile Include="src\Random.cpp"/>
+    <ClCompile Include="src\RandomStream.cpp"/>
+    <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\Manifest.cpp"/>
+    <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -611,38 +585,38 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\RegularExpression.cpp" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
-    <ClCompile Include="src\ArchiveStrategy.cpp" />
-    <ClCompile Include="src\AsyncChannel.cpp" />
-    <ClCompile Include="src\Channel.cpp" />
-    <ClCompile Include="src\Configurable.cpp" />
-    <ClCompile Include="src\ConsoleChannel.cpp" />
-    <ClCompile Include="src\EventLogChannel.cpp" />
-    <ClCompile Include="src\FileChannel.cpp" />
-    <ClCompile Include="src\Formatter.cpp" />
-    <ClCompile Include="src\FormattingChannel.cpp" />
-    <ClCompile Include="src\LogFile.cpp" />
+    <ClCompile Include="src\RegularExpression.cpp"/>
+    <ClCompile Include="src\pcre_byte_order.c"/>
+    <ClCompile Include="src\pcre_chartables.c"/>
+    <ClCompile Include="src\pcre_compile.c"/>
+    <ClCompile Include="src\pcre_config.c"/>
+    <ClCompile Include="src\pcre_dfa_exec.c"/>
+    <ClCompile Include="src\pcre_exec.c"/>
+    <ClCompile Include="src\pcre_fullinfo.c"/>
+    <ClCompile Include="src\pcre_get.c"/>
+    <ClCompile Include="src\pcre_globals.c"/>
+    <ClCompile Include="src\pcre_jit_compile.c"/>
+    <ClCompile Include="src\pcre_maketables.c"/>
+    <ClCompile Include="src\pcre_newline.c"/>
+    <ClCompile Include="src\pcre_ord2utf8.c"/>
+    <ClCompile Include="src\pcre_refcount.c"/>
+    <ClCompile Include="src\pcre_string_utils.c"/>
+    <ClCompile Include="src\pcre_study.c"/>
+    <ClCompile Include="src\pcre_tables.c"/>
+    <ClCompile Include="src\pcre_ucd.c"/>
+    <ClCompile Include="src\pcre_valid_utf8.c"/>
+    <ClCompile Include="src\pcre_version.c"/>
+    <ClCompile Include="src\pcre_xclass.c"/>
+    <ClCompile Include="src\ArchiveStrategy.cpp"/>
+    <ClCompile Include="src\AsyncChannel.cpp"/>
+    <ClCompile Include="src\Channel.cpp"/>
+    <ClCompile Include="src\Configurable.cpp"/>
+    <ClCompile Include="src\ConsoleChannel.cpp"/>
+    <ClCompile Include="src\EventLogChannel.cpp"/>
+    <ClCompile Include="src\FileChannel.cpp"/>
+    <ClCompile Include="src\Formatter.cpp"/>
+    <ClCompile Include="src\FormattingChannel.cpp"/>
+    <ClCompile Include="src\LogFile.cpp"/>
     <ClCompile Include="src\LogFile_STD.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -675,12 +649,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Logger.cpp" />
-    <ClCompile Include="src\LoggingFactory.cpp" />
-    <ClCompile Include="src\LoggingRegistry.cpp" />
-    <ClCompile Include="src\LogStream.cpp" />
-    <ClCompile Include="src\Message.cpp" />
-    <ClCompile Include="src\NullChannel.cpp" />
+    <ClCompile Include="src\Logger.cpp"/>
+    <ClCompile Include="src\LoggingFactory.cpp"/>
+    <ClCompile Include="src\LoggingRegistry.cpp"/>
+    <ClCompile Include="src\LogStream.cpp"/>
+    <ClCompile Include="src\Message.cpp"/>
+    <ClCompile Include="src\NullChannel.cpp"/>
     <ClCompile Include="src\OpcomChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -689,12 +663,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\PurgeStrategy.cpp" />
-    <ClCompile Include="src\RotateStrategy.cpp" />
-    <ClCompile Include="src\SimpleFileChannel.cpp" />
-    <ClCompile Include="src\SplitterChannel.cpp" />
-    <ClCompile Include="src\StreamChannel.cpp" />
+    <ClCompile Include="src\PatternFormatter.cpp"/>
+    <ClCompile Include="src\PurgeStrategy.cpp"/>
+    <ClCompile Include="src\RotateStrategy.cpp"/>
+    <ClCompile Include="src\SimpleFileChannel.cpp"/>
+    <ClCompile Include="src\SplitterChannel.cpp"/>
+    <ClCompile Include="src\StreamChannel.cpp"/>
     <ClCompile Include="src\SyslogChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -703,14 +677,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\WindowsConsoleChannel.cpp" />
-    <ClCompile Include="src\AbstractObserver.cpp" />
-    <ClCompile Include="src\Notification.cpp" />
-    <ClCompile Include="src\NotificationCenter.cpp" />
-    <ClCompile Include="src\NotificationQueue.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueue.cpp" />
-    <ClCompile Include="src\TimedNotificationQueue.cpp" />
-    <ClCompile Include="src\DirectoryIterator.cpp" />
+    <ClCompile Include="src\WindowsConsoleChannel.cpp"/>
+    <ClCompile Include="src\AbstractObserver.cpp"/>
+    <ClCompile Include="src\Notification.cpp"/>
+    <ClCompile Include="src\NotificationCenter.cpp"/>
+    <ClCompile Include="src\NotificationQueue.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueue.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueue.cpp"/>
+    <ClCompile Include="src\DirectoryIterator.cpp"/>
     <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -743,7 +717,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\File.cpp" />
+    <ClCompile Include="src\DirectoryWatcher.cpp"/>
+    <ClCompile Include="src\File.cpp"/>
     <ClCompile Include="src\File_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -776,8 +751,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Glob.cpp" />
-    <ClCompile Include="src\Path.cpp" />
+    <ClCompile Include="src\Glob.cpp"/>
+    <ClCompile Include="src\Path.cpp"/>
     <ClCompile Include="src\Path_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -810,8 +785,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\TemporaryFile.cpp" />
-    <ClCompile Include="src\NamedEvent.cpp" />
+    <ClCompile Include="src\TemporaryFile.cpp"/>
+    <ClCompile Include="src\NamedEvent.cpp"/>
     <ClCompile Include="src\NamedEvent_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -844,7 +819,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NamedMutex.cpp" />
+    <ClCompile Include="src\NamedMutex.cpp"/>
     <ClCompile Include="src\NamedMutex_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -877,8 +852,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Pipe.cpp" />
-    <ClCompile Include="src\PipeImpl.cpp" />
+    <ClCompile Include="src\Pipe.cpp"/>
+    <ClCompile Include="src\PipeImpl.cpp"/>
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -903,8 +878,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PipeStream.cpp" />
-    <ClCompile Include="src\Process.cpp" />
+    <ClCompile Include="src\PipeStream.cpp"/>
+    <ClCompile Include="src\Process.cpp"/>
     <ClCompile Include="src\Process_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -937,7 +912,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SharedMemory.cpp" />
+    <ClCompile Include="src\SharedMemory.cpp"/>
     <ClCompile Include="src\SharedMemory_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -962,18 +937,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\UUID.cpp" />
-    <ClCompile Include="src\UUIDGenerator.cpp" />
-    <ClCompile Include="src\Clock.cpp" />
-    <ClCompile Include="src\DateTime.cpp" />
-    <ClCompile Include="src\DateTimeFormat.cpp" />
-    <ClCompile Include="src\DateTimeFormatter.cpp" />
-    <ClCompile Include="src\DateTimeParser.cpp" />
-    <ClCompile Include="src\LocalDateTime.cpp" />
-    <ClCompile Include="src\Stopwatch.cpp" />
-    <ClCompile Include="src\Timespan.cpp" />
-    <ClCompile Include="src\Timestamp.cpp" />
-    <ClCompile Include="src\Timezone.cpp" />
+    <ClCompile Include="src\UUID.cpp"/>
+    <ClCompile Include="src\UUIDGenerator.cpp"/>
+    <ClCompile Include="src\Clock.cpp"/>
+    <ClCompile Include="src\DateTime.cpp"/>
+    <ClCompile Include="src\DateTimeFormat.cpp"/>
+    <ClCompile Include="src\DateTimeFormatter.cpp"/>
+    <ClCompile Include="src\DateTimeParser.cpp"/>
+    <ClCompile Include="src\LocalDateTime.cpp"/>
+    <ClCompile Include="src\Stopwatch.cpp"/>
+    <ClCompile Include="src\Timespan.cpp"/>
+    <ClCompile Include="src\Timestamp.cpp"/>
+    <ClCompile Include="src\Timezone.cpp"/>
     <ClCompile Include="src\Timezone_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -990,393 +965,398 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ASCIIEncoding.cpp" />
-    <ClCompile Include="src\Latin1Encoding.cpp" />
-    <ClCompile Include="src\Latin9Encoding.cpp" />
-    <ClCompile Include="src\StreamConverter.cpp" />
-    <ClCompile Include="src\TextBufferIterator.cpp" />
-    <ClCompile Include="src\TextConverter.cpp" />
-    <ClCompile Include="src\TextEncoding.cpp" />
-    <ClCompile Include="src\TextIterator.cpp" />
-    <ClCompile Include="src\Unicode.cpp" />
-    <ClCompile Include="src\UnicodeConverter.cpp" />
-    <ClCompile Include="src\UTF16Encoding.cpp" />
-    <ClCompile Include="src\UTF8Encoding.cpp" />
-    <ClCompile Include="src\UTF8String.cpp" />
-    <ClCompile Include="src\Windows1252Encoding.cpp" />
-    <ClCompile Include="src\FileStreamFactory.cpp" />
-    <ClCompile Include="src\URI.cpp" />
-    <ClCompile Include="src\URIStreamFactory.cpp" />
-    <ClCompile Include="src\URIStreamOpener.cpp" />
-    <ClCompile Include="src\Task.cpp" />
-    <ClCompile Include="src\TaskManager.cpp" />
-    <ClCompile Include="src\TaskNotification.cpp" />
-    <ClCompile Include="src\EventArgs.cpp" />
-    <ClCompile Include="src\Hash.cpp" />
-    <ClCompile Include="src\HashStatistic.cpp" />
+    <ClCompile Include="src\ASCIIEncoding.cpp"/>
+    <ClCompile Include="src\Latin1Encoding.cpp"/>
+    <ClCompile Include="src\Latin2Encoding.cpp"/>
+    <ClCompile Include="src\Latin9Encoding.cpp"/>
+    <ClCompile Include="src\StreamConverter.cpp"/>
+    <ClCompile Include="src\TextBufferIterator.cpp"/>
+    <ClCompile Include="src\TextConverter.cpp"/>
+    <ClCompile Include="src\TextEncoding.cpp"/>
+    <ClCompile Include="src\TextIterator.cpp"/>
+    <ClCompile Include="src\Unicode.cpp"/>
+    <ClCompile Include="src\UnicodeConverter.cpp"/>
+    <ClCompile Include="src\UTF16Encoding.cpp"/>
+    <ClCompile Include="src\UTF32Encoding.cpp"/>
+    <ClCompile Include="src\UTF8Encoding.cpp"/>
+    <ClCompile Include="src\UTF8String.cpp"/>
+    <ClCompile Include="src\Windows1250Encoding.cpp"/>
+    <ClCompile Include="src\Windows1251Encoding.cpp"/>
+    <ClCompile Include="src\Windows1252Encoding.cpp"/>
+    <ClCompile Include="src\FileStreamFactory.cpp"/>
+    <ClCompile Include="src\URI.cpp"/>
+    <ClCompile Include="src\URIStreamFactory.cpp"/>
+    <ClCompile Include="src\URIStreamOpener.cpp"/>
+    <ClCompile Include="src\Task.cpp"/>
+    <ClCompile Include="src\TaskManager.cpp"/>
+    <ClCompile Include="src\TaskNotification.cpp"/>
+    <ClCompile Include="src\EventArgs.cpp"/>
+    <ClCompile Include="src\Hash.cpp"/>
+    <ClCompile Include="src\HashStatistic.cpp"/>
+    <ClCompile Include="src\Var.cpp"/>
+    <ClCompile Include="src\VarHolder.cpp"/>
+    <ClCompile Include="src\VarIterator.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Alignment.h" />
-    <ClInclude Include="include\Poco\Any.h" />
-    <ClInclude Include="include\Poco\Array.h" />
-    <ClInclude Include="include\Poco\Ascii.h" />
-    <ClInclude Include="include\Poco\AtomicCounter.h" />
-    <ClInclude Include="include\Poco\AutoPtr.h" />
-    <ClInclude Include="include\Poco\AutoReleasePool.h" />
-    <ClInclude Include="include\Poco\Buffer.h" />
-    <ClInclude Include="include\Poco\Bugcheck.h" />
-    <ClInclude Include="include\Poco\ByteOrder.h" />
-    <ClInclude Include="include\Poco\Checksum.h" />
-    <ClInclude Include="include\Poco\Config.h" />
-    <ClInclude Include="include\Poco\DirectoryWatcher.h" />
-    <ClInclude Include="include\Poco\Debugger.h" />
-    <ClInclude Include="include\Poco\DynamicAny.h" />
-    <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
-    <ClInclude Include="include\Poco\DynamicFactory.h" />
-    <ClInclude Include="include\Poco\Dynamic\Pair.h" />
-    <ClInclude Include="include\Poco\Dynamic\Struct.h" />
-    <ClInclude Include="include\Poco\Dynamic\Var.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
-    <ClInclude Include="include\Poco\Environment.h" />
-    <ClInclude Include="include\Poco\Environment_UNIX.h" />
-    <ClInclude Include="include\Poco\Environment_VMS.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-    <ClInclude Include="include\Poco\Error.h" />
-    <ClInclude Include="include\Poco\Exception.h" />
-    <ClInclude Include="include\Poco\FIFOBuffer.h" />
-    <ClInclude Include="include\Poco\FIFOBufferStream.h" />
-    <ClInclude Include="include\Poco\Format.h" />
-    <ClInclude Include="include\Poco\Foundation.h" />
-    <ClInclude Include="include\Poco\FPEnvironment.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_C99.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DEC.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
-    <ClInclude Include="include\Poco\Instantiator.h" />
-    <ClInclude Include="include\Poco\Latin2Encoding.h" />
-    <ClInclude Include="include\Poco\ListMap.h" />
-    <ClInclude Include="include\Poco\MemoryPool.h" />
-    <ClInclude Include="include\Poco\MetaProgramming.h" />
-    <ClInclude Include="include\Poco\NamedTuple.h" />
-    <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
-    <ClInclude Include="include\Poco\Nullable.h" />
-    <ClInclude Include="include\Poco\NumberFormatter.h" />
-    <ClInclude Include="include\Poco\NumberParser.h" />
-    <ClInclude Include="include\Poco\NumericString.h" />
-    <ClInclude Include="include\Poco\ObjectPool.h" />
-    <ClInclude Include="include\Poco\Optional.h" />
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
-    <ClInclude Include="include\Poco\Platform.h" />
-    <ClInclude Include="include\Poco\Platform_POSIX.h" />
-    <ClInclude Include="include\Poco\Platform_VMS.h" />
-    <ClInclude Include="include\Poco\Platform_WIN32.h" />
-    <ClInclude Include="include\Poco\Poco.h" />
-    <ClInclude Include="include\Poco\PriorityStrategy.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
-    <ClInclude Include="include\Poco\RefCountedObject.h" />
-    <ClInclude Include="include\Poco\SharedPtr.h" />
-    <ClInclude Include="include\Poco\SingletonHolder.h" />
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\String.h" />
-    <ClInclude Include="include\Poco\StringTokenizer.h" />
-    <ClInclude Include="include\Poco\Tuple.h" />
-    <ClInclude Include="include\Poco\TypeList.h" />
-    <ClInclude Include="include\Poco\Types.h" />
-    <ClInclude Include="include\Poco\UnWindows.h" />
-    <ClInclude Include="include\Poco\UTF32Encoding.h" />
-    <ClInclude Include="include\Poco\UTFString.h" />
-    <ClInclude Include="include\Poco\Version.h" />
-    <ClInclude Include="include\Poco\Void.h" />
-    <ClInclude Include="include\Poco\Base32Decoder.h" />
-    <ClInclude Include="include\Poco\Base32Encoder.h" />
-    <ClInclude Include="include\Poco\Base64Decoder.h" />
-    <ClInclude Include="include\Poco\Base64Encoder.h" />
-    <ClInclude Include="include\Poco\BinaryReader.h" />
-    <ClInclude Include="include\Poco\BinaryWriter.h" />
-    <ClInclude Include="include\Poco\BufferAllocator.h" />
-    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h" />
-    <ClInclude Include="include\Poco\BufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\CountingStream.h" />
-    <ClInclude Include="include\Poco\DeflatingStream.h" />
-    <ClInclude Include="include\Poco\FileStream.h" />
-    <ClInclude Include="include\Poco\FileStream_POSIX.h" />
-    <ClInclude Include="include\Poco\FileStream_WIN32.h" />
-    <ClInclude Include="include\Poco\HexBinaryDecoder.h" />
-    <ClInclude Include="include\Poco\HexBinaryEncoder.h" />
-    <ClInclude Include="include\Poco\InflatingStream.h" />
-    <ClInclude Include="include\Poco\LineEndingConverter.h" />
-    <ClInclude Include="include\Poco\MemoryStream.h" />
-    <ClInclude Include="include\Poco\NullStream.h" />
-    <ClInclude Include="include\Poco\StreamCopier.h" />
-    <ClInclude Include="include\Poco\StreamTokenizer.h" />
-    <ClInclude Include="include\Poco\StreamUtil.h" />
-    <ClInclude Include="include\Poco\TeeStream.h" />
-    <ClInclude Include="include\Poco\Token.h" />
-    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\Windows1250Encoding.h" />
-    <ClInclude Include="include\Poco\Windows1251Encoding.h" />
-    <ClInclude Include="src\crc32.h" />
-    <ClInclude Include="src\deflate.h" />
-    <ClInclude Include="src\inffast.h" />
-    <ClInclude Include="src\inffixed.h" />
-    <ClInclude Include="src\inflate.h" />
-    <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\zconf.h" />
-    <ClInclude Include="src\zlib.h" />
-    <ClInclude Include="src\zutil.h" />
-    <ClInclude Include="include\Poco\ActiveDispatcher.h" />
-    <ClInclude Include="include\Poco\ActiveMethod.h" />
-    <ClInclude Include="include\Poco\ActiveResult.h" />
-    <ClInclude Include="include\Poco\ActiveRunnable.h" />
-    <ClInclude Include="include\Poco\ActiveStarter.h" />
-    <ClInclude Include="include\Poco\Activity.h" />
-    <ClInclude Include="include\Poco\Condition.h" />
-    <ClInclude Include="include\Poco\ErrorHandler.h" />
-    <ClInclude Include="include\Poco\Event.h" />
-    <ClInclude Include="include\Poco\Event_POSIX.h" />
-    <ClInclude Include="include\Poco\Event_WIN32.h" />
-    <ClInclude Include="include\Poco\Mutex.h" />
-    <ClInclude Include="include\Poco\Mutex_POSIX.h" />
-    <ClInclude Include="include\Poco\Mutex_WIN32.h" />
-    <ClInclude Include="include\Poco\Runnable.h" />
-    <ClInclude Include="include\Poco\RunnableAdapter.h" />
-    <ClInclude Include="include\Poco\RWLock.h" />
-    <ClInclude Include="include\Poco\RWLock_POSIX.h" />
-    <ClInclude Include="include\Poco\RWLock_WIN32.h" />
-    <ClInclude Include="include\Poco\ScopedLock.h" />
-    <ClInclude Include="include\Poco\ScopedUnlock.h" />
-    <ClInclude Include="include\Poco\Semaphore.h" />
-    <ClInclude Include="include\Poco\Semaphore_POSIX.h" />
-    <ClInclude Include="include\Poco\Semaphore_WIN32.h" />
-    <ClInclude Include="include\Poco\SignalHandler.h" />
-    <ClInclude Include="include\Poco\SynchronizedObject.h" />
-    <ClInclude Include="include\Poco\Thread.h" />
-    <ClInclude Include="include\Poco\Thread_POSIX.h" />
-    <ClInclude Include="include\Poco\Thread_WIN32.h" />
-    <ClInclude Include="include\Poco\ThreadLocal.h" />
-    <ClInclude Include="include\Poco\ThreadPool.h" />
-    <ClInclude Include="include\Poco\ThreadTarget.h" />
-    <ClInclude Include="include\Poco\Timer.h" />
-    <ClInclude Include="include\Poco\DigestEngine.h" />
-    <ClInclude Include="include\Poco\DigestStream.h" />
-    <ClInclude Include="include\Poco\HMACEngine.h" />
-    <ClInclude Include="include\Poco\MD4Engine.h" />
-    <ClInclude Include="include\Poco\MD5Engine.h" />
-    <ClInclude Include="include\Poco\Random.h" />
-    <ClInclude Include="include\Poco\RandomStream.h" />
-    <ClInclude Include="include\Poco\SHA1Engine.h" />
-    <ClInclude Include="include\Poco\ClassLibrary.h" />
-    <ClInclude Include="include\Poco\ClassLoader.h" />
-    <ClInclude Include="include\Poco\Manifest.h" />
-    <ClInclude Include="include\Poco\MetaObject.h" />
-    <ClInclude Include="include\Poco\SharedLibrary.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_VMS.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
-    <ClInclude Include="src\ucp.h" />
-    <ClInclude Include="include\Poco\RegularExpression.h" />
-    <ClInclude Include="include\Poco\ArchiveStrategy.h" />
-    <ClInclude Include="include\Poco\AsyncChannel.h" />
-    <ClInclude Include="include\Poco\Channel.h" />
-    <ClInclude Include="include\Poco\Configurable.h" />
-    <ClInclude Include="include\Poco\ConsoleChannel.h" />
-    <ClInclude Include="include\Poco\EventLogChannel.h" />
-    <ClInclude Include="include\Poco\FileChannel.h" />
-    <ClInclude Include="include\Poco\Formatter.h" />
-    <ClInclude Include="include\Poco\FormattingChannel.h" />
-    <ClInclude Include="include\Poco\LogFile.h" />
-    <ClInclude Include="include\Poco\LogFile_STD.h" />
-    <ClInclude Include="include\Poco\LogFile_VMS.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
-    <ClInclude Include="include\Poco\Logger.h" />
-    <ClInclude Include="include\Poco\LoggingFactory.h" />
-    <ClInclude Include="include\Poco\LoggingRegistry.h" />
-    <ClInclude Include="include\Poco\LogStream.h" />
-    <ClInclude Include="include\Poco\Message.h" />
-    <ClInclude Include="include\Poco\NullChannel.h" />
-    <ClInclude Include="include\Poco\OpcomChannel.h" />
-    <ClInclude Include="include\Poco\PatternFormatter.h" />
-    <ClInclude Include="src\pocomsg.h" />
-    <ClInclude Include="include\Poco\PurgeStrategy.h" />
-    <ClInclude Include="include\Poco\RotateStrategy.h" />
-    <ClInclude Include="include\Poco\SimpleFileChannel.h" />
-    <ClInclude Include="include\Poco\SplitterChannel.h" />
-    <ClInclude Include="include\Poco\StreamChannel.h" />
-    <ClInclude Include="include\Poco\SyslogChannel.h" />
-    <ClInclude Include="include\Poco\WindowsConsoleChannel.h" />
-    <ClInclude Include="include\Poco\AbstractObserver.h" />
-    <ClInclude Include="include\Poco\NObserver.h" />
-    <ClInclude Include="include\Poco\Notification.h" />
-    <ClInclude Include="include\Poco\NotificationCenter.h" />
-    <ClInclude Include="include\Poco\NotificationQueue.h" />
-    <ClInclude Include="include\Poco\Observer.h" />
-    <ClInclude Include="include\Poco\PriorityNotificationQueue.h" />
-    <ClInclude Include="include\Poco\TimedNotificationQueue.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
-    <ClInclude Include="include\Poco\File.h" />
-    <ClInclude Include="include\Poco\File_UNIX.h" />
-    <ClInclude Include="include\Poco\File_VMS.h" />
-    <ClInclude Include="include\Poco\File_WIN32.h" />
-    <ClInclude Include="include\Poco\File_WIN32U.h" />
-    <ClInclude Include="include\Poco\Glob.h" />
-    <ClInclude Include="include\Poco\Path.h" />
-    <ClInclude Include="include\Poco\Path_UNIX.h" />
-    <ClInclude Include="include\Poco\Path_VMS.h" />
-    <ClInclude Include="include\Poco\Path_WIN32.h" />
-    <ClInclude Include="include\Poco\Path_WIN32U.h" />
-    <ClInclude Include="include\Poco\TemporaryFile.h" />
-    <ClInclude Include="include\Poco\NamedEvent.h" />
-    <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedEvent_VMS.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
-    <ClInclude Include="include\Poco\NamedMutex.h" />
-    <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedMutex_VMS.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
-    <ClInclude Include="include\Poco\Pipe.h" />
-    <ClInclude Include="include\Poco\PipeImpl.h" />
-    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h" />
-    <ClInclude Include="include\Poco\PipeImpl_POSIX.h" />
-    <ClInclude Include="include\Poco\PipeImpl_WIN32.h" />
-    <ClInclude Include="include\Poco\PipeStream.h" />
-    <ClInclude Include="include\Poco\Process.h" />
-    <ClInclude Include="include\Poco\Process_UNIX.h" />
-    <ClInclude Include="include\Poco\Process_VMS.h" />
-    <ClInclude Include="include\Poco\Process_WIN32.h" />
-    <ClInclude Include="include\Poco\Process_WIN32U.h" />
-    <ClInclude Include="include\Poco\SharedMemory.h" />
-    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />
-    <ClInclude Include="include\Poco\SharedMemory_POSIX.h" />
-    <ClInclude Include="include\Poco\SharedMemory_WIN32.h" />
-    <ClInclude Include="include\Poco\UUID.h" />
-    <ClInclude Include="include\Poco\UUIDGenerator.h" />
-    <ClInclude Include="include\Poco\Clock.h" />
-    <ClInclude Include="include\Poco\DateTime.h" />
-    <ClInclude Include="include\Poco\DateTimeFormat.h" />
-    <ClInclude Include="include\Poco\DateTimeFormatter.h" />
-    <ClInclude Include="include\Poco\DateTimeParser.h" />
-    <ClInclude Include="include\Poco\LocalDateTime.h" />
-    <ClInclude Include="include\Poco\Stopwatch.h" />
-    <ClInclude Include="include\Poco\Timespan.h" />
-    <ClInclude Include="include\Poco\Timestamp.h" />
-    <ClInclude Include="include\Poco\Timezone.h" />
-    <ClInclude Include="include\Poco\ASCIIEncoding.h" />
-    <ClInclude Include="include\Poco\Latin1Encoding.h" />
-    <ClInclude Include="include\Poco\Latin9Encoding.h" />
-    <ClInclude Include="include\Poco\StreamConverter.h" />
-    <ClInclude Include="include\Poco\TextBufferIterator.h" />
-    <ClInclude Include="include\Poco\TextConverter.h" />
-    <ClInclude Include="include\Poco\TextEncoding.h" />
-    <ClInclude Include="include\Poco\TextIterator.h" />
-    <ClInclude Include="include\Poco\Unicode.h" />
-    <ClInclude Include="include\Poco\UnicodeConverter.h" />
-    <ClInclude Include="include\Poco\UTF16Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8String.h" />
-    <ClInclude Include="include\Poco\Windows1252Encoding.h" />
-    <ClInclude Include="include\Poco\FileStreamFactory.h" />
-    <ClInclude Include="include\Poco\URI.h" />
-    <ClInclude Include="include\Poco\URIStreamFactory.h" />
-    <ClInclude Include="include\Poco\URIStreamOpener.h" />
-    <ClInclude Include="include\Poco\Task.h" />
-    <ClInclude Include="include\Poco\TaskManager.h" />
-    <ClInclude Include="include\Poco\TaskNotification.h" />
-    <ClInclude Include="include\Poco\AbstractDelegate.h" />
-    <ClInclude Include="include\Poco\AbstractEvent.h" />
-    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\BasicEvent.h" />
-    <ClInclude Include="include\Poco\DefaultStrategy.h" />
-    <ClInclude Include="include\Poco\Delegate.h" />
-    <ClInclude Include="include\Poco\EventArgs.h" />
-    <ClInclude Include="include\Poco\Expire.h" />
-    <ClInclude Include="include\Poco\FIFOEvent.h" />
-    <ClInclude Include="include\Poco\FIFOStrategy.h" />
-    <ClInclude Include="include\Poco\FunctionDelegate.h" />
-    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\NotificationStrategy.h" />
-    <ClInclude Include="include\Poco\PriorityDelegate.h" />
-    <ClInclude Include="include\Poco\PriorityEvent.h" />
-    <ClInclude Include="include\Poco\PriorityExpire.h" />
-    <ClInclude Include="include\Poco\AbstractCache.h" />
-    <ClInclude Include="include\Poco\AbstractStrategy.h" />
-    <ClInclude Include="include\Poco\AccessExpireCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\ExpireCache.h" />
-    <ClInclude Include="include\Poco\ExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\ExpireStrategy.h" />
-    <ClInclude Include="include\Poco\KeyValueArgs.h" />
-    <ClInclude Include="include\Poco\LRUCache.h" />
-    <ClInclude Include="include\Poco\LRUStrategy.h" />
-    <ClInclude Include="include\Poco\StrategyCollection.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\UniqueExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ValidArgs.h" />
-    <ClInclude Include="include\Poco\Hash.h" />
-    <ClInclude Include="include\Poco\HashFunction.h" />
-    <ClInclude Include="include\Poco\HashMap.h" />
-    <ClInclude Include="include\Poco\HashSet.h" />
-    <ClInclude Include="include\Poco\HashStatistic.h" />
-    <ClInclude Include="include\Poco\HashTable.h" />
-    <ClInclude Include="include\Poco\LinearHashTable.h" />
-    <ClInclude Include="include\Poco\SimpleHashTable.h" />
+    <ClInclude Include="include\Poco\Any.h"/>
+    <ClInclude Include="include\Poco\Ascii.h"/>
+    <ClInclude Include="include\Poco\AtomicCounter.h"/>
+    <ClInclude Include="include\Poco\AutoPtr.h"/>
+    <ClInclude Include="include\Poco\AutoReleasePool.h"/>
+    <ClInclude Include="include\Poco\Buffer.h"/>
+    <ClInclude Include="include\Poco\Bugcheck.h"/>
+    <ClInclude Include="include\Poco\ByteOrder.h"/>
+    <ClInclude Include="include\Poco\Checksum.h"/>
+    <ClInclude Include="include\Poco\Config.h"/>
+    <ClInclude Include="include\Poco\Debugger.h"/>
+    <ClInclude Include="include\Poco\DynamicAny.h"/>
+    <ClInclude Include="include\Poco\DynamicAnyHolder.h"/>
+    <ClInclude Include="include\Poco\DynamicFactory.h"/>
+    <ClInclude Include="include\Poco\Environment.h"/>
+    <ClInclude Include="include\Poco\Environment_UNIX.h"/>
+    <ClInclude Include="include\Poco\Environment_VMS.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Error.h"/>
+    <ClInclude Include="include\Poco\Exception.h"/>
+    <ClInclude Include="include\Poco\FIFOBuffer.h"/>
+    <ClInclude Include="include\Poco\Format.h"/>
+    <ClInclude Include="include\Poco\Foundation.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_C99.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DEC.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_SUN.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Instantiator.h"/>
+    <ClInclude Include="include\Poco\JSONString.h"/>
+    <ClInclude Include="include\Poco\MemoryPool.h"/>
+    <ClInclude Include="include\Poco\MetaProgramming.h"/>
+    <ClInclude Include="include\Poco\NamedTuple.h"/>
+    <ClInclude Include="include\Poco\NestedDiagnosticContext.h"/>
+    <ClInclude Include="include\Poco\Nullable.h"/>
+    <ClInclude Include="include\Poco\NumberFormatter.h"/>
+    <ClInclude Include="include\Poco\NumberParser.h"/>
+    <ClInclude Include="include\Poco\NumericString.h"/>
+    <ClInclude Include="include\Poco\ObjectPool.h"/>
+    <ClInclude Include="include\Poco\Optional.h"/>
+    <ClInclude Include="include\Poco\Platform.h"/>
+    <ClInclude Include="include\Poco\Platform_POSIX.h"/>
+    <ClInclude Include="include\Poco\Platform_VMS.h"/>
+    <ClInclude Include="include\Poco\Platform_WIN32.h"/>
+    <ClInclude Include="include\Poco\Poco.h"/>
+    <ClInclude Include="include\Poco\RefCountedObject.h"/>
+    <ClInclude Include="include\Poco\SharedPtr.h"/>
+    <ClInclude Include="include\Poco\SingletonHolder.h"/>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\String.h"/>
+    <ClInclude Include="include\Poco\StringTokenizer.h"/>
+    <ClInclude Include="include\Poco\Tuple.h"/>
+    <ClInclude Include="include\Poco\TypeList.h"/>
+    <ClInclude Include="include\Poco\Types.h"/>
+    <ClInclude Include="include\Poco\UnWindows.h"/>
+    <ClInclude Include="include\Poco\Version.h"/>
+    <ClInclude Include="include\Poco\Void.h"/>
+    <ClInclude Include="include\Poco\Base32Decoder.h"/>
+    <ClInclude Include="include\Poco\Base32Encoder.h"/>
+    <ClInclude Include="include\Poco\Base64Decoder.h"/>
+    <ClInclude Include="include\Poco\Base64Encoder.h"/>
+    <ClInclude Include="include\Poco\BinaryReader.h"/>
+    <ClInclude Include="include\Poco\BinaryWriter.h"/>
+    <ClInclude Include="include\Poco\BufferAllocator.h"/>
+    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h"/>
+    <ClInclude Include="include\Poco\BufferedStreamBuf.h"/>
+    <ClInclude Include="include\Poco\CountingStream.h"/>
+    <ClInclude Include="include\Poco\DeflatingStream.h"/>
+    <ClInclude Include="include\Poco\FileStream.h"/>
+    <ClInclude Include="include\Poco\FileStream_POSIX.h"/>
+    <ClInclude Include="include\Poco\FileStream_WIN32.h"/>
+    <ClInclude Include="include\Poco\HexBinaryDecoder.h"/>
+    <ClInclude Include="include\Poco\HexBinaryEncoder.h"/>
+    <ClInclude Include="include\Poco\InflatingStream.h"/>
+    <ClInclude Include="include\Poco\LineEndingConverter.h"/>
+    <ClInclude Include="include\Poco\MemoryStream.h"/>
+    <ClInclude Include="include\Poco\NullStream.h"/>
+    <ClInclude Include="include\Poco\StreamCopier.h"/>
+    <ClInclude Include="include\Poco\StreamTokenizer.h"/>
+    <ClInclude Include="include\Poco\StreamUtil.h"/>
+    <ClInclude Include="include\Poco\TeeStream.h"/>
+    <ClInclude Include="include\Poco\Token.h"/>
+    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h"/>
+    <ClInclude Include="src\crc32.h"/>
+    <ClInclude Include="src\deflate.h"/>
+    <ClInclude Include="src\inffast.h"/>
+    <ClInclude Include="src\inffixed.h"/>
+    <ClInclude Include="src\inflate.h"/>
+    <ClInclude Include="src\inftrees.h"/>
+    <ClInclude Include="src\trees.h"/>
+    <ClInclude Include="src\zconf.h"/>
+    <ClInclude Include="src\zlib.h"/>
+    <ClInclude Include="src\zutil.h"/>
+    <ClInclude Include="include\Poco\ActiveDispatcher.h"/>
+    <ClInclude Include="include\Poco\ActiveMethod.h"/>
+    <ClInclude Include="include\Poco\ActiveResult.h"/>
+    <ClInclude Include="include\Poco\ActiveRunnable.h"/>
+    <ClInclude Include="include\Poco\ActiveStarter.h"/>
+    <ClInclude Include="include\Poco\Activity.h"/>
+    <ClInclude Include="include\Poco\Condition.h"/>
+    <ClInclude Include="include\Poco\ErrorHandler.h"/>
+    <ClInclude Include="include\Poco\Event.h"/>
+    <ClInclude Include="include\Poco\Event_POSIX.h"/>
+    <ClInclude Include="include\Poco\Event_WIN32.h"/>
+    <ClInclude Include="include\Poco\Mutex.h"/>
+    <ClInclude Include="include\Poco\Mutex_POSIX.h"/>
+    <ClInclude Include="include\Poco\Mutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\Runnable.h"/>
+    <ClInclude Include="include\Poco\RunnableAdapter.h"/>
+    <ClInclude Include="include\Poco\RWLock.h"/>
+    <ClInclude Include="include\Poco\RWLock_POSIX.h"/>
+    <ClInclude Include="include\Poco\RWLock_WIN32.h"/>
+    <ClInclude Include="include\Poco\ScopedLock.h"/>
+    <ClInclude Include="include\Poco\ScopedUnlock.h"/>
+    <ClInclude Include="include\Poco\Semaphore.h"/>
+    <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
+    <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
+    <ClInclude Include="include\Poco\SignalHandler.h"/>
+    <ClInclude Include="include\Poco\SynchronizedObject.h"/>
+    <ClInclude Include="include\Poco\Thread.h"/>
+    <ClInclude Include="include\Poco\Thread_POSIX.h"/>
+    <ClInclude Include="include\Poco\Thread_WIN32.h"/>
+    <ClInclude Include="include\Poco\ThreadLocal.h"/>
+    <ClInclude Include="include\Poco\ThreadPool.h"/>
+    <ClInclude Include="include\Poco\ThreadTarget.h"/>
+    <ClInclude Include="include\Poco\Timer.h"/>
+    <ClInclude Include="include\Poco\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\DigestStream.h"/>
+    <ClInclude Include="include\Poco\HMACEngine.h"/>
+    <ClInclude Include="include\Poco\MD4Engine.h"/>
+    <ClInclude Include="include\Poco\MD5Engine.h"/>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h"/>
+    <ClInclude Include="include\Poco\Random.h"/>
+    <ClInclude Include="include\Poco\RandomStream.h"/>
+    <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\ClassLibrary.h"/>
+    <ClInclude Include="include\Poco\ClassLoader.h"/>
+    <ClInclude Include="include\Poco\Manifest.h"/>
+    <ClInclude Include="include\Poco\MetaObject.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_VMS.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"/>
+    <ClInclude Include="src\pcre.h"/>
+    <ClInclude Include="src\pcre_config.h"/>
+    <ClInclude Include="src\pcre_internal.h"/>
+    <ClInclude Include="src\ucp.h"/>
+    <ClInclude Include="include\Poco\RegularExpression.h"/>
+    <ClInclude Include="include\Poco\ArchiveStrategy.h"/>
+    <ClInclude Include="include\Poco\AsyncChannel.h"/>
+    <ClInclude Include="include\Poco\Channel.h"/>
+    <ClInclude Include="include\Poco\Configurable.h"/>
+    <ClInclude Include="include\Poco\ConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\EventLogChannel.h"/>
+    <ClInclude Include="include\Poco\FileChannel.h"/>
+    <ClInclude Include="include\Poco\Formatter.h"/>
+    <ClInclude Include="include\Poco\FormattingChannel.h"/>
+    <ClInclude Include="include\Poco\LogFile.h"/>
+    <ClInclude Include="include\Poco\LogFile_STD.h"/>
+    <ClInclude Include="include\Poco\LogFile_VMS.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Logger.h"/>
+    <ClInclude Include="include\Poco\LoggingFactory.h"/>
+    <ClInclude Include="include\Poco\LoggingRegistry.h"/>
+    <ClInclude Include="include\Poco\LogStream.h"/>
+    <ClInclude Include="include\Poco\Message.h"/>
+    <ClInclude Include="include\Poco\NullChannel.h"/>
+    <ClInclude Include="include\Poco\OpcomChannel.h"/>
+    <ClInclude Include="include\Poco\PatternFormatter.h"/>
+    <ClInclude Include="src\pocomsg.h"/>
+    <ClInclude Include="include\Poco\PurgeStrategy.h"/>
+    <ClInclude Include="include\Poco\RotateStrategy.h"/>
+    <ClInclude Include="include\Poco\SimpleFileChannel.h"/>
+    <ClInclude Include="include\Poco\SplitterChannel.h"/>
+    <ClInclude Include="include\Poco\StreamChannel.h"/>
+    <ClInclude Include="include\Poco\SyslogChannel.h"/>
+    <ClInclude Include="include\Poco\WindowsConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\AbstractObserver.h"/>
+    <ClInclude Include="include\Poco\NObserver.h"/>
+    <ClInclude Include="include\Poco\Notification.h"/>
+    <ClInclude Include="include\Poco\NotificationCenter.h"/>
+    <ClInclude Include="include\Poco\NotificationQueue.h"/>
+    <ClInclude Include="include\Poco\Observer.h"/>
+    <ClInclude Include="include\Poco\PriorityNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\TimedNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"/>
+    <ClInclude Include="include\Poco\DirectoryWatcher.h"/>
+    <ClInclude Include="include\Poco\File.h"/>
+    <ClInclude Include="include\Poco\File_UNIX.h"/>
+    <ClInclude Include="include\Poco\File_VMS.h"/>
+    <ClInclude Include="include\Poco\File_WIN32.h"/>
+    <ClInclude Include="include\Poco\File_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Glob.h"/>
+    <ClInclude Include="include\Poco\Path.h"/>
+    <ClInclude Include="include\Poco\Path_UNIX.h"/>
+    <ClInclude Include="include\Poco\Path_VMS.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32U.h"/>
+    <ClInclude Include="include\Poco\TemporaryFile.h"/>
+    <ClInclude Include="include\Poco\NamedEvent.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h"/>
+    <ClInclude Include="include\Poco\NamedMutex.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Pipe.h"/>
+    <ClInclude Include="include\Poco\PipeImpl.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_POSIX.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_WIN32.h"/>
+    <ClInclude Include="include\Poco\PipeStream.h"/>
+    <ClInclude Include="include\Poco\Process.h"/>
+    <ClInclude Include="include\Poco\Process_UNIX.h"/>
+    <ClInclude Include="include\Poco\Process_VMS.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32U.h"/>
+    <ClInclude Include="include\Poco\SharedMemory.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_POSIX.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_WIN32.h"/>
+    <ClInclude Include="include\Poco\UUID.h"/>
+    <ClInclude Include="include\Poco\UUIDGenerator.h"/>
+    <ClInclude Include="include\Poco\Clock.h"/>
+    <ClInclude Include="include\Poco\DateTime.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormat.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormatter.h"/>
+    <ClInclude Include="include\Poco\DateTimeParser.h"/>
+    <ClInclude Include="include\Poco\LocalDateTime.h"/>
+    <ClInclude Include="include\Poco\Stopwatch.h"/>
+    <ClInclude Include="include\Poco\Timespan.h"/>
+    <ClInclude Include="include\Poco\Timestamp.h"/>
+    <ClInclude Include="include\Poco\Timezone.h"/>
+    <ClInclude Include="include\Poco\ASCIIEncoding.h"/>
+    <ClInclude Include="include\Poco\Latin1Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin2Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin9Encoding.h"/>
+    <ClInclude Include="include\Poco\ListMap.h"/>
+    <ClInclude Include="include\Poco\StreamConverter.h"/>
+    <ClInclude Include="include\Poco\TextBufferIterator.h"/>
+    <ClInclude Include="include\Poco\TextConverter.h"/>
+    <ClInclude Include="include\Poco\TextEncoding.h"/>
+    <ClInclude Include="include\Poco\TextIterator.h"/>
+    <ClInclude Include="include\Poco\Unicode.h"/>
+    <ClInclude Include="include\Poco\UnicodeConverter.h"/>
+    <ClInclude Include="include\Poco\UTF16Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF32Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8String.h"/>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1252Encoding.h"/>
+    <ClInclude Include="include\Poco\FileStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URI.h"/>
+    <ClInclude Include="include\Poco\URIStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URIStreamOpener.h"/>
+    <ClInclude Include="include\Poco\Task.h"/>
+    <ClInclude Include="include\Poco\TaskManager.h"/>
+    <ClInclude Include="include\Poco\TaskNotification.h"/>
+    <ClInclude Include="include\Poco\AbstractDelegate.h"/>
+    <ClInclude Include="include\Poco\AbstractEvent.h"/>
+    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\BasicEvent.h"/>
+    <ClInclude Include="include\Poco\DefaultStrategy.h"/>
+    <ClInclude Include="include\Poco\Delegate.h"/>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h"/>
+    <ClInclude Include="include\Poco\EventArgs.h"/>
+    <ClInclude Include="include\Poco\Expire.h"/>
+    <ClInclude Include="include\Poco\FIFOEvent.h"/>
+    <ClInclude Include="include\Poco\FIFOStrategy.h"/>
+    <ClInclude Include="include\Poco\FunctionDelegate.h"/>
+    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\NotificationStrategy.h"/>
+    <ClInclude Include="include\Poco\PriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\PriorityEvent.h"/>
+    <ClInclude Include="include\Poco\PriorityExpire.h"/>
+    <ClInclude Include="include\Poco\PriorityStrategy.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h"/>
+    <ClInclude Include="include\Poco\AbstractCache.h"/>
+    <ClInclude Include="include\Poco\AbstractStrategy.h"/>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\AccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\ExpireCache.h"/>
+    <ClInclude Include="include\Poco\ExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\ExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\KeyValueArgs.h"/>
+    <ClInclude Include="include\Poco\LRUCache.h"/>
+    <ClInclude Include="include\Poco\LRUStrategy.h"/>
+    <ClInclude Include="include\Poco\StrategyCollection.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ValidArgs.h"/>
+    <ClInclude Include="include\Poco\Hash.h"/>
+    <ClInclude Include="include\Poco\HashFunction.h"/>
+    <ClInclude Include="include\Poco\HashMap.h"/>
+    <ClInclude Include="include\Poco\HashSet.h"/>
+    <ClInclude Include="include\Poco\HashStatistic.h"/>
+    <ClInclude Include="include\Poco\HashTable.h"/>
+    <ClInclude Include="include\Poco\LinearHashTable.h"/>
+    <ClInclude Include="include\Poco\SimpleHashTable.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Pair.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Struct.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Var.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarHolder.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarIterator.h"/>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\pocomsg.mc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
+</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ResourceCompile Include="src\pocomsg.rc"/>
     <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>
-    <ResourceCompile Include="src\pocomsg.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters
index 4d5790000d..b2e400c561 100644
--- a/Foundation/Foundation_vs110.vcxproj.filters
+++ b/Foundation/Foundation_vs110.vcxproj.filters
@@ -2,190 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{185c1200-1c1b-4fc7-9da0-b650d0c1bf77}</UniqueIdentifier>
+      <UniqueIdentifier>{1e826017-bfe1-4bc8-ae9d-1976a17102f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{e4438cfb-753c-4882-b6a7-37f1b2eb7924}</UniqueIdentifier>
+      <UniqueIdentifier>{7af8093c-8932-436c-8291-605a34b41a11}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{5fef2634-dac7-4251-8cc6-685a55fb6b69}</UniqueIdentifier>
+      <UniqueIdentifier>{81fdc633-1475-4ea3-a268-94932aa88d51}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{27c4af78-bbb6-41df-a186-f2a592f6dd7e}</UniqueIdentifier>
+      <UniqueIdentifier>{031cc295-95b8-4f84-82d5-5b4c68d04d36}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{faa6333e-8acd-42d3-b72c-37cd0e19d162}</UniqueIdentifier>
+      <UniqueIdentifier>{cce78d66-531e-4d7c-8506-cd94b363efd0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d5c0096d-097d-40c2-ac9e-c52501bca586}</UniqueIdentifier>
+      <UniqueIdentifier>{6f32da7e-0e38-445b-9ad0-c24580090029}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\zlib">
-      <UniqueIdentifier>{341c25b8-2c02-4356-98af-e9cdc028d65d}</UniqueIdentifier>
+      <UniqueIdentifier>{94f758c8-7938-4ad3-b26b-026afbdc0bc5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{dcfb473d-2dc0-419b-82e5-49a02e866436}</UniqueIdentifier>
+      <UniqueIdentifier>{d98562f9-6de0-48e5-8ac9-ee647165b7f2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8}</UniqueIdentifier>
+      <UniqueIdentifier>{dcc9616e-6e0b-45e7-acfa-907082805c91}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{2cf5d5b6-8945-4a08-8382-b1ae4760d23c}</UniqueIdentifier>
+      <UniqueIdentifier>{9045ea79-5fce-4226-96a1-47f9c7f6a6ea}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{d7d8f3d7-1f4d-40b3-b2be-69b169947e81}</UniqueIdentifier>
+      <UniqueIdentifier>{70f5b6e7-b01c-48a8-aa9f-ec6d25df6916}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{4eac0cd3-fa98-44f0-ba4b-126eea40690d}</UniqueIdentifier>
+      <UniqueIdentifier>{cf518c9d-5347-48c5-a836-bdd54c67d5ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{641198e1-de95-4b94-8f88-740c2b199cf7}</UniqueIdentifier>
+      <UniqueIdentifier>{cd45fbce-8116-4e86-b9ad-539a6ca3c82b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{69ead8e2-e830-4352-b858-3b7fa83c6f69}</UniqueIdentifier>
+      <UniqueIdentifier>{fd757d77-93bd-48f5-83ee-7673af932fce}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{86878c35-6789-4bed-96b4-27ddf9c57acd}</UniqueIdentifier>
+      <UniqueIdentifier>{5e727771-986a-44fc-a025-a0d41d16ccfd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{7de594c4-642c-4ac5-b236-7056ccaa6191}</UniqueIdentifier>
+      <UniqueIdentifier>{0a4b65f7-8c95-4714-941e-8d0dc7bf3e01}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression">
-      <UniqueIdentifier>{74d499e8-5aec-4f63-9522-26bc8b2e4e1e}</UniqueIdentifier>
+      <UniqueIdentifier>{5edac957-486e-48ac-9b02-f986637fdcf3}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{aad0de07-cbb7-4cf9-acbb-46b3c529ef72}</UniqueIdentifier>
+      <UniqueIdentifier>{276d44e9-86a2-491d-8445-79ca647a9880}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Source Files">
-      <UniqueIdentifier>{59eea661-94fe-4cfa-a84a-3ed55d6fc6c2}</UniqueIdentifier>
+      <UniqueIdentifier>{52a67444-c7c8-4777-b94b-645d8a95c8c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
-      <UniqueIdentifier>{0b1828a5-18ba-4155-a8f9-2c488e582c0d}</UniqueIdentifier>
+      <UniqueIdentifier>{83c58cea-4535-47c2-82ff-c19193ed59b3}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{ddc6a944-851d-4fae-9ae2-58c7abb800ae}</UniqueIdentifier>
+      <UniqueIdentifier>{248d052a-2517-479d-9463-a059d1af4ec9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{96f5ad60-2335-463a-8e23-da1476ed46f2}</UniqueIdentifier>
+      <UniqueIdentifier>{573e7aa8-7955-4a0f-accc-61a7ac26b428}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{06229b8b-13a0-43b1-8f11-53373321e5cd}</UniqueIdentifier>
+      <UniqueIdentifier>{e8655659-9bd2-4c7a-92f1-4bcb38e8fc39}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{5274aca5-2472-4212-a11a-7d23ff583083}</UniqueIdentifier>
+      <UniqueIdentifier>{fb6827c8-f16f-46ca-bd37-242976f7094d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Message Files">
-      <UniqueIdentifier>{c9340af5-5ac1-4082-8fee-f6343b9ab2e2}</UniqueIdentifier>
+      <UniqueIdentifier>{fdfbf597-3d56-49ed-9ef3-43724392947d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Resource Files">
-      <UniqueIdentifier>{d723209d-84d0-4890-ac64-4949699f6e3a}</UniqueIdentifier>
+      <UniqueIdentifier>{fb371fef-a44b-47f4-8192-044eea1bc740}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{44de33ce-ef79-4671-8258-65dc5ef863b8}</UniqueIdentifier>
+      <UniqueIdentifier>{2d489305-b955-487c-a87b-1405a272ad91}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{39e651e5-e5c8-454d-b1f9-456c809dcf92}</UniqueIdentifier>
+      <UniqueIdentifier>{9919e211-ada6-4eda-980d-99acfc76d428}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{732e2c8f-a8af-4318-9ab9-0d8d62afae54}</UniqueIdentifier>
+      <UniqueIdentifier>{f49f442f-4633-4de9-bdaf-6a3821969c52}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{5d4bc826-9b0a-4014-9302-cc9f88646ff6}</UniqueIdentifier>
+      <UniqueIdentifier>{c9630c1c-8d2e-4638-a44a-58008d5991ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{b8210208-8698-4cda-94fd-3e906f9ca78f}</UniqueIdentifier>
+      <UniqueIdentifier>{ed823682-251c-4399-ad0a-d5ce3fbd8e0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{af751147-0509-4d3c-9ab3-b20c20974341}</UniqueIdentifier>
+      <UniqueIdentifier>{62fd4666-0f92-4057-bb1a-fcdf6a7dbd40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{359ad015-e38e-423e-877e-c827eed229f2}</UniqueIdentifier>
+      <UniqueIdentifier>{f9d0916c-2fd4-40e5-bc70-3a8cfabd14cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{3a817f74-6edb-4098-a29b-8347840a09ae}</UniqueIdentifier>
+      <UniqueIdentifier>{d69a5a01-aa7c-4758-97e1-bdbccbdbd08a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{a07318ae-554f-44ec-bdfd-6fe0929c3dd3}</UniqueIdentifier>
+      <UniqueIdentifier>{c5c99478-d6ce-4a11-8ae4-4c50f99e5da5}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{ece427ab-b6ef-4700-9a42-312b8507a010}</UniqueIdentifier>
+      <UniqueIdentifier>{94e6d6f9-f90c-46db-b1d5-55dd9934be5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{eb8ddeab-7b2f-4537-aa4a-939268a1a9a4}</UniqueIdentifier>
+      <UniqueIdentifier>{fec40cbc-650a-4693-ba16-93802efae330}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{4bcbbcd9-3409-4bcc-b999-f9e360d45a09}</UniqueIdentifier>
+      <UniqueIdentifier>{304da638-c366-4664-8f5f-3827719088e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{48f74d8c-d6a2-4e5a-a322-55702b35b221}</UniqueIdentifier>
+      <UniqueIdentifier>{19b2d82b-f9a1-40cb-9021-24eb3ac5d151}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{6c702a6b-e1d8-4d6e-9c48-dab631371287}</UniqueIdentifier>
+      <UniqueIdentifier>{01201f05-cb19-49f9-8ad4-f605683d0c43}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{e3e8d759-a950-40ed-9271-17bf7e9baa8e}</UniqueIdentifier>
+      <UniqueIdentifier>{30665cc1-dc78-48bc-8183-6c7991a33983}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{3ef3d3a4-84a1-4026-85dd-53e71f3f820f}</UniqueIdentifier>
+      <UniqueIdentifier>{c800c836-ac6d-44b5-b633-d71304aff9cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{665d566f-5f8f-45d0-b883-a43185dc8ab8}</UniqueIdentifier>
+      <UniqueIdentifier>{e07ff421-1ebc-48e5-a3d3-39239f86b223}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{51e1620d-85e0-493d-819f-960bc0957f0f}</UniqueIdentifier>
+      <UniqueIdentifier>{f891f9f7-d7bd-4702-8086-eec86f723ea1}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{ee3f4314-64e7-420c-88d5-df016f15dd4f}</UniqueIdentifier>
+      <UniqueIdentifier>{9e2254cf-6bc1-4eb3-afcc-a5db9c726da9}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{bc06eae9-3602-448d-8290-4a9a68adbe8b}</UniqueIdentifier>
+      <UniqueIdentifier>{b2f99225-923a-4056-816c-26d29588f0ea}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{1a21c5ef-d4a6-42dc-94be-5a0a791ba589}</UniqueIdentifier>
+      <UniqueIdentifier>{ea50cbe9-4a10-4b89-8d75-3e590622536e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{dafee4e1-a8e0-4af9-bd00-378430a364ea}</UniqueIdentifier>
+      <UniqueIdentifier>{b9fc9612-d50a-43e8-a784-9aa5911fdde3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{cb46df12-6010-4ef6-9f85-937585263f3e}</UniqueIdentifier>
+      <UniqueIdentifier>{bf47522e-e1aa-4c14-bd60-cbd47fa89296}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{50d1f7a3-d675-41b8-8370-2718b2e95c2f}</UniqueIdentifier>
+      <UniqueIdentifier>{ac056859-82d6-41fe-ac94-3f80d7778afc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events">
-      <UniqueIdentifier>{f2886094-2ba3-402c-b5a8-dbfa0500e3d3}</UniqueIdentifier>
+      <UniqueIdentifier>{e99472ec-0c14-4796-8674-3f4d616da03c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Header Files">
-      <UniqueIdentifier>{7237275f-8924-4f26-96de-066ba722f9c6}</UniqueIdentifier>
+      <UniqueIdentifier>{7280e1ff-24e3-47d2-b4c2-d5150f110178}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Source Files">
-      <UniqueIdentifier>{cdb9c09a-2a19-4203-a6f4-87455a799508}</UniqueIdentifier>
+      <UniqueIdentifier>{9d6500cd-894d-4d56-bc70-7e801db6c580}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{040f6767-8762-4b80-9db2-45a2b18c1d86}</UniqueIdentifier>
+      <UniqueIdentifier>{ae71834f-fc99-402a-95e9-257f30ee8ad0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{3fd772e7-f8cf-42fb-8b1b-5c49b9f79562}</UniqueIdentifier>
+      <UniqueIdentifier>{ba4fb60a-ecb8-433e-9ec1-c1bc10cbcd0c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{6e184876-2a72-4dd8-87e0-a42022d17513}</UniqueIdentifier>
+      <UniqueIdentifier>{7e711893-e1c2-4dfd-ae17-53c531fca9f0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{251118a8-6f5b-4f8f-b19f-b953058b3820}</UniqueIdentifier>
+      <UniqueIdentifier>{cdfeaea3-2fd8-499b-8e19-a98b6e45df9e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{20c16777-1fc6-4272-bf38-fef730596f73}</UniqueIdentifier>
+      <UniqueIdentifier>{baeb4e2a-3232-4700-8b46-ba40798fa7f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{da88549e-329c-444c-85bb-b2339bc09505}</UniqueIdentifier>
+      <UniqueIdentifier>{593c8fcf-c7c1-4845-afb3-3b00df68183e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{1ad862ca-df95-43f5-a87b-a714b9b84303}</UniqueIdentifier>
+      <UniqueIdentifier>{6bf6df9f-f9de-42a6-ad68-b5f9d799d3e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{918536bd-29fb-4b4f-a706-629925dbb66c}</UniqueIdentifier>
+      <UniqueIdentifier>{35a15f08-ba8d-4ab6-8282-2f5588f19271}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{4d00a3d6-7a50-4553-a62a-8eee081c9fb1}</UniqueIdentifier>
+      <UniqueIdentifier>{dd2c10d0-c6ec-4be2-adaf-e053e688a170}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -207,6 +207,9 @@
     <ClCompile Include="src\Debugger.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Environment.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -249,6 +252,9 @@
     <ClCompile Include="src\FPEnvironment_WIN32.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MemoryPool.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -261,13 +267,16 @@
     <ClCompile Include="src\NumberParser.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NumericString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\String.cpp">
+    <ClCompile Include="src\SortedDirectoryIterator.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp">
+    <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\StringTokenizer.cpp">
@@ -300,6 +309,9 @@
     <ClCompile Include="src\DeflatingStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStream.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -489,6 +501,9 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_byte_order.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_chartables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -498,40 +513,31 @@
     <ClCompile Include="src\pcre_config.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_dfa_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_fullinfo.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
+    <ClCompile Include="src\pcre_get.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
+    <ClCompile Include="src\pcre_globals.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
+    <ClCompile Include="src\pcre_jit_compile.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
+    <ClCompile Include="src\pcre_maketables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
+    <ClCompile Include="src\pcre_newline.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
+    <ClCompile Include="src\pcre_ord2utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_refcount.c">
@@ -540,7 +546,10 @@
     <ClCompile Include="src\pcre_string_utils.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
+    <ClCompile Include="src\pcre_study.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre_tables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_ucd.c">
@@ -549,6 +558,9 @@
     <ClCompile Include="src\pcre_valid_utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_version.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_xclass.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -672,10 +684,7 @@
     <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SortedDirectoryIterator.cpp">
+    <ClCompile Include="src\DirectoryWatcher.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\File.cpp">
@@ -837,6 +846,9 @@
     <ClCompile Include="src\Latin1Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Latin2Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Latin9Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -864,12 +876,21 @@
     <ClCompile Include="src\UTF16Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\UTF32Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\UTF8Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\UTF8String.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Windows1250Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Windows1251Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1252Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -903,33 +924,15 @@
     <ClCompile Include="src\HashStatistic.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryWatcher.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Var.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\VarHolder.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Variterator.cpp">
+    <ClCompile Include="src\VarIterator.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1250Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1251Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStream.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UTF32Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -995,6 +998,9 @@
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\FIFOBuffer.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Format.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1022,10 +1028,7 @@
     <ClInclude Include="include\Poco\Instantiator.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Latin2Encoding.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\ListMap.h">
+    <ClInclude Include="include\Poco\JSONString.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\MemoryPool.h">
@@ -1052,6 +1055,12 @@
     <ClInclude Include="include\Poco\NumericString.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ObjectPool.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Optional.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Platform.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1076,6 +1085,9 @@
     <ClInclude Include="include\Poco\SingletonHolder.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\String.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1322,6 +1334,9 @@
     <ClInclude Include="include\Poco\MD5Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Random.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -1505,16 +1520,7 @@
     <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+    <ClInclude Include="include\Poco\DirectoryWatcher.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\File.h">
@@ -1670,9 +1676,15 @@
     <ClInclude Include="include\Poco\Latin1Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Latin2Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Latin9Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ListMap.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\StreamConverter.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1697,12 +1709,21 @@
     <ClInclude Include="include\Poco\UTF16Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\UTF32Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\UTF8Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\UTF8String.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1252Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1745,6 +1766,9 @@
     <ClInclude Include="include\Poco\Delegate.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\EventArgs.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
@@ -1775,12 +1799,24 @@
     <ClInclude Include="include\Poco\PriorityExpire.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PriorityStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AbstractCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\AbstractStrategy.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AccessExpireCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
@@ -1859,15 +1895,6 @@
     <ClInclude Include="include\Poco\SimpleHashTable.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PriorityStrategy.h">
-      <Filter>Events\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryWatcher.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\Pair.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
@@ -1883,39 +1910,6 @@
     <ClInclude Include="include\Poco\Dynamic\VarIterator.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Windows1250Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1251Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Array.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBuffer.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBufferStream.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTF32Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTFString.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\ObjectPool.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Optional.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Alignment.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PBKDF2Engine.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_vs120.sln b/Foundation/Foundation_vs120.sln
index f0156efd1e..bb7b94b8b2 100644
--- a/Foundation/Foundation_vs120.sln
+++ b/Foundation/Foundation_vs120.sln
@@ -1,25 +1,22 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30825.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs120.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs120.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs120.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs120.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs120.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs120.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
@@ -32,42 +29,42 @@ Global
 		release_static_mt|Win32 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Build.0 = release_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
@@ -80,6 +77,18 @@ Global
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_vs120.vcxproj b/Foundation/Foundation_vs120.vcxproj
index 51917273cc..aba9b40edf 100644
--- a/Foundation/Foundation_vs120.vcxproj
+++ b/Foundation/Foundation_vs120.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -28,27 +28,27 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Foundation</ProjectName>
-    <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
+    <ProjectGuid>{B01196CC-B693-4548-8464-2FF60499E73F}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
@@ -63,46 +63,29 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <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"/>
+  </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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">..\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\Foundation\$(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\Foundation\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\Foundation\$(Configuration)\</IntDir>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoFoundationd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoFoundationmtd</TargetName>
@@ -110,11 +93,37 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoFoundationmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoFoundationmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
+    <OutDir>..\bin\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
+    <OutDir>..\bin\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+    <OutDir>..\lib\</OutDir>
+    <IntDir>obj\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,18 +132,18 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoFoundationd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>..\bin\PocoFoundationd.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\lib\PocoFoundationd.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
@@ -148,30 +157,24 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoFoundation.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -179,93 +182,77 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
+      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmd.lib</OutputFile>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <ProgramDataBaseFileName>..\lib\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <ProgramDataBaseFileName>..\lib\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -273,45 +260,40 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib\PocoFoundationmd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
-      <TargetMachine>MachineX86</TargetMachine>
+      <OutputFile>..\lib\PocoFoundationmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\Ascii.cpp" />
-    <ClCompile Include="src\AtomicCounter.cpp" />
-    <ClCompile Include="src\Bugcheck.cpp" />
+    <ClCompile Include="src\Ascii.cpp"/>
+    <ClCompile Include="src\AtomicCounter.cpp"/>
+    <ClCompile Include="src\Bugcheck.cpp"/>
     <ClCompile Include="src\ByteOrder.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|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>
     </ClCompile>
-    <ClCompile Include="src\Checksum.cpp" />
-    <ClCompile Include="src\Debugger.cpp" />
-    <ClCompile Include="src\DirectoryWatcher.cpp" />
-    <ClCompile Include="src\Environment.cpp" />
+    <ClCompile Include="src\Checksum.cpp"/>
+    <ClCompile Include="src\Debugger.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp"/>
+    <ClCompile Include="src\Environment.cpp"/>
     <ClCompile Include="src\Environment_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -344,11 +326,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Error.cpp" />
-    <ClCompile Include="src\Exception.cpp" />
-    <ClCompile Include="src\FIFOBufferStream.cpp" />
-    <ClCompile Include="src\Format.cpp" />
-    <ClCompile Include="src\FPEnvironment.cpp" />
+    <ClCompile Include="src\Error.cpp"/>
+    <ClCompile Include="src\Exception.cpp"/>
+    <ClCompile Include="src\Format.cpp"/>
+    <ClCompile Include="src\FPEnvironment.cpp"/>
     <ClCompile Include="src\FPEnvironment_C99.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -389,38 +370,34 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp" />
-    <ClCompile Include="src\MemoryPool.cpp" />
-    <ClCompile Include="src\NestedDiagnosticContext.cpp" />
-    <ClCompile Include="src\NumberFormatter.cpp" />
-    <ClCompile Include="src\NumberParser.cpp" />
-    <ClCompile Include="src\RefCountedObject.cpp" />
-    <ClCompile Include="src\SortedDirectoryIterator.cpp" />
+    <ClCompile Include="src\JSONString.cpp"/>
+    <ClCompile Include="src\MemoryPool.cpp"/>
+    <ClCompile Include="src\NestedDiagnosticContext.cpp"/>
+    <ClCompile Include="src\NumberFormatter.cpp"/>
+    <ClCompile Include="src\NumberParser.cpp"/>
+    <ClCompile Include="src\NumericString.cpp"/>
+    <ClCompile Include="src\RefCountedObject.cpp"/>
+    <ClCompile Include="src\SortedDirectoryIterator.cpp"/>
     <ClCompile Include="src\String.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|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>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp" />
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
-    <ClCompile Include="src\StringTokenizer.cpp" />
-    <ClCompile Include="src\UTF32Encoding.cpp" />
-    <ClCompile Include="src\Var.cpp" />
-    <ClCompile Include="src\VarHolder.cpp" />
-    <ClCompile Include="src\VarIterator.cpp" />
-    <ClCompile Include="src\Void.cpp" />
-    <ClCompile Include="src\Base32Decoder.cpp" />
-    <ClCompile Include="src\Base32Encoder.cpp" />
-    <ClCompile Include="src\Base64Decoder.cpp" />
-    <ClCompile Include="src\Base64Encoder.cpp" />
-    <ClCompile Include="src\BinaryReader.cpp" />
-    <ClCompile Include="src\BinaryWriter.cpp" />
-    <ClCompile Include="src\CountingStream.cpp" />
-    <ClCompile Include="src\DeflatingStream.cpp" />
-    <ClCompile Include="src\FileStream.cpp" />
+    <ClCompile Include="src\StringTokenizer.cpp"/>
+    <ClCompile Include="src\Void.cpp"/>
+    <ClCompile Include="src\Base32Decoder.cpp"/>
+    <ClCompile Include="src\Base32Encoder.cpp"/>
+    <ClCompile Include="src\Base64Decoder.cpp"/>
+    <ClCompile Include="src\Base64Encoder.cpp"/>
+    <ClCompile Include="src\BinaryReader.cpp"/>
+    <ClCompile Include="src\BinaryWriter.cpp"/>
+    <ClCompile Include="src\CountingStream.cpp"/>
+    <ClCompile Include="src\DeflatingStream.cpp"/>
+    <ClCompile Include="src\FIFOBufferStream.cpp"/>
+    <ClCompile Include="src\FileStream.cpp"/>
     <ClCompile Include="src\FileStream_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -437,32 +414,30 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\HexBinaryDecoder.cpp" />
-    <ClCompile Include="src\HexBinaryEncoder.cpp" />
-    <ClCompile Include="src\InflatingStream.cpp" />
-    <ClCompile Include="src\LineEndingConverter.cpp" />
-    <ClCompile Include="src\MemoryStream.cpp" />
-    <ClCompile Include="src\NullStream.cpp" />
-    <ClCompile Include="src\StreamCopier.cpp" />
-    <ClCompile Include="src\StreamTokenizer.cpp" />
-    <ClCompile Include="src\TeeStream.cpp" />
-    <ClCompile Include="src\Token.cpp" />
-    <ClCompile Include="src\adler32.c" />
-    <ClCompile Include="src\compress.c" />
-    <ClCompile Include="src\crc32.c" />
-    <ClCompile Include="src\deflate.c" />
-    <ClCompile Include="src\infback.c" />
-    <ClCompile Include="src\inffast.c" />
-    <ClCompile Include="src\inflate.c" />
-    <ClCompile Include="src\inftrees.c" />
-    <ClCompile Include="src\trees.c" />
-    <ClCompile Include="src\Windows1250Encoding.cpp" />
-    <ClCompile Include="src\Windows1251Encoding.cpp" />
-    <ClCompile Include="src\zutil.c" />
-    <ClCompile Include="src\ActiveDispatcher.cpp" />
-    <ClCompile Include="src\Condition.cpp" />
-    <ClCompile Include="src\ErrorHandler.cpp" />
-    <ClCompile Include="src\Event.cpp" />
+    <ClCompile Include="src\HexBinaryDecoder.cpp"/>
+    <ClCompile Include="src\HexBinaryEncoder.cpp"/>
+    <ClCompile Include="src\InflatingStream.cpp"/>
+    <ClCompile Include="src\LineEndingConverter.cpp"/>
+    <ClCompile Include="src\MemoryStream.cpp"/>
+    <ClCompile Include="src\NullStream.cpp"/>
+    <ClCompile Include="src\StreamCopier.cpp"/>
+    <ClCompile Include="src\StreamTokenizer.cpp"/>
+    <ClCompile Include="src\TeeStream.cpp"/>
+    <ClCompile Include="src\Token.cpp"/>
+    <ClCompile Include="src\adler32.c"/>
+    <ClCompile Include="src\compress.c"/>
+    <ClCompile Include="src\crc32.c"/>
+    <ClCompile Include="src\deflate.c"/>
+    <ClCompile Include="src\infback.c"/>
+    <ClCompile Include="src\inffast.c"/>
+    <ClCompile Include="src\inflate.c"/>
+    <ClCompile Include="src\inftrees.c"/>
+    <ClCompile Include="src\trees.c"/>
+    <ClCompile Include="src\zutil.c"/>
+    <ClCompile Include="src\ActiveDispatcher.cpp"/>
+    <ClCompile Include="src\Condition.cpp"/>
+    <ClCompile Include="src\ErrorHandler.cpp"/>
+    <ClCompile Include="src\Event.cpp"/>
     <ClCompile Include="src\Event_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -479,7 +454,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Mutex.cpp" />
+    <ClCompile Include="src\Mutex.cpp"/>
     <ClCompile Include="src\Mutex_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -496,8 +471,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Runnable.cpp" />
-    <ClCompile Include="src\RWLock.cpp" />
+    <ClCompile Include="src\Runnable.cpp"/>
+    <ClCompile Include="src\RWLock.cpp"/>
     <ClCompile Include="src\RWLock_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -514,7 +489,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Semaphore.cpp" />
+    <ClCompile Include="src\Semaphore.cpp"/>
     <ClCompile Include="src\Semaphore_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -532,15 +507,15 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SignalHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|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>
     </ClCompile>
-    <ClCompile Include="src\SynchronizedObject.cpp" />
-    <ClCompile Include="src\Thread.cpp" />
+    <ClCompile Include="src\SynchronizedObject.cpp"/>
+    <ClCompile Include="src\Thread.cpp"/>
     <ClCompile Include="src\Thread_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -557,19 +532,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ThreadLocal.cpp" />
-    <ClCompile Include="src\ThreadPool.cpp" />
-    <ClCompile Include="src\ThreadTarget.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
-    <ClCompile Include="src\DigestEngine.cpp" />
-    <ClCompile Include="src\DigestStream.cpp" />
-    <ClCompile Include="src\MD4Engine.cpp" />
-    <ClCompile Include="src\MD5Engine.cpp" />
-    <ClCompile Include="src\Random.cpp" />
-    <ClCompile Include="src\RandomStream.cpp" />
-    <ClCompile Include="src\SHA1Engine.cpp" />
-    <ClCompile Include="src\Manifest.cpp" />
-    <ClCompile Include="src\SharedLibrary.cpp" />
+    <ClCompile Include="src\ThreadLocal.cpp"/>
+    <ClCompile Include="src\ThreadPool.cpp"/>
+    <ClCompile Include="src\ThreadTarget.cpp"/>
+    <ClCompile Include="src\Timer.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\DigestStream.cpp"/>
+    <ClCompile Include="src\MD4Engine.cpp"/>
+    <ClCompile Include="src\MD5Engine.cpp"/>
+    <ClCompile Include="src\Random.cpp"/>
+    <ClCompile Include="src\RandomStream.cpp"/>
+    <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\Manifest.cpp"/>
+    <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -610,38 +585,38 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\RegularExpression.cpp" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
-    <ClCompile Include="src\ArchiveStrategy.cpp" />
-    <ClCompile Include="src\AsyncChannel.cpp" />
-    <ClCompile Include="src\Channel.cpp" />
-    <ClCompile Include="src\Configurable.cpp" />
-    <ClCompile Include="src\ConsoleChannel.cpp" />
-    <ClCompile Include="src\EventLogChannel.cpp" />
-    <ClCompile Include="src\FileChannel.cpp" />
-    <ClCompile Include="src\Formatter.cpp" />
-    <ClCompile Include="src\FormattingChannel.cpp" />
-    <ClCompile Include="src\LogFile.cpp" />
+    <ClCompile Include="src\RegularExpression.cpp"/>
+    <ClCompile Include="src\pcre_byte_order.c"/>
+    <ClCompile Include="src\pcre_chartables.c"/>
+    <ClCompile Include="src\pcre_compile.c"/>
+    <ClCompile Include="src\pcre_config.c"/>
+    <ClCompile Include="src\pcre_dfa_exec.c"/>
+    <ClCompile Include="src\pcre_exec.c"/>
+    <ClCompile Include="src\pcre_fullinfo.c"/>
+    <ClCompile Include="src\pcre_get.c"/>
+    <ClCompile Include="src\pcre_globals.c"/>
+    <ClCompile Include="src\pcre_jit_compile.c"/>
+    <ClCompile Include="src\pcre_maketables.c"/>
+    <ClCompile Include="src\pcre_newline.c"/>
+    <ClCompile Include="src\pcre_ord2utf8.c"/>
+    <ClCompile Include="src\pcre_refcount.c"/>
+    <ClCompile Include="src\pcre_string_utils.c"/>
+    <ClCompile Include="src\pcre_study.c"/>
+    <ClCompile Include="src\pcre_tables.c"/>
+    <ClCompile Include="src\pcre_ucd.c"/>
+    <ClCompile Include="src\pcre_valid_utf8.c"/>
+    <ClCompile Include="src\pcre_version.c"/>
+    <ClCompile Include="src\pcre_xclass.c"/>
+    <ClCompile Include="src\ArchiveStrategy.cpp"/>
+    <ClCompile Include="src\AsyncChannel.cpp"/>
+    <ClCompile Include="src\Channel.cpp"/>
+    <ClCompile Include="src\Configurable.cpp"/>
+    <ClCompile Include="src\ConsoleChannel.cpp"/>
+    <ClCompile Include="src\EventLogChannel.cpp"/>
+    <ClCompile Include="src\FileChannel.cpp"/>
+    <ClCompile Include="src\Formatter.cpp"/>
+    <ClCompile Include="src\FormattingChannel.cpp"/>
+    <ClCompile Include="src\LogFile.cpp"/>
     <ClCompile Include="src\LogFile_STD.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -674,12 +649,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Logger.cpp" />
-    <ClCompile Include="src\LoggingFactory.cpp" />
-    <ClCompile Include="src\LoggingRegistry.cpp" />
-    <ClCompile Include="src\LogStream.cpp" />
-    <ClCompile Include="src\Message.cpp" />
-    <ClCompile Include="src\NullChannel.cpp" />
+    <ClCompile Include="src\Logger.cpp"/>
+    <ClCompile Include="src\LoggingFactory.cpp"/>
+    <ClCompile Include="src\LoggingRegistry.cpp"/>
+    <ClCompile Include="src\LogStream.cpp"/>
+    <ClCompile Include="src\Message.cpp"/>
+    <ClCompile Include="src\NullChannel.cpp"/>
     <ClCompile Include="src\OpcomChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -688,12 +663,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\PurgeStrategy.cpp" />
-    <ClCompile Include="src\RotateStrategy.cpp" />
-    <ClCompile Include="src\SimpleFileChannel.cpp" />
-    <ClCompile Include="src\SplitterChannel.cpp" />
-    <ClCompile Include="src\StreamChannel.cpp" />
+    <ClCompile Include="src\PatternFormatter.cpp"/>
+    <ClCompile Include="src\PurgeStrategy.cpp"/>
+    <ClCompile Include="src\RotateStrategy.cpp"/>
+    <ClCompile Include="src\SimpleFileChannel.cpp"/>
+    <ClCompile Include="src\SplitterChannel.cpp"/>
+    <ClCompile Include="src\StreamChannel.cpp"/>
     <ClCompile Include="src\SyslogChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -702,14 +677,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\WindowsConsoleChannel.cpp" />
-    <ClCompile Include="src\AbstractObserver.cpp" />
-    <ClCompile Include="src\Notification.cpp" />
-    <ClCompile Include="src\NotificationCenter.cpp" />
-    <ClCompile Include="src\NotificationQueue.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueue.cpp" />
-    <ClCompile Include="src\TimedNotificationQueue.cpp" />
-    <ClCompile Include="src\DirectoryIterator.cpp" />
+    <ClCompile Include="src\WindowsConsoleChannel.cpp"/>
+    <ClCompile Include="src\AbstractObserver.cpp"/>
+    <ClCompile Include="src\Notification.cpp"/>
+    <ClCompile Include="src\NotificationCenter.cpp"/>
+    <ClCompile Include="src\NotificationQueue.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueue.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueue.cpp"/>
+    <ClCompile Include="src\DirectoryIterator.cpp"/>
     <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -742,7 +717,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\File.cpp" />
+    <ClCompile Include="src\DirectoryWatcher.cpp"/>
+    <ClCompile Include="src\File.cpp"/>
     <ClCompile Include="src\File_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -775,8 +751,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Glob.cpp" />
-    <ClCompile Include="src\Path.cpp" />
+    <ClCompile Include="src\Glob.cpp"/>
+    <ClCompile Include="src\Path.cpp"/>
     <ClCompile Include="src\Path_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -809,8 +785,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\TemporaryFile.cpp" />
-    <ClCompile Include="src\NamedEvent.cpp" />
+    <ClCompile Include="src\TemporaryFile.cpp"/>
+    <ClCompile Include="src\NamedEvent.cpp"/>
     <ClCompile Include="src\NamedEvent_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -843,7 +819,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NamedMutex.cpp" />
+    <ClCompile Include="src\NamedMutex.cpp"/>
     <ClCompile Include="src\NamedMutex_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -876,8 +852,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Pipe.cpp" />
-    <ClCompile Include="src\PipeImpl.cpp" />
+    <ClCompile Include="src\Pipe.cpp"/>
+    <ClCompile Include="src\PipeImpl.cpp"/>
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -902,8 +878,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PipeStream.cpp" />
-    <ClCompile Include="src\Process.cpp" />
+    <ClCompile Include="src\PipeStream.cpp"/>
+    <ClCompile Include="src\Process.cpp"/>
     <ClCompile Include="src\Process_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -936,7 +912,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SharedMemory.cpp" />
+    <ClCompile Include="src\SharedMemory.cpp"/>
     <ClCompile Include="src\SharedMemory_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -961,18 +937,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\UUID.cpp" />
-    <ClCompile Include="src\UUIDGenerator.cpp" />
-    <ClCompile Include="src\Clock.cpp" />
-    <ClCompile Include="src\DateTime.cpp" />
-    <ClCompile Include="src\DateTimeFormat.cpp" />
-    <ClCompile Include="src\DateTimeFormatter.cpp" />
-    <ClCompile Include="src\DateTimeParser.cpp" />
-    <ClCompile Include="src\LocalDateTime.cpp" />
-    <ClCompile Include="src\Stopwatch.cpp" />
-    <ClCompile Include="src\Timespan.cpp" />
-    <ClCompile Include="src\Timestamp.cpp" />
-    <ClCompile Include="src\Timezone.cpp" />
+    <ClCompile Include="src\UUID.cpp"/>
+    <ClCompile Include="src\UUIDGenerator.cpp"/>
+    <ClCompile Include="src\Clock.cpp"/>
+    <ClCompile Include="src\DateTime.cpp"/>
+    <ClCompile Include="src\DateTimeFormat.cpp"/>
+    <ClCompile Include="src\DateTimeFormatter.cpp"/>
+    <ClCompile Include="src\DateTimeParser.cpp"/>
+    <ClCompile Include="src\LocalDateTime.cpp"/>
+    <ClCompile Include="src\Stopwatch.cpp"/>
+    <ClCompile Include="src\Timespan.cpp"/>
+    <ClCompile Include="src\Timestamp.cpp"/>
+    <ClCompile Include="src\Timezone.cpp"/>
     <ClCompile Include="src\Timezone_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
@@ -989,393 +965,398 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ASCIIEncoding.cpp" />
-    <ClCompile Include="src\Latin1Encoding.cpp" />
-    <ClCompile Include="src\Latin9Encoding.cpp" />
-    <ClCompile Include="src\StreamConverter.cpp" />
-    <ClCompile Include="src\TextBufferIterator.cpp" />
-    <ClCompile Include="src\TextConverter.cpp" />
-    <ClCompile Include="src\TextEncoding.cpp" />
-    <ClCompile Include="src\TextIterator.cpp" />
-    <ClCompile Include="src\Unicode.cpp" />
-    <ClCompile Include="src\UnicodeConverter.cpp" />
-    <ClCompile Include="src\UTF16Encoding.cpp" />
-    <ClCompile Include="src\UTF8Encoding.cpp" />
-    <ClCompile Include="src\UTF8String.cpp" />
-    <ClCompile Include="src\Windows1252Encoding.cpp" />
-    <ClCompile Include="src\FileStreamFactory.cpp" />
-    <ClCompile Include="src\URI.cpp" />
-    <ClCompile Include="src\URIStreamFactory.cpp" />
-    <ClCompile Include="src\URIStreamOpener.cpp" />
-    <ClCompile Include="src\Task.cpp" />
-    <ClCompile Include="src\TaskManager.cpp" />
-    <ClCompile Include="src\TaskNotification.cpp" />
-    <ClCompile Include="src\EventArgs.cpp" />
-    <ClCompile Include="src\Hash.cpp" />
-    <ClCompile Include="src\HashStatistic.cpp" />
+    <ClCompile Include="src\ASCIIEncoding.cpp"/>
+    <ClCompile Include="src\Latin1Encoding.cpp"/>
+    <ClCompile Include="src\Latin2Encoding.cpp"/>
+    <ClCompile Include="src\Latin9Encoding.cpp"/>
+    <ClCompile Include="src\StreamConverter.cpp"/>
+    <ClCompile Include="src\TextBufferIterator.cpp"/>
+    <ClCompile Include="src\TextConverter.cpp"/>
+    <ClCompile Include="src\TextEncoding.cpp"/>
+    <ClCompile Include="src\TextIterator.cpp"/>
+    <ClCompile Include="src\Unicode.cpp"/>
+    <ClCompile Include="src\UnicodeConverter.cpp"/>
+    <ClCompile Include="src\UTF16Encoding.cpp"/>
+    <ClCompile Include="src\UTF32Encoding.cpp"/>
+    <ClCompile Include="src\UTF8Encoding.cpp"/>
+    <ClCompile Include="src\UTF8String.cpp"/>
+    <ClCompile Include="src\Windows1250Encoding.cpp"/>
+    <ClCompile Include="src\Windows1251Encoding.cpp"/>
+    <ClCompile Include="src\Windows1252Encoding.cpp"/>
+    <ClCompile Include="src\FileStreamFactory.cpp"/>
+    <ClCompile Include="src\URI.cpp"/>
+    <ClCompile Include="src\URIStreamFactory.cpp"/>
+    <ClCompile Include="src\URIStreamOpener.cpp"/>
+    <ClCompile Include="src\Task.cpp"/>
+    <ClCompile Include="src\TaskManager.cpp"/>
+    <ClCompile Include="src\TaskNotification.cpp"/>
+    <ClCompile Include="src\EventArgs.cpp"/>
+    <ClCompile Include="src\Hash.cpp"/>
+    <ClCompile Include="src\HashStatistic.cpp"/>
+    <ClCompile Include="src\Var.cpp"/>
+    <ClCompile Include="src\VarHolder.cpp"/>
+    <ClCompile Include="src\VarIterator.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Alignment.h" />
-    <ClInclude Include="include\Poco\Any.h" />
-    <ClInclude Include="include\Poco\Array.h" />
-    <ClInclude Include="include\Poco\Ascii.h" />
-    <ClInclude Include="include\Poco\AtomicCounter.h" />
-    <ClInclude Include="include\Poco\AutoPtr.h" />
-    <ClInclude Include="include\Poco\AutoReleasePool.h" />
-    <ClInclude Include="include\Poco\Buffer.h" />
-    <ClInclude Include="include\Poco\Bugcheck.h" />
-    <ClInclude Include="include\Poco\ByteOrder.h" />
-    <ClInclude Include="include\Poco\Checksum.h" />
-    <ClInclude Include="include\Poco\Config.h" />
-    <ClInclude Include="include\Poco\DirectoryWatcher.h" />
-    <ClInclude Include="include\Poco\Debugger.h" />
-    <ClInclude Include="include\Poco\DynamicAny.h" />
-    <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
-    <ClInclude Include="include\Poco\DynamicFactory.h" />
-    <ClInclude Include="include\Poco\Dynamic\Pair.h" />
-    <ClInclude Include="include\Poco\Dynamic\Struct.h" />
-    <ClInclude Include="include\Poco\Dynamic\Var.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
-    <ClInclude Include="include\Poco\Environment.h" />
-    <ClInclude Include="include\Poco\Environment_UNIX.h" />
-    <ClInclude Include="include\Poco\Environment_VMS.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-    <ClInclude Include="include\Poco\Error.h" />
-    <ClInclude Include="include\Poco\Exception.h" />
-    <ClInclude Include="include\Poco\FIFOBuffer.h" />
-    <ClInclude Include="include\Poco\FIFOBufferStream.h" />
-    <ClInclude Include="include\Poco\Format.h" />
-    <ClInclude Include="include\Poco\Foundation.h" />
-    <ClInclude Include="include\Poco\FPEnvironment.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_C99.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DEC.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
-    <ClInclude Include="include\Poco\Instantiator.h" />
-    <ClInclude Include="include\Poco\Latin2Encoding.h" />
-    <ClInclude Include="include\Poco\ListMap.h" />
-    <ClInclude Include="include\Poco\MemoryPool.h" />
-    <ClInclude Include="include\Poco\MetaProgramming.h" />
-    <ClInclude Include="include\Poco\NamedTuple.h" />
-    <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
-    <ClInclude Include="include\Poco\Nullable.h" />
-    <ClInclude Include="include\Poco\NumberFormatter.h" />
-    <ClInclude Include="include\Poco\NumberParser.h" />
-    <ClInclude Include="include\Poco\NumericString.h" />
-    <ClInclude Include="include\Poco\ObjectPool.h" />
-    <ClInclude Include="include\Poco\Optional.h" />
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
-    <ClInclude Include="include\Poco\Platform.h" />
-    <ClInclude Include="include\Poco\Platform_POSIX.h" />
-    <ClInclude Include="include\Poco\Platform_VMS.h" />
-    <ClInclude Include="include\Poco\Platform_WIN32.h" />
-    <ClInclude Include="include\Poco\Poco.h" />
-    <ClInclude Include="include\Poco\PriorityStrategy.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
-    <ClInclude Include="include\Poco\RefCountedObject.h" />
-    <ClInclude Include="include\Poco\SharedPtr.h" />
-    <ClInclude Include="include\Poco\SingletonHolder.h" />
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\String.h" />
-    <ClInclude Include="include\Poco\StringTokenizer.h" />
-    <ClInclude Include="include\Poco\Tuple.h" />
-    <ClInclude Include="include\Poco\TypeList.h" />
-    <ClInclude Include="include\Poco\Types.h" />
-    <ClInclude Include="include\Poco\UnWindows.h" />
-    <ClInclude Include="include\Poco\UTF32Encoding.h" />
-    <ClInclude Include="include\Poco\UTFString.h" />
-    <ClInclude Include="include\Poco\Version.h" />
-    <ClInclude Include="include\Poco\Void.h" />
-    <ClInclude Include="include\Poco\Base32Decoder.h" />
-    <ClInclude Include="include\Poco\Base32Encoder.h" />
-    <ClInclude Include="include\Poco\Base64Decoder.h" />
-    <ClInclude Include="include\Poco\Base64Encoder.h" />
-    <ClInclude Include="include\Poco\BinaryReader.h" />
-    <ClInclude Include="include\Poco\BinaryWriter.h" />
-    <ClInclude Include="include\Poco\BufferAllocator.h" />
-    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h" />
-    <ClInclude Include="include\Poco\BufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\CountingStream.h" />
-    <ClInclude Include="include\Poco\DeflatingStream.h" />
-    <ClInclude Include="include\Poco\FileStream.h" />
-    <ClInclude Include="include\Poco\FileStream_POSIX.h" />
-    <ClInclude Include="include\Poco\FileStream_WIN32.h" />
-    <ClInclude Include="include\Poco\HexBinaryDecoder.h" />
-    <ClInclude Include="include\Poco\HexBinaryEncoder.h" />
-    <ClInclude Include="include\Poco\InflatingStream.h" />
-    <ClInclude Include="include\Poco\LineEndingConverter.h" />
-    <ClInclude Include="include\Poco\MemoryStream.h" />
-    <ClInclude Include="include\Poco\NullStream.h" />
-    <ClInclude Include="include\Poco\StreamCopier.h" />
-    <ClInclude Include="include\Poco\StreamTokenizer.h" />
-    <ClInclude Include="include\Poco\StreamUtil.h" />
-    <ClInclude Include="include\Poco\TeeStream.h" />
-    <ClInclude Include="include\Poco\Token.h" />
-    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\Windows1250Encoding.h" />
-    <ClInclude Include="include\Poco\Windows1251Encoding.h" />
-    <ClInclude Include="src\crc32.h" />
-    <ClInclude Include="src\deflate.h" />
-    <ClInclude Include="src\inffast.h" />
-    <ClInclude Include="src\inffixed.h" />
-    <ClInclude Include="src\inflate.h" />
-    <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\zconf.h" />
-    <ClInclude Include="src\zlib.h" />
-    <ClInclude Include="src\zutil.h" />
-    <ClInclude Include="include\Poco\ActiveDispatcher.h" />
-    <ClInclude Include="include\Poco\ActiveMethod.h" />
-    <ClInclude Include="include\Poco\ActiveResult.h" />
-    <ClInclude Include="include\Poco\ActiveRunnable.h" />
-    <ClInclude Include="include\Poco\ActiveStarter.h" />
-    <ClInclude Include="include\Poco\Activity.h" />
-    <ClInclude Include="include\Poco\Condition.h" />
-    <ClInclude Include="include\Poco\ErrorHandler.h" />
-    <ClInclude Include="include\Poco\Event.h" />
-    <ClInclude Include="include\Poco\Event_POSIX.h" />
-    <ClInclude Include="include\Poco\Event_WIN32.h" />
-    <ClInclude Include="include\Poco\Mutex.h" />
-    <ClInclude Include="include\Poco\Mutex_POSIX.h" />
-    <ClInclude Include="include\Poco\Mutex_WIN32.h" />
-    <ClInclude Include="include\Poco\Runnable.h" />
-    <ClInclude Include="include\Poco\RunnableAdapter.h" />
-    <ClInclude Include="include\Poco\RWLock.h" />
-    <ClInclude Include="include\Poco\RWLock_POSIX.h" />
-    <ClInclude Include="include\Poco\RWLock_WIN32.h" />
-    <ClInclude Include="include\Poco\ScopedLock.h" />
-    <ClInclude Include="include\Poco\ScopedUnlock.h" />
-    <ClInclude Include="include\Poco\Semaphore.h" />
-    <ClInclude Include="include\Poco\Semaphore_POSIX.h" />
-    <ClInclude Include="include\Poco\Semaphore_WIN32.h" />
-    <ClInclude Include="include\Poco\SignalHandler.h" />
-    <ClInclude Include="include\Poco\SynchronizedObject.h" />
-    <ClInclude Include="include\Poco\Thread.h" />
-    <ClInclude Include="include\Poco\Thread_POSIX.h" />
-    <ClInclude Include="include\Poco\Thread_WIN32.h" />
-    <ClInclude Include="include\Poco\ThreadLocal.h" />
-    <ClInclude Include="include\Poco\ThreadPool.h" />
-    <ClInclude Include="include\Poco\ThreadTarget.h" />
-    <ClInclude Include="include\Poco\Timer.h" />
-    <ClInclude Include="include\Poco\DigestEngine.h" />
-    <ClInclude Include="include\Poco\DigestStream.h" />
-    <ClInclude Include="include\Poco\HMACEngine.h" />
-    <ClInclude Include="include\Poco\MD4Engine.h" />
-    <ClInclude Include="include\Poco\MD5Engine.h" />
-    <ClInclude Include="include\Poco\Random.h" />
-    <ClInclude Include="include\Poco\RandomStream.h" />
-    <ClInclude Include="include\Poco\SHA1Engine.h" />
-    <ClInclude Include="include\Poco\ClassLibrary.h" />
-    <ClInclude Include="include\Poco\ClassLoader.h" />
-    <ClInclude Include="include\Poco\Manifest.h" />
-    <ClInclude Include="include\Poco\MetaObject.h" />
-    <ClInclude Include="include\Poco\SharedLibrary.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_VMS.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
-    <ClInclude Include="src\ucp.h" />
-    <ClInclude Include="include\Poco\RegularExpression.h" />
-    <ClInclude Include="include\Poco\ArchiveStrategy.h" />
-    <ClInclude Include="include\Poco\AsyncChannel.h" />
-    <ClInclude Include="include\Poco\Channel.h" />
-    <ClInclude Include="include\Poco\Configurable.h" />
-    <ClInclude Include="include\Poco\ConsoleChannel.h" />
-    <ClInclude Include="include\Poco\EventLogChannel.h" />
-    <ClInclude Include="include\Poco\FileChannel.h" />
-    <ClInclude Include="include\Poco\Formatter.h" />
-    <ClInclude Include="include\Poco\FormattingChannel.h" />
-    <ClInclude Include="include\Poco\LogFile.h" />
-    <ClInclude Include="include\Poco\LogFile_STD.h" />
-    <ClInclude Include="include\Poco\LogFile_VMS.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
-    <ClInclude Include="include\Poco\Logger.h" />
-    <ClInclude Include="include\Poco\LoggingFactory.h" />
-    <ClInclude Include="include\Poco\LoggingRegistry.h" />
-    <ClInclude Include="include\Poco\LogStream.h" />
-    <ClInclude Include="include\Poco\Message.h" />
-    <ClInclude Include="include\Poco\NullChannel.h" />
-    <ClInclude Include="include\Poco\OpcomChannel.h" />
-    <ClInclude Include="include\Poco\PatternFormatter.h" />
-    <ClInclude Include="src\pocomsg.h" />
-    <ClInclude Include="include\Poco\PurgeStrategy.h" />
-    <ClInclude Include="include\Poco\RotateStrategy.h" />
-    <ClInclude Include="include\Poco\SimpleFileChannel.h" />
-    <ClInclude Include="include\Poco\SplitterChannel.h" />
-    <ClInclude Include="include\Poco\StreamChannel.h" />
-    <ClInclude Include="include\Poco\SyslogChannel.h" />
-    <ClInclude Include="include\Poco\WindowsConsoleChannel.h" />
-    <ClInclude Include="include\Poco\AbstractObserver.h" />
-    <ClInclude Include="include\Poco\NObserver.h" />
-    <ClInclude Include="include\Poco\Notification.h" />
-    <ClInclude Include="include\Poco\NotificationCenter.h" />
-    <ClInclude Include="include\Poco\NotificationQueue.h" />
-    <ClInclude Include="include\Poco\Observer.h" />
-    <ClInclude Include="include\Poco\PriorityNotificationQueue.h" />
-    <ClInclude Include="include\Poco\TimedNotificationQueue.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
-    <ClInclude Include="include\Poco\File.h" />
-    <ClInclude Include="include\Poco\File_UNIX.h" />
-    <ClInclude Include="include\Poco\File_VMS.h" />
-    <ClInclude Include="include\Poco\File_WIN32.h" />
-    <ClInclude Include="include\Poco\File_WIN32U.h" />
-    <ClInclude Include="include\Poco\Glob.h" />
-    <ClInclude Include="include\Poco\Path.h" />
-    <ClInclude Include="include\Poco\Path_UNIX.h" />
-    <ClInclude Include="include\Poco\Path_VMS.h" />
-    <ClInclude Include="include\Poco\Path_WIN32.h" />
-    <ClInclude Include="include\Poco\Path_WIN32U.h" />
-    <ClInclude Include="include\Poco\TemporaryFile.h" />
-    <ClInclude Include="include\Poco\NamedEvent.h" />
-    <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedEvent_VMS.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
-    <ClInclude Include="include\Poco\NamedMutex.h" />
-    <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedMutex_VMS.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
-    <ClInclude Include="include\Poco\Pipe.h" />
-    <ClInclude Include="include\Poco\PipeImpl.h" />
-    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h" />
-    <ClInclude Include="include\Poco\PipeImpl_POSIX.h" />
-    <ClInclude Include="include\Poco\PipeImpl_WIN32.h" />
-    <ClInclude Include="include\Poco\PipeStream.h" />
-    <ClInclude Include="include\Poco\Process.h" />
-    <ClInclude Include="include\Poco\Process_UNIX.h" />
-    <ClInclude Include="include\Poco\Process_VMS.h" />
-    <ClInclude Include="include\Poco\Process_WIN32.h" />
-    <ClInclude Include="include\Poco\Process_WIN32U.h" />
-    <ClInclude Include="include\Poco\SharedMemory.h" />
-    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />
-    <ClInclude Include="include\Poco\SharedMemory_POSIX.h" />
-    <ClInclude Include="include\Poco\SharedMemory_WIN32.h" />
-    <ClInclude Include="include\Poco\UUID.h" />
-    <ClInclude Include="include\Poco\UUIDGenerator.h" />
-    <ClInclude Include="include\Poco\Clock.h" />
-    <ClInclude Include="include\Poco\DateTime.h" />
-    <ClInclude Include="include\Poco\DateTimeFormat.h" />
-    <ClInclude Include="include\Poco\DateTimeFormatter.h" />
-    <ClInclude Include="include\Poco\DateTimeParser.h" />
-    <ClInclude Include="include\Poco\LocalDateTime.h" />
-    <ClInclude Include="include\Poco\Stopwatch.h" />
-    <ClInclude Include="include\Poco\Timespan.h" />
-    <ClInclude Include="include\Poco\Timestamp.h" />
-    <ClInclude Include="include\Poco\Timezone.h" />
-    <ClInclude Include="include\Poco\ASCIIEncoding.h" />
-    <ClInclude Include="include\Poco\Latin1Encoding.h" />
-    <ClInclude Include="include\Poco\Latin9Encoding.h" />
-    <ClInclude Include="include\Poco\StreamConverter.h" />
-    <ClInclude Include="include\Poco\TextBufferIterator.h" />
-    <ClInclude Include="include\Poco\TextConverter.h" />
-    <ClInclude Include="include\Poco\TextEncoding.h" />
-    <ClInclude Include="include\Poco\TextIterator.h" />
-    <ClInclude Include="include\Poco\Unicode.h" />
-    <ClInclude Include="include\Poco\UnicodeConverter.h" />
-    <ClInclude Include="include\Poco\UTF16Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8String.h" />
-    <ClInclude Include="include\Poco\Windows1252Encoding.h" />
-    <ClInclude Include="include\Poco\FileStreamFactory.h" />
-    <ClInclude Include="include\Poco\URI.h" />
-    <ClInclude Include="include\Poco\URIStreamFactory.h" />
-    <ClInclude Include="include\Poco\URIStreamOpener.h" />
-    <ClInclude Include="include\Poco\Task.h" />
-    <ClInclude Include="include\Poco\TaskManager.h" />
-    <ClInclude Include="include\Poco\TaskNotification.h" />
-    <ClInclude Include="include\Poco\AbstractDelegate.h" />
-    <ClInclude Include="include\Poco\AbstractEvent.h" />
-    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\BasicEvent.h" />
-    <ClInclude Include="include\Poco\DefaultStrategy.h" />
-    <ClInclude Include="include\Poco\Delegate.h" />
-    <ClInclude Include="include\Poco\EventArgs.h" />
-    <ClInclude Include="include\Poco\Expire.h" />
-    <ClInclude Include="include\Poco\FIFOEvent.h" />
-    <ClInclude Include="include\Poco\FIFOStrategy.h" />
-    <ClInclude Include="include\Poco\FunctionDelegate.h" />
-    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\NotificationStrategy.h" />
-    <ClInclude Include="include\Poco\PriorityDelegate.h" />
-    <ClInclude Include="include\Poco\PriorityEvent.h" />
-    <ClInclude Include="include\Poco\PriorityExpire.h" />
-    <ClInclude Include="include\Poco\AbstractCache.h" />
-    <ClInclude Include="include\Poco\AbstractStrategy.h" />
-    <ClInclude Include="include\Poco\AccessExpireCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\ExpireCache.h" />
-    <ClInclude Include="include\Poco\ExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\ExpireStrategy.h" />
-    <ClInclude Include="include\Poco\KeyValueArgs.h" />
-    <ClInclude Include="include\Poco\LRUCache.h" />
-    <ClInclude Include="include\Poco\LRUStrategy.h" />
-    <ClInclude Include="include\Poco\StrategyCollection.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\UniqueExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ValidArgs.h" />
-    <ClInclude Include="include\Poco\Hash.h" />
-    <ClInclude Include="include\Poco\HashFunction.h" />
-    <ClInclude Include="include\Poco\HashMap.h" />
-    <ClInclude Include="include\Poco\HashSet.h" />
-    <ClInclude Include="include\Poco\HashStatistic.h" />
-    <ClInclude Include="include\Poco\HashTable.h" />
-    <ClInclude Include="include\Poco\LinearHashTable.h" />
-    <ClInclude Include="include\Poco\SimpleHashTable.h" />
+    <ClInclude Include="include\Poco\Any.h"/>
+    <ClInclude Include="include\Poco\Ascii.h"/>
+    <ClInclude Include="include\Poco\AtomicCounter.h"/>
+    <ClInclude Include="include\Poco\AutoPtr.h"/>
+    <ClInclude Include="include\Poco\AutoReleasePool.h"/>
+    <ClInclude Include="include\Poco\Buffer.h"/>
+    <ClInclude Include="include\Poco\Bugcheck.h"/>
+    <ClInclude Include="include\Poco\ByteOrder.h"/>
+    <ClInclude Include="include\Poco\Checksum.h"/>
+    <ClInclude Include="include\Poco\Config.h"/>
+    <ClInclude Include="include\Poco\Debugger.h"/>
+    <ClInclude Include="include\Poco\DynamicAny.h"/>
+    <ClInclude Include="include\Poco\DynamicAnyHolder.h"/>
+    <ClInclude Include="include\Poco\DynamicFactory.h"/>
+    <ClInclude Include="include\Poco\Environment.h"/>
+    <ClInclude Include="include\Poco\Environment_UNIX.h"/>
+    <ClInclude Include="include\Poco\Environment_VMS.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Error.h"/>
+    <ClInclude Include="include\Poco\Exception.h"/>
+    <ClInclude Include="include\Poco\FIFOBuffer.h"/>
+    <ClInclude Include="include\Poco\Format.h"/>
+    <ClInclude Include="include\Poco\Foundation.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_C99.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DEC.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_SUN.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Instantiator.h"/>
+    <ClInclude Include="include\Poco\JSONString.h"/>
+    <ClInclude Include="include\Poco\MemoryPool.h"/>
+    <ClInclude Include="include\Poco\MetaProgramming.h"/>
+    <ClInclude Include="include\Poco\NamedTuple.h"/>
+    <ClInclude Include="include\Poco\NestedDiagnosticContext.h"/>
+    <ClInclude Include="include\Poco\Nullable.h"/>
+    <ClInclude Include="include\Poco\NumberFormatter.h"/>
+    <ClInclude Include="include\Poco\NumberParser.h"/>
+    <ClInclude Include="include\Poco\NumericString.h"/>
+    <ClInclude Include="include\Poco\ObjectPool.h"/>
+    <ClInclude Include="include\Poco\Optional.h"/>
+    <ClInclude Include="include\Poco\Platform.h"/>
+    <ClInclude Include="include\Poco\Platform_POSIX.h"/>
+    <ClInclude Include="include\Poco\Platform_VMS.h"/>
+    <ClInclude Include="include\Poco\Platform_WIN32.h"/>
+    <ClInclude Include="include\Poco\Poco.h"/>
+    <ClInclude Include="include\Poco\RefCountedObject.h"/>
+    <ClInclude Include="include\Poco\SharedPtr.h"/>
+    <ClInclude Include="include\Poco\SingletonHolder.h"/>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\String.h"/>
+    <ClInclude Include="include\Poco\StringTokenizer.h"/>
+    <ClInclude Include="include\Poco\Tuple.h"/>
+    <ClInclude Include="include\Poco\TypeList.h"/>
+    <ClInclude Include="include\Poco\Types.h"/>
+    <ClInclude Include="include\Poco\UnWindows.h"/>
+    <ClInclude Include="include\Poco\Version.h"/>
+    <ClInclude Include="include\Poco\Void.h"/>
+    <ClInclude Include="include\Poco\Base32Decoder.h"/>
+    <ClInclude Include="include\Poco\Base32Encoder.h"/>
+    <ClInclude Include="include\Poco\Base64Decoder.h"/>
+    <ClInclude Include="include\Poco\Base64Encoder.h"/>
+    <ClInclude Include="include\Poco\BinaryReader.h"/>
+    <ClInclude Include="include\Poco\BinaryWriter.h"/>
+    <ClInclude Include="include\Poco\BufferAllocator.h"/>
+    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h"/>
+    <ClInclude Include="include\Poco\BufferedStreamBuf.h"/>
+    <ClInclude Include="include\Poco\CountingStream.h"/>
+    <ClInclude Include="include\Poco\DeflatingStream.h"/>
+    <ClInclude Include="include\Poco\FileStream.h"/>
+    <ClInclude Include="include\Poco\FileStream_POSIX.h"/>
+    <ClInclude Include="include\Poco\FileStream_WIN32.h"/>
+    <ClInclude Include="include\Poco\HexBinaryDecoder.h"/>
+    <ClInclude Include="include\Poco\HexBinaryEncoder.h"/>
+    <ClInclude Include="include\Poco\InflatingStream.h"/>
+    <ClInclude Include="include\Poco\LineEndingConverter.h"/>
+    <ClInclude Include="include\Poco\MemoryStream.h"/>
+    <ClInclude Include="include\Poco\NullStream.h"/>
+    <ClInclude Include="include\Poco\StreamCopier.h"/>
+    <ClInclude Include="include\Poco\StreamTokenizer.h"/>
+    <ClInclude Include="include\Poco\StreamUtil.h"/>
+    <ClInclude Include="include\Poco\TeeStream.h"/>
+    <ClInclude Include="include\Poco\Token.h"/>
+    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h"/>
+    <ClInclude Include="src\crc32.h"/>
+    <ClInclude Include="src\deflate.h"/>
+    <ClInclude Include="src\inffast.h"/>
+    <ClInclude Include="src\inffixed.h"/>
+    <ClInclude Include="src\inflate.h"/>
+    <ClInclude Include="src\inftrees.h"/>
+    <ClInclude Include="src\trees.h"/>
+    <ClInclude Include="src\zconf.h"/>
+    <ClInclude Include="src\zlib.h"/>
+    <ClInclude Include="src\zutil.h"/>
+    <ClInclude Include="include\Poco\ActiveDispatcher.h"/>
+    <ClInclude Include="include\Poco\ActiveMethod.h"/>
+    <ClInclude Include="include\Poco\ActiveResult.h"/>
+    <ClInclude Include="include\Poco\ActiveRunnable.h"/>
+    <ClInclude Include="include\Poco\ActiveStarter.h"/>
+    <ClInclude Include="include\Poco\Activity.h"/>
+    <ClInclude Include="include\Poco\Condition.h"/>
+    <ClInclude Include="include\Poco\ErrorHandler.h"/>
+    <ClInclude Include="include\Poco\Event.h"/>
+    <ClInclude Include="include\Poco\Event_POSIX.h"/>
+    <ClInclude Include="include\Poco\Event_WIN32.h"/>
+    <ClInclude Include="include\Poco\Mutex.h"/>
+    <ClInclude Include="include\Poco\Mutex_POSIX.h"/>
+    <ClInclude Include="include\Poco\Mutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\Runnable.h"/>
+    <ClInclude Include="include\Poco\RunnableAdapter.h"/>
+    <ClInclude Include="include\Poco\RWLock.h"/>
+    <ClInclude Include="include\Poco\RWLock_POSIX.h"/>
+    <ClInclude Include="include\Poco\RWLock_WIN32.h"/>
+    <ClInclude Include="include\Poco\ScopedLock.h"/>
+    <ClInclude Include="include\Poco\ScopedUnlock.h"/>
+    <ClInclude Include="include\Poco\Semaphore.h"/>
+    <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
+    <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
+    <ClInclude Include="include\Poco\SignalHandler.h"/>
+    <ClInclude Include="include\Poco\SynchronizedObject.h"/>
+    <ClInclude Include="include\Poco\Thread.h"/>
+    <ClInclude Include="include\Poco\Thread_POSIX.h"/>
+    <ClInclude Include="include\Poco\Thread_WIN32.h"/>
+    <ClInclude Include="include\Poco\ThreadLocal.h"/>
+    <ClInclude Include="include\Poco\ThreadPool.h"/>
+    <ClInclude Include="include\Poco\ThreadTarget.h"/>
+    <ClInclude Include="include\Poco\Timer.h"/>
+    <ClInclude Include="include\Poco\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\DigestStream.h"/>
+    <ClInclude Include="include\Poco\HMACEngine.h"/>
+    <ClInclude Include="include\Poco\MD4Engine.h"/>
+    <ClInclude Include="include\Poco\MD5Engine.h"/>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h"/>
+    <ClInclude Include="include\Poco\Random.h"/>
+    <ClInclude Include="include\Poco\RandomStream.h"/>
+    <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\ClassLibrary.h"/>
+    <ClInclude Include="include\Poco\ClassLoader.h"/>
+    <ClInclude Include="include\Poco\Manifest.h"/>
+    <ClInclude Include="include\Poco\MetaObject.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_VMS.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"/>
+    <ClInclude Include="src\pcre.h"/>
+    <ClInclude Include="src\pcre_config.h"/>
+    <ClInclude Include="src\pcre_internal.h"/>
+    <ClInclude Include="src\ucp.h"/>
+    <ClInclude Include="include\Poco\RegularExpression.h"/>
+    <ClInclude Include="include\Poco\ArchiveStrategy.h"/>
+    <ClInclude Include="include\Poco\AsyncChannel.h"/>
+    <ClInclude Include="include\Poco\Channel.h"/>
+    <ClInclude Include="include\Poco\Configurable.h"/>
+    <ClInclude Include="include\Poco\ConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\EventLogChannel.h"/>
+    <ClInclude Include="include\Poco\FileChannel.h"/>
+    <ClInclude Include="include\Poco\Formatter.h"/>
+    <ClInclude Include="include\Poco\FormattingChannel.h"/>
+    <ClInclude Include="include\Poco\LogFile.h"/>
+    <ClInclude Include="include\Poco\LogFile_STD.h"/>
+    <ClInclude Include="include\Poco\LogFile_VMS.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Logger.h"/>
+    <ClInclude Include="include\Poco\LoggingFactory.h"/>
+    <ClInclude Include="include\Poco\LoggingRegistry.h"/>
+    <ClInclude Include="include\Poco\LogStream.h"/>
+    <ClInclude Include="include\Poco\Message.h"/>
+    <ClInclude Include="include\Poco\NullChannel.h"/>
+    <ClInclude Include="include\Poco\OpcomChannel.h"/>
+    <ClInclude Include="include\Poco\PatternFormatter.h"/>
+    <ClInclude Include="src\pocomsg.h"/>
+    <ClInclude Include="include\Poco\PurgeStrategy.h"/>
+    <ClInclude Include="include\Poco\RotateStrategy.h"/>
+    <ClInclude Include="include\Poco\SimpleFileChannel.h"/>
+    <ClInclude Include="include\Poco\SplitterChannel.h"/>
+    <ClInclude Include="include\Poco\StreamChannel.h"/>
+    <ClInclude Include="include\Poco\SyslogChannel.h"/>
+    <ClInclude Include="include\Poco\WindowsConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\AbstractObserver.h"/>
+    <ClInclude Include="include\Poco\NObserver.h"/>
+    <ClInclude Include="include\Poco\Notification.h"/>
+    <ClInclude Include="include\Poco\NotificationCenter.h"/>
+    <ClInclude Include="include\Poco\NotificationQueue.h"/>
+    <ClInclude Include="include\Poco\Observer.h"/>
+    <ClInclude Include="include\Poco\PriorityNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\TimedNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"/>
+    <ClInclude Include="include\Poco\DirectoryWatcher.h"/>
+    <ClInclude Include="include\Poco\File.h"/>
+    <ClInclude Include="include\Poco\File_UNIX.h"/>
+    <ClInclude Include="include\Poco\File_VMS.h"/>
+    <ClInclude Include="include\Poco\File_WIN32.h"/>
+    <ClInclude Include="include\Poco\File_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Glob.h"/>
+    <ClInclude Include="include\Poco\Path.h"/>
+    <ClInclude Include="include\Poco\Path_UNIX.h"/>
+    <ClInclude Include="include\Poco\Path_VMS.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32U.h"/>
+    <ClInclude Include="include\Poco\TemporaryFile.h"/>
+    <ClInclude Include="include\Poco\NamedEvent.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h"/>
+    <ClInclude Include="include\Poco\NamedMutex.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Pipe.h"/>
+    <ClInclude Include="include\Poco\PipeImpl.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_POSIX.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_WIN32.h"/>
+    <ClInclude Include="include\Poco\PipeStream.h"/>
+    <ClInclude Include="include\Poco\Process.h"/>
+    <ClInclude Include="include\Poco\Process_UNIX.h"/>
+    <ClInclude Include="include\Poco\Process_VMS.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32U.h"/>
+    <ClInclude Include="include\Poco\SharedMemory.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_POSIX.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_WIN32.h"/>
+    <ClInclude Include="include\Poco\UUID.h"/>
+    <ClInclude Include="include\Poco\UUIDGenerator.h"/>
+    <ClInclude Include="include\Poco\Clock.h"/>
+    <ClInclude Include="include\Poco\DateTime.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormat.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormatter.h"/>
+    <ClInclude Include="include\Poco\DateTimeParser.h"/>
+    <ClInclude Include="include\Poco\LocalDateTime.h"/>
+    <ClInclude Include="include\Poco\Stopwatch.h"/>
+    <ClInclude Include="include\Poco\Timespan.h"/>
+    <ClInclude Include="include\Poco\Timestamp.h"/>
+    <ClInclude Include="include\Poco\Timezone.h"/>
+    <ClInclude Include="include\Poco\ASCIIEncoding.h"/>
+    <ClInclude Include="include\Poco\Latin1Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin2Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin9Encoding.h"/>
+    <ClInclude Include="include\Poco\ListMap.h"/>
+    <ClInclude Include="include\Poco\StreamConverter.h"/>
+    <ClInclude Include="include\Poco\TextBufferIterator.h"/>
+    <ClInclude Include="include\Poco\TextConverter.h"/>
+    <ClInclude Include="include\Poco\TextEncoding.h"/>
+    <ClInclude Include="include\Poco\TextIterator.h"/>
+    <ClInclude Include="include\Poco\Unicode.h"/>
+    <ClInclude Include="include\Poco\UnicodeConverter.h"/>
+    <ClInclude Include="include\Poco\UTF16Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF32Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8String.h"/>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1252Encoding.h"/>
+    <ClInclude Include="include\Poco\FileStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URI.h"/>
+    <ClInclude Include="include\Poco\URIStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URIStreamOpener.h"/>
+    <ClInclude Include="include\Poco\Task.h"/>
+    <ClInclude Include="include\Poco\TaskManager.h"/>
+    <ClInclude Include="include\Poco\TaskNotification.h"/>
+    <ClInclude Include="include\Poco\AbstractDelegate.h"/>
+    <ClInclude Include="include\Poco\AbstractEvent.h"/>
+    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\BasicEvent.h"/>
+    <ClInclude Include="include\Poco\DefaultStrategy.h"/>
+    <ClInclude Include="include\Poco\Delegate.h"/>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h"/>
+    <ClInclude Include="include\Poco\EventArgs.h"/>
+    <ClInclude Include="include\Poco\Expire.h"/>
+    <ClInclude Include="include\Poco\FIFOEvent.h"/>
+    <ClInclude Include="include\Poco\FIFOStrategy.h"/>
+    <ClInclude Include="include\Poco\FunctionDelegate.h"/>
+    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\NotificationStrategy.h"/>
+    <ClInclude Include="include\Poco\PriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\PriorityEvent.h"/>
+    <ClInclude Include="include\Poco\PriorityExpire.h"/>
+    <ClInclude Include="include\Poco\PriorityStrategy.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h"/>
+    <ClInclude Include="include\Poco\AbstractCache.h"/>
+    <ClInclude Include="include\Poco\AbstractStrategy.h"/>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\AccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\ExpireCache.h"/>
+    <ClInclude Include="include\Poco\ExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\ExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\KeyValueArgs.h"/>
+    <ClInclude Include="include\Poco\LRUCache.h"/>
+    <ClInclude Include="include\Poco\LRUStrategy.h"/>
+    <ClInclude Include="include\Poco\StrategyCollection.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ValidArgs.h"/>
+    <ClInclude Include="include\Poco\Hash.h"/>
+    <ClInclude Include="include\Poco\HashFunction.h"/>
+    <ClInclude Include="include\Poco\HashMap.h"/>
+    <ClInclude Include="include\Poco\HashSet.h"/>
+    <ClInclude Include="include\Poco\HashStatistic.h"/>
+    <ClInclude Include="include\Poco\HashTable.h"/>
+    <ClInclude Include="include\Poco\LinearHashTable.h"/>
+    <ClInclude Include="include\Poco\SimpleHashTable.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Pair.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Struct.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Var.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarHolder.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarIterator.h"/>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\pocomsg.mc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
+</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ResourceCompile Include="src\pocomsg.rc"/>
     <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>
-    <ResourceCompile Include="src\pocomsg.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/Foundation_vs120.vcxproj.filters b/Foundation/Foundation_vs120.vcxproj.filters
index 03f8c0f97c..e2f21942e2 100644
--- a/Foundation/Foundation_vs120.vcxproj.filters
+++ b/Foundation/Foundation_vs120.vcxproj.filters
@@ -2,190 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{185c1200-1c1b-4fc7-9da0-b650d0c1bf77}</UniqueIdentifier>
+      <UniqueIdentifier>{f7e52ba0-de6e-4398-9132-57cc9b8f0cbd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{e4438cfb-753c-4882-b6a7-37f1b2eb7924}</UniqueIdentifier>
+      <UniqueIdentifier>{b191404a-e9bc-4c35-b69c-bc766ec75680}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{5fef2634-dac7-4251-8cc6-685a55fb6b69}</UniqueIdentifier>
+      <UniqueIdentifier>{54518e6a-fcff-4cf1-a464-ddbd182a4e99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{27c4af78-bbb6-41df-a186-f2a592f6dd7e}</UniqueIdentifier>
+      <UniqueIdentifier>{67d482ba-ec56-4e86-aea8-8d22e427bbca}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{faa6333e-8acd-42d3-b72c-37cd0e19d162}</UniqueIdentifier>
+      <UniqueIdentifier>{3750df2d-bd5a-4724-94f7-8087d54939e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d5c0096d-097d-40c2-ac9e-c52501bca586}</UniqueIdentifier>
+      <UniqueIdentifier>{ed7d2a40-f67f-47a4-9247-0d68e82b27b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\zlib">
-      <UniqueIdentifier>{341c25b8-2c02-4356-98af-e9cdc028d65d}</UniqueIdentifier>
+      <UniqueIdentifier>{4f7697ad-5104-4c77-b774-d6f0a9940ce1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{dcfb473d-2dc0-419b-82e5-49a02e866436}</UniqueIdentifier>
+      <UniqueIdentifier>{f26c3132-c4fd-423d-b8a4-258cd037a32b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8}</UniqueIdentifier>
+      <UniqueIdentifier>{d2084fbe-f6d8-4c3d-8ecf-48781f24dd02}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{2cf5d5b6-8945-4a08-8382-b1ae4760d23c}</UniqueIdentifier>
+      <UniqueIdentifier>{89332e4d-2e6d-47fd-ada7-4d1274f2aa7f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{d7d8f3d7-1f4d-40b3-b2be-69b169947e81}</UniqueIdentifier>
+      <UniqueIdentifier>{666b11f7-6060-4cb3-82f4-59c138396403}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{4eac0cd3-fa98-44f0-ba4b-126eea40690d}</UniqueIdentifier>
+      <UniqueIdentifier>{dffb4e61-87e4-4447-bc43-ec9367c1c639}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{641198e1-de95-4b94-8f88-740c2b199cf7}</UniqueIdentifier>
+      <UniqueIdentifier>{cfd7be53-83b7-4e91-b8f8-8dd2e18af650}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{69ead8e2-e830-4352-b858-3b7fa83c6f69}</UniqueIdentifier>
+      <UniqueIdentifier>{00af8468-0eb4-499c-86ec-14e1b53b891a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{86878c35-6789-4bed-96b4-27ddf9c57acd}</UniqueIdentifier>
+      <UniqueIdentifier>{2099d7ea-13c5-4b15-b00d-76f2ff626c9c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{7de594c4-642c-4ac5-b236-7056ccaa6191}</UniqueIdentifier>
+      <UniqueIdentifier>{fe12cfd3-8145-4939-aa1f-160016239e16}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression">
-      <UniqueIdentifier>{74d499e8-5aec-4f63-9522-26bc8b2e4e1e}</UniqueIdentifier>
+      <UniqueIdentifier>{3c9fd9dd-9f63-48d0-bba8-7b9810a404d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{aad0de07-cbb7-4cf9-acbb-46b3c529ef72}</UniqueIdentifier>
+      <UniqueIdentifier>{e4de47f4-b8d7-4d49-b04d-1c346440225f}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Source Files">
-      <UniqueIdentifier>{59eea661-94fe-4cfa-a84a-3ed55d6fc6c2}</UniqueIdentifier>
+      <UniqueIdentifier>{61486c5b-70d3-4b72-90ae-05f570d67f5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
-      <UniqueIdentifier>{0b1828a5-18ba-4155-a8f9-2c488e582c0d}</UniqueIdentifier>
+      <UniqueIdentifier>{fa9a5466-c3fe-44e4-b1db-bf26bb889310}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{ddc6a944-851d-4fae-9ae2-58c7abb800ae}</UniqueIdentifier>
+      <UniqueIdentifier>{57c59d89-299a-432b-82e5-5ce1f533f124}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{96f5ad60-2335-463a-8e23-da1476ed46f2}</UniqueIdentifier>
+      <UniqueIdentifier>{da84d99d-0487-4c45-9266-6510fee8e318}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{06229b8b-13a0-43b1-8f11-53373321e5cd}</UniqueIdentifier>
+      <UniqueIdentifier>{4edf9866-e634-4518-a50d-ccf70871f80f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{5274aca5-2472-4212-a11a-7d23ff583083}</UniqueIdentifier>
+      <UniqueIdentifier>{b020fe2f-7a76-4d18-a1dd-8e6fc4533be0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Message Files">
-      <UniqueIdentifier>{c9340af5-5ac1-4082-8fee-f6343b9ab2e2}</UniqueIdentifier>
+      <UniqueIdentifier>{814704de-93d0-46a7-976d-54e612dfb05d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Resource Files">
-      <UniqueIdentifier>{d723209d-84d0-4890-ac64-4949699f6e3a}</UniqueIdentifier>
+      <UniqueIdentifier>{a79f56ab-2659-4e8e-ae8f-2338a495d11b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{44de33ce-ef79-4671-8258-65dc5ef863b8}</UniqueIdentifier>
+      <UniqueIdentifier>{941ef281-4655-4162-b581-da97416f914f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{39e651e5-e5c8-454d-b1f9-456c809dcf92}</UniqueIdentifier>
+      <UniqueIdentifier>{b9a8d7df-b6ae-48fc-a7f9-b65aaf99dab7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{732e2c8f-a8af-4318-9ab9-0d8d62afae54}</UniqueIdentifier>
+      <UniqueIdentifier>{5a99269a-b1b1-4eb7-ac3d-740b6ff13c26}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{5d4bc826-9b0a-4014-9302-cc9f88646ff6}</UniqueIdentifier>
+      <UniqueIdentifier>{34802d35-f1d6-4d5b-bdd0-66768301ed87}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{b8210208-8698-4cda-94fd-3e906f9ca78f}</UniqueIdentifier>
+      <UniqueIdentifier>{88e42ee5-3139-4cc6-abbd-7ffa5960e105}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{af751147-0509-4d3c-9ab3-b20c20974341}</UniqueIdentifier>
+      <UniqueIdentifier>{6d5601ea-f7dd-42d8-a2c1-108c26e2ac13}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{359ad015-e38e-423e-877e-c827eed229f2}</UniqueIdentifier>
+      <UniqueIdentifier>{c047e064-73f7-48d5-ab6e-59608c5be671}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{3a817f74-6edb-4098-a29b-8347840a09ae}</UniqueIdentifier>
+      <UniqueIdentifier>{c2d9de1f-d6fd-4c03-bc94-ce78edab1cca}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{a07318ae-554f-44ec-bdfd-6fe0929c3dd3}</UniqueIdentifier>
+      <UniqueIdentifier>{e521aa75-4a33-4044-a2f9-6b9147c67199}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{ece427ab-b6ef-4700-9a42-312b8507a010}</UniqueIdentifier>
+      <UniqueIdentifier>{aa772c39-e34a-4352-b230-7c543c278f91}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{eb8ddeab-7b2f-4537-aa4a-939268a1a9a4}</UniqueIdentifier>
+      <UniqueIdentifier>{b6725fd2-b9ae-4487-a1aa-0772de68142e}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{4bcbbcd9-3409-4bcc-b999-f9e360d45a09}</UniqueIdentifier>
+      <UniqueIdentifier>{72e98f99-7393-443a-8555-1b7220fd3cfc}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{48f74d8c-d6a2-4e5a-a322-55702b35b221}</UniqueIdentifier>
+      <UniqueIdentifier>{b3c810f8-190e-4e40-bb9e-ba8c3503f301}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{6c702a6b-e1d8-4d6e-9c48-dab631371287}</UniqueIdentifier>
+      <UniqueIdentifier>{768e2807-0b07-4440-8f00-eb6e1575f62d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{e3e8d759-a950-40ed-9271-17bf7e9baa8e}</UniqueIdentifier>
+      <UniqueIdentifier>{6876ccd9-fa40-42f2-baa2-813682d2dad4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{3ef3d3a4-84a1-4026-85dd-53e71f3f820f}</UniqueIdentifier>
+      <UniqueIdentifier>{f7a23613-f244-44c7-99f3-2ec90f89763f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{665d566f-5f8f-45d0-b883-a43185dc8ab8}</UniqueIdentifier>
+      <UniqueIdentifier>{c843f984-c275-4f27-a8bd-65f3bd8c86b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{51e1620d-85e0-493d-819f-960bc0957f0f}</UniqueIdentifier>
+      <UniqueIdentifier>{339b2cb0-c759-48de-b6cf-6e288a0da8ed}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{ee3f4314-64e7-420c-88d5-df016f15dd4f}</UniqueIdentifier>
+      <UniqueIdentifier>{a3302566-2dab-4bf8-bac0-1b34fb459449}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{bc06eae9-3602-448d-8290-4a9a68adbe8b}</UniqueIdentifier>
+      <UniqueIdentifier>{a24bda55-fbf5-4c32-8b2a-4024ad10a92c}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{1a21c5ef-d4a6-42dc-94be-5a0a791ba589}</UniqueIdentifier>
+      <UniqueIdentifier>{484ed887-1091-407b-aa6f-5a2c7b46a8e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{dafee4e1-a8e0-4af9-bd00-378430a364ea}</UniqueIdentifier>
+      <UniqueIdentifier>{cd6ad2dd-49a5-4152-b645-311ac74bd9e3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{cb46df12-6010-4ef6-9f85-937585263f3e}</UniqueIdentifier>
+      <UniqueIdentifier>{5a9ebd1d-08e9-4891-96f9-e5ea5dc11410}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{50d1f7a3-d675-41b8-8370-2718b2e95c2f}</UniqueIdentifier>
+      <UniqueIdentifier>{d9543c5d-b5cc-46c9-9729-37b673ff646d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events">
-      <UniqueIdentifier>{f2886094-2ba3-402c-b5a8-dbfa0500e3d3}</UniqueIdentifier>
+      <UniqueIdentifier>{5d720680-2ab1-4e78-903e-e9e3ae95583d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Header Files">
-      <UniqueIdentifier>{7237275f-8924-4f26-96de-066ba722f9c6}</UniqueIdentifier>
+      <UniqueIdentifier>{28eb1005-1f84-46e7-9eda-c36930cc8bef}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Source Files">
-      <UniqueIdentifier>{cdb9c09a-2a19-4203-a6f4-87455a799508}</UniqueIdentifier>
+      <UniqueIdentifier>{e2dc005f-4134-4a4a-a3c7-d85e7c490622}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{040f6767-8762-4b80-9db2-45a2b18c1d86}</UniqueIdentifier>
+      <UniqueIdentifier>{ea9c3214-acd1-48f6-9d03-1215af0a362a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{3fd772e7-f8cf-42fb-8b1b-5c49b9f79562}</UniqueIdentifier>
+      <UniqueIdentifier>{c31d8f67-7415-4da6-9083-888a979028b3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{6e184876-2a72-4dd8-87e0-a42022d17513}</UniqueIdentifier>
+      <UniqueIdentifier>{3d194c9b-3659-4da2-9159-b43dd891eff7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{251118a8-6f5b-4f8f-b19f-b953058b3820}</UniqueIdentifier>
+      <UniqueIdentifier>{9b616843-920f-487f-95d0-b649854b5453}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{20c16777-1fc6-4272-bf38-fef730596f73}</UniqueIdentifier>
+      <UniqueIdentifier>{83125998-026f-4218-92a9-81d875b36e67}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{da88549e-329c-444c-85bb-b2339bc09505}</UniqueIdentifier>
+      <UniqueIdentifier>{c4744651-0ab8-4bce-a101-1fb0fc194521}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{1ad862ca-df95-43f5-a87b-a714b9b84303}</UniqueIdentifier>
+      <UniqueIdentifier>{1f84e72f-a973-48e0-9cf5-fe63b3a18229}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{918536bd-29fb-4b4f-a706-629925dbb66c}</UniqueIdentifier>
+      <UniqueIdentifier>{532a1f37-780f-4af8-b46a-19d4f0ffb56e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{4d00a3d6-7a50-4553-a62a-8eee081c9fb1}</UniqueIdentifier>
+      <UniqueIdentifier>{39bbb85c-baf8-4ebc-ab88-a997e44976b7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -207,6 +207,9 @@
     <ClCompile Include="src\Debugger.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Environment.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -249,6 +252,9 @@
     <ClCompile Include="src\FPEnvironment_WIN32.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MemoryPool.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -261,13 +267,16 @@
     <ClCompile Include="src\NumberParser.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NumericString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\String.cpp">
+    <ClCompile Include="src\SortedDirectoryIterator.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp">
+    <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\StringTokenizer.cpp">
@@ -300,6 +309,9 @@
     <ClCompile Include="src\DeflatingStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStream.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -489,6 +501,9 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_byte_order.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_chartables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -498,40 +513,31 @@
     <ClCompile Include="src\pcre_config.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_dfa_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_fullinfo.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
+    <ClCompile Include="src\pcre_get.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
+    <ClCompile Include="src\pcre_globals.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
+    <ClCompile Include="src\pcre_jit_compile.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
+    <ClCompile Include="src\pcre_maketables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
+    <ClCompile Include="src\pcre_newline.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
+    <ClCompile Include="src\pcre_ord2utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_refcount.c">
@@ -540,7 +546,10 @@
     <ClCompile Include="src\pcre_string_utils.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
+    <ClCompile Include="src\pcre_study.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre_tables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_ucd.c">
@@ -549,6 +558,9 @@
     <ClCompile Include="src\pcre_valid_utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_version.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_xclass.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -672,10 +684,7 @@
     <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SortedDirectoryIterator.cpp">
+    <ClCompile Include="src\DirectoryWatcher.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\File.cpp">
@@ -837,6 +846,9 @@
     <ClCompile Include="src\Latin1Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Latin2Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Latin9Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -864,12 +876,21 @@
     <ClCompile Include="src\UTF16Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\UTF32Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\UTF8Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\UTF8String.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Windows1250Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Windows1251Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1252Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -903,33 +924,15 @@
     <ClCompile Include="src\HashStatistic.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryWatcher.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Var.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\VarHolder.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Variterator.cpp">
+    <ClCompile Include="src\VarIterator.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1250Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1251Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStream.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UTF32Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -995,6 +998,9 @@
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\FIFOBuffer.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Format.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1022,10 +1028,7 @@
     <ClInclude Include="include\Poco\Instantiator.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Latin2Encoding.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\ListMap.h">
+    <ClInclude Include="include\Poco\JSONString.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\MemoryPool.h">
@@ -1052,6 +1055,12 @@
     <ClInclude Include="include\Poco\NumericString.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ObjectPool.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Optional.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Platform.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1076,6 +1085,9 @@
     <ClInclude Include="include\Poco\SingletonHolder.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\String.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1322,6 +1334,9 @@
     <ClInclude Include="include\Poco\MD5Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Random.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -1505,16 +1520,7 @@
     <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+    <ClInclude Include="include\Poco\DirectoryWatcher.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\File.h">
@@ -1670,9 +1676,15 @@
     <ClInclude Include="include\Poco\Latin1Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Latin2Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Latin9Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ListMap.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\StreamConverter.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1697,12 +1709,21 @@
     <ClInclude Include="include\Poco\UTF16Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\UTF32Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\UTF8Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\UTF8String.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1252Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1745,6 +1766,9 @@
     <ClInclude Include="include\Poco\Delegate.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\EventArgs.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
@@ -1775,12 +1799,24 @@
     <ClInclude Include="include\Poco\PriorityExpire.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PriorityStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AbstractCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\AbstractStrategy.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AccessExpireCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
@@ -1859,15 +1895,6 @@
     <ClInclude Include="include\Poco\SimpleHashTable.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PriorityStrategy.h">
-      <Filter>Events\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryWatcher.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\Pair.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
@@ -1883,37 +1910,6 @@
     <ClInclude Include="include\Poco\Dynamic\VarIterator.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Windows1250Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1251Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Array.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBuffer.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBufferStream.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTF32Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTFString.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\ObjectPool.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Optional.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Alignment.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_vs90.sln b/Foundation/Foundation_vs90.sln
index ca47d2d388..d16b72ad3f 100644
--- a/Foundation/Foundation_vs90.sln
+++ b/Foundation/Foundation_vs90.sln
@@ -1,20 +1,21 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs90.vcproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs90.vcproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs90.vcproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs90.vcproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs90.vcproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs90.vcproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,42 +27,42 @@ Global
 		release_static_mt|Win32 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Deploy.0 = release_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
@@ -74,6 +75,18 @@ Global
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj
index d60ff36147..0e9f2e563c 100644
--- a/Foundation/Foundation_vs90.vcproj
+++ b/Foundation/Foundation_vs90.vcproj
@@ -1,48 +1,38 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
 	Name="Foundation"
-	ProjectGUID="{8164D41D-B053-405B-826C-CF37AC0EF176}"
+	Version="9.00"
+	ProjectType="Visual C++"
+	ProjectGUID="{B01196CC-B693-4548-8464-2FF60499E73F}"
 	RootNamespace="Foundation"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
+	<ToolFiles/>
 	<Configurations>
 		<Configuration
 			Name="debug_shared|Win32"
-			OutputDirectory="obj\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(ConfigurationName)"
+			OutputDirectory="obj\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -56,72 +46,58 @@
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="..\bin\PocoFoundationd.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\bin\PocoFoundationd.pdb"
+				AdditionalLibraryDirectories="..\lib"
 				SubSystem="1"
 				ImportLibrary="..\lib\PocoFoundationd.lib"
 				TargetMachine="1"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCManifestTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="release_shared|Win32"
-			OutputDirectory="obj\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(ConfigurationName)"
+			OutputDirectory="obj\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
@@ -129,10 +105,8 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC"
-				GeneratePreprocessedFile="0"
-				KeepComments="false"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -144,295 +118,231 @@
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 				CompileAs="0"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="..\bin\PocoFoundation.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="false"
-				ProgramDatabaseFile=""
+				AdditionalLibraryDirectories="..\lib"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="..\lib\PocoFoundation.lib"
 				TargetMachine="1"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCManifestTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="release_static_md|Win32"
-			OutputDirectory="obj\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(ConfigurationName)"
+			Name="debug_static_mt|Win32"
+			OutputDirectory="obj\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
-				GeneratePreprocessedFile="0"
-				KeepComments="false"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="..\lib\PocoFoundationmtd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				CompileAs="0"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib\PocoFoundationmd.lib"
-			/>
+				OutputFile="..\lib\PocoFoundationmtd.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="debug_static_md|Win32"
-			OutputDirectory="obj\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(ConfigurationName)"
+			Name="release_static_mt|Win32"
+			OutputDirectory="obj\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoFoundationmdd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="0"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib\PocoFoundationmdd.lib"
-			/>
+				OutputFile="..\lib\PocoFoundationmt.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="debug_static_mt|Win32"
-			OutputDirectory="obj\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(ConfigurationName)"
+			Name="debug_static_md|Win32"
+			OutputDirectory="obj\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoFoundationmtd.pdb"
+				ProgramDataBaseFileName="..\lib\PocoFoundationmdd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib\PocoFoundationmtd.lib"
-			/>
+				OutputFile="..\lib\PocoFoundationmdd.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="release_static_mt|Win32"
-			OutputDirectory="obj\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj\Foundation\$(ConfigurationName)"
+			Name="release_static_md|Win32"
+			OutputDirectory="obj\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
@@ -440,12 +350,10 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
-				GeneratePreprocessedFile="0"
-				KeepComments="false"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
@@ -455,5888 +363,3927 @@
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 				CompileAs="0"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib\PocoFoundationmt.lib"
-			/>
+				OutputFile="..\lib\PocoFoundationmd.lib"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
+	<References/>
 	<Files>
 		<Filter
-			Name="Core"
-			>
+			Name="Core">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Ascii.cpp"
-					>
-				</File>
+					RelativePath=".\src\Ascii.cpp"/>
 				<File
-					RelativePath=".\src\AtomicCounter.cpp"
-					>
-				</File>
+					RelativePath=".\src\AtomicCounter.cpp"/>
 				<File
-					RelativePath=".\src\Bugcheck.cpp"
-					>
-				</File>
+					RelativePath=".\src\Bugcheck.cpp"/>
 				<File
-					RelativePath=".\src\ByteOrder.cpp"
-					>
+					RelativePath=".\src\ByteOrder.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Checksum.cpp"
-					>
-				</File>
+					RelativePath=".\src\Checksum.cpp"/>
 				<File
-					RelativePath=".\src\Debugger.cpp"
-					>
-				</File>
+					RelativePath=".\src\Debugger.cpp"/>
 				<File
-					RelativePath=".\src\DirectoryIteratorStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryIteratorStrategy.cpp"/>
 				<File
-					RelativePath=".\src\Environment.cpp"
-					>
-				</File>
+					RelativePath=".\src\Environment.cpp"/>
 				<File
-					RelativePath=".\src\Environment_UNIX.cpp"
-					>
+					RelativePath=".\src\Environment_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Environment_VMS.cpp"
-					>
+					RelativePath=".\src\Environment_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Environment_WIN32.cpp"
-					>
+					RelativePath=".\src\Environment_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Environment_WIN32U.cpp"
-					>
+					RelativePath=".\src\Environment_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Error.cpp"
-					>
-				</File>
+					RelativePath=".\src\Error.cpp"/>
 				<File
-					RelativePath=".\src\Exception.cpp"
-					>
-				</File>
+					RelativePath=".\src\Exception.cpp"/>
 				<File
-					RelativePath=".\src\Format.cpp"
-					>
-				</File>
+					RelativePath=".\src\Format.cpp"/>
 				<File
-					RelativePath=".\src\FPEnvironment.cpp"
-					>
-				</File>
+					RelativePath=".\src\FPEnvironment.cpp"/>
 				<File
-					RelativePath=".\src\FPEnvironment_C99.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_C99.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_DEC.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_DEC.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_DUMMY.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_SUN.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_SUN.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_WIN32.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\MemoryPool.cpp"
-					>
-				</File>
+					RelativePath=".\src\JSONString.cpp"/>
 				<File
-					RelativePath=".\src\NestedDiagnosticContext.cpp"
-					>
-				</File>
+					RelativePath=".\src\MemoryPool.cpp"/>
 				<File
-					RelativePath=".\src\NumberFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\NestedDiagnosticContext.cpp"/>
 				<File
-					RelativePath=".\src\NumberParser.cpp"
-					>
-				</File>
+					RelativePath=".\src\NumberFormatter.cpp"/>
 				<File
-					RelativePath=".\src\NumericString.cpp"
-					>
-				</File>
+					RelativePath=".\src\NumberParser.cpp"/>
 				<File
-					RelativePath=".\src\RefCountedObject.cpp"
-					>
-				</File>
+					RelativePath=".\src\NumericString.cpp"/>
 				<File
-					RelativePath=".\src\SortedDirectoryIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\RefCountedObject.cpp"/>
 				<File
-					RelativePath=".\src\String.cpp"
-					>
+					RelativePath=".\src\SortedDirectoryIterator.cpp"/>
+				<File
+					RelativePath=".\src\String.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\StringTokenizer.cpp"
-					>
-				</File>
+					RelativePath=".\src\StringTokenizer.cpp"/>
 				<File
-					RelativePath=".\src\Void.cpp"
-					>
-				</File>
+					RelativePath=".\src\Void.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Any.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Any.h"/>
 				<File
-					RelativePath=".\include\Poco\Ascii.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Ascii.h"/>
 				<File
-					RelativePath=".\include\Poco\AtomicCounter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AtomicCounter.h"/>
 				<File
-					RelativePath=".\include\Poco\AutoPtr.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AutoPtr.h"/>
 				<File
-					RelativePath=".\include\Poco\AutoReleasePool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AutoReleasePool.h"/>
 				<File
-					RelativePath=".\include\Poco\Buffer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Buffer.h"/>
 				<File
-					RelativePath=".\include\Poco\Bugcheck.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Bugcheck.h"/>
 				<File
-					RelativePath=".\include\Poco\ByteOrder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ByteOrder.h"/>
 				<File
-					RelativePath=".\include\Poco\Checksum.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Checksum.h"/>
 				<File
-					RelativePath=".\include\Poco\Config.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Config.h"/>
 				<File
-					RelativePath=".\include\Poco\Debugger.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Debugger.h"/>
 				<File
-					RelativePath=".\include\Poco\DynamicAny.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DynamicAny.h"/>
 				<File
-					RelativePath=".\include\Poco\DynamicAnyHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DynamicAnyHolder.h"/>
 				<File
-					RelativePath=".\include\Poco\DynamicFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DynamicFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Error.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Error.h"/>
 				<File
-					RelativePath=".\include\Poco\Exception.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Exception.h"/>
 				<File
-					RelativePath=".\include\Poco\FIFOBuffer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOBuffer.h"/>
 				<File
-					RelativePath=".\include\Poco\Format.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Format.h"/>
 				<File
-					RelativePath=".\include\Poco\Foundation.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Foundation.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_C99.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_C99.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_DEC.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_DEC.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_DUMMY.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_DUMMY.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_SUN.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_SUN.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Instantiator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Instantiator.h"/>
 				<File
-					RelativePath=".\include\Poco\MemoryPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\JSONString.h"/>
 				<File
-					RelativePath=".\include\Poco\MetaProgramming.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MemoryPool.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedTuple.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MetaProgramming.h"/>
 				<File
-					RelativePath=".\include\Poco\NestedDiagnosticContext.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedTuple.h"/>
 				<File
-					RelativePath=".\include\Poco\Nullable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NestedDiagnosticContext.h"/>
 				<File
-					RelativePath=".\include\Poco\NumberFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Nullable.h"/>
 				<File
-					RelativePath=".\include\Poco\NumberParser.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NumberFormatter.h"/>
 				<File
-					RelativePath=".\include\Poco\NumericString.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NumberParser.h"/>
 				<File
-					RelativePath=".\include\Poco\ObjectPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NumericString.h"/>
 				<File
-					RelativePath=".\include\Poco\Optional.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ObjectPool.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Optional.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Poco.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\RefCountedObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Poco.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedPtr.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RefCountedObject.h"/>
 				<File
-					RelativePath=".\include\Poco\SingletonHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedPtr.h"/>
 				<File
-					RelativePath=".\include\Poco\SortedDirectoryIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SingletonHolder.h"/>
 				<File
-					RelativePath=".\include\Poco\String.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SortedDirectoryIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\StringTokenizer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\String.h"/>
 				<File
-					RelativePath=".\include\Poco\Tuple.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StringTokenizer.h"/>
 				<File
-					RelativePath=".\include\Poco\TypeList.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Tuple.h"/>
 				<File
-					RelativePath=".\include\Poco\Types.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TypeList.h"/>
 				<File
-					RelativePath=".\include\Poco\UnWindows.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Types.h"/>
 				<File
-					RelativePath=".\include\Poco\Version.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnWindows.h"/>
 				<File
-					RelativePath=".\include\Poco\Void.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Version.h"/>
+				<File
+					RelativePath=".\include\Poco\Void.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Streams"
-			>
+			Name="Streams">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Base32Decoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base32Decoder.cpp"/>
 				<File
-					RelativePath=".\src\Base32Encoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base32Encoder.cpp"/>
 				<File
-					RelativePath=".\src\Base64Decoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base64Decoder.cpp"/>
 				<File
-					RelativePath=".\src\Base64Encoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base64Encoder.cpp"/>
 				<File
-					RelativePath=".\src\BinaryReader.cpp"
-					>
-				</File>
+					RelativePath=".\src\BinaryReader.cpp"/>
 				<File
-					RelativePath=".\src\BinaryWriter.cpp"
-					>
-				</File>
+					RelativePath=".\src\BinaryWriter.cpp"/>
 				<File
-					RelativePath=".\src\CountingStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\CountingStream.cpp"/>
 				<File
-					RelativePath=".\src\DeflatingStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\DeflatingStream.cpp"/>
 				<File
-					RelativePath=".\src\FIFOBufferStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\FIFOBufferStream.cpp"/>
 				<File
-					RelativePath=".\src\FileStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\FileStream.cpp"/>
 				<File
-					RelativePath=".\src\FileStream_POSIX.cpp"
-					>
+					RelativePath=".\src\FileStream_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FileStream_WIN32.cpp"
-					>
+					RelativePath=".\src\FileStream_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\HexBinaryDecoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\HexBinaryDecoder.cpp"/>
 				<File
-					RelativePath=".\src\HexBinaryEncoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\HexBinaryEncoder.cpp"/>
 				<File
-					RelativePath=".\src\InflatingStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\InflatingStream.cpp"/>
 				<File
-					RelativePath=".\src\LineEndingConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\LineEndingConverter.cpp"/>
 				<File
-					RelativePath=".\src\MemoryStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\MemoryStream.cpp"/>
 				<File
-					RelativePath=".\src\NullStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\NullStream.cpp"/>
 				<File
-					RelativePath=".\src\StreamCopier.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamCopier.cpp"/>
 				<File
-					RelativePath=".\src\StreamTokenizer.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamTokenizer.cpp"/>
 				<File
-					RelativePath=".\src\TeeStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\TeeStream.cpp"/>
 				<File
-					RelativePath=".\src\Token.cpp"
-					>
-				</File>
+					RelativePath=".\src\Token.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Base32Decoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base32Decoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Base32Encoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base32Encoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Base64Decoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base64Decoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Base64Encoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base64Encoder.h"/>
 				<File
-					RelativePath=".\include\Poco\BinaryReader.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BinaryReader.h"/>
 				<File
-					RelativePath=".\include\Poco\BinaryWriter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BinaryWriter.h"/>
 				<File
-					RelativePath=".\include\Poco\BufferAllocator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferAllocator.h"/>
 				<File
-					RelativePath=".\include\Poco\BufferedBidirectionalStreamBuf.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferedBidirectionalStreamBuf.h"/>
 				<File
-					RelativePath=".\include\Poco\BufferedStreamBuf.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferedStreamBuf.h"/>
 				<File
-					RelativePath=".\include\Poco\CountingStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\CountingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\DeflatingStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DeflatingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\FileStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream.h"/>
 				<File
-					RelativePath=".\include\Poco\FileStream_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\FileStream_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\HexBinaryDecoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HexBinaryDecoder.h"/>
 				<File
-					RelativePath=".\include\Poco\HexBinaryEncoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HexBinaryEncoder.h"/>
 				<File
-					RelativePath=".\include\Poco\InflatingStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\InflatingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\LineEndingConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LineEndingConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\MemoryStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MemoryStream.h"/>
 				<File
-					RelativePath=".\include\Poco\NullStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NullStream.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamCopier.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamCopier.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamTokenizer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamTokenizer.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamUtil.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamUtil.h"/>
 				<File
-					RelativePath=".\include\Poco\TeeStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TeeStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Token.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Token.h"/>
 				<File
-					RelativePath=".\include\Poco\UnbufferedStreamBuf.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnbufferedStreamBuf.h"/>
 			</Filter>
 			<Filter
-				Name="zlib"
-				>
+				Name="zlib">
 				<File
-					RelativePath=".\src\adler32.c"
-					>
-				</File>
+					RelativePath=".\src\adler32.c"/>
 				<File
-					RelativePath=".\src\compress.c"
-					>
-				</File>
+					RelativePath=".\src\compress.c"/>
 				<File
-					RelativePath=".\src\crc32.c"
-					>
-				</File>
+					RelativePath=".\src\crc32.c"/>
 				<File
-					RelativePath=".\src\crc32.h"
-					>
-				</File>
+					RelativePath=".\src\crc32.h"/>
 				<File
-					RelativePath=".\src\deflate.c"
-					>
-				</File>
+					RelativePath=".\src\deflate.c"/>
 				<File
-					RelativePath=".\src\deflate.h"
-					>
-				</File>
+					RelativePath=".\src\deflate.h"/>
 				<File
-					RelativePath=".\src\infback.c"
-					>
-				</File>
+					RelativePath=".\src\infback.c"/>
 				<File
-					RelativePath=".\src\inffast.c"
-					>
-				</File>
+					RelativePath=".\src\inffast.c"/>
 				<File
-					RelativePath=".\src\inffast.h"
-					>
-				</File>
+					RelativePath=".\src\inffast.h"/>
 				<File
-					RelativePath=".\src\inffixed.h"
-					>
-				</File>
+					RelativePath=".\src\inffixed.h"/>
 				<File
-					RelativePath=".\src\inflate.c"
-					>
-				</File>
+					RelativePath=".\src\inflate.c"/>
 				<File
-					RelativePath=".\src\inflate.h"
-					>
-				</File>
+					RelativePath=".\src\inflate.h"/>
 				<File
-					RelativePath=".\src\inftrees.c"
-					>
-				</File>
+					RelativePath=".\src\inftrees.c"/>
 				<File
-					RelativePath=".\src\inftrees.h"
-					>
-				</File>
+					RelativePath=".\src\inftrees.h"/>
 				<File
-					RelativePath=".\src\trees.c"
-					>
-				</File>
+					RelativePath=".\src\trees.c"/>
 				<File
-					RelativePath=".\src\trees.h"
-					>
-				</File>
+					RelativePath=".\src\trees.h"/>
 				<File
-					RelativePath=".\src\zconf.h"
-					>
-				</File>
+					RelativePath=".\src\zconf.h"/>
 				<File
-					RelativePath=".\src\zlib.h"
-					>
-				</File>
+					RelativePath=".\src\zlib.h"/>
 				<File
-					RelativePath=".\src\zutil.c"
-					>
-				</File>
+					RelativePath=".\src\zutil.c"/>
 				<File
-					RelativePath=".\src\zutil.h"
-					>
-				</File>
+					RelativePath=".\src\zutil.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Threading"
-			>
+			Name="Threading">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\ActiveDispatcher.cpp"
-					>
-				</File>
+					RelativePath=".\src\ActiveDispatcher.cpp"/>
 				<File
-					RelativePath=".\src\Condition.cpp"
-					>
-				</File>
+					RelativePath=".\src\Condition.cpp"/>
 				<File
-					RelativePath=".\src\ErrorHandler.cpp"
-					>
-				</File>
+					RelativePath=".\src\ErrorHandler.cpp"/>
 				<File
-					RelativePath=".\src\Event.cpp"
-					>
-				</File>
+					RelativePath=".\src\Event.cpp"/>
 				<File
-					RelativePath=".\src\Event_POSIX.cpp"
-					>
+					RelativePath=".\src\Event_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Event_WIN32.cpp"
-					>
+					RelativePath=".\src\Event_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Mutex.cpp"
-					>
-				</File>
+					RelativePath=".\src\Mutex.cpp"/>
 				<File
-					RelativePath=".\src\Mutex_POSIX.cpp"
-					>
+					RelativePath=".\src\Mutex_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Mutex_WIN32.cpp"
-					>
+					RelativePath=".\src\Mutex_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Runnable.cpp"
-					>
-				</File>
+					RelativePath=".\src\Runnable.cpp"/>
 				<File
-					RelativePath=".\src\RWLock.cpp"
-					>
-				</File>
+					RelativePath=".\src\RWLock.cpp"/>
 				<File
-					RelativePath=".\src\RWLock_POSIX.cpp"
-					>
+					RelativePath=".\src\RWLock_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\RWLock_WIN32.cpp"
-					>
+					RelativePath=".\src\RWLock_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Semaphore.cpp"
-					>
-				</File>
+					RelativePath=".\src\Semaphore.cpp"/>
 				<File
-					RelativePath=".\src\Semaphore_POSIX.cpp"
-					>
+					RelativePath=".\src\Semaphore_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Semaphore_WIN32.cpp"
-					>
+					RelativePath=".\src\Semaphore_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SignalHandler.cpp"
-					>
+					RelativePath=".\src\SignalHandler.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SynchronizedObject.cpp"
-					>
-				</File>
+					RelativePath=".\src\SynchronizedObject.cpp"/>
 				<File
-					RelativePath=".\src\Thread.cpp"
-					>
-				</File>
+					RelativePath=".\src\Thread.cpp"/>
 				<File
-					RelativePath=".\src\Thread_POSIX.cpp"
-					>
+					RelativePath=".\src\Thread_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Thread_WIN32.cpp"
-					>
+					RelativePath=".\src\Thread_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\ThreadLocal.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadLocal.cpp"/>
 				<File
-					RelativePath=".\src\ThreadPool.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadPool.cpp"/>
 				<File
-					RelativePath=".\src\ThreadTarget.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadTarget.cpp"/>
 				<File
-					RelativePath=".\src\Timer.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timer.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ActiveDispatcher.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveDispatcher.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveMethod.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveMethod.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveResult.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveResult.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveRunnable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveRunnable.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveStarter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveStarter.h"/>
 				<File
-					RelativePath=".\include\Poco\Activity.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Activity.h"/>
 				<File
-					RelativePath=".\include\Poco\Condition.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Condition.h"/>
 				<File
-					RelativePath=".\include\Poco\ErrorHandler.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ErrorHandler.h"/>
 				<File
-					RelativePath=".\include\Poco\Event.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event.h"/>
 				<File
-					RelativePath=".\include\Poco\Event_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Event_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Runnable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Runnable.h"/>
 				<File
-					RelativePath=".\include\Poco\RunnableAdapter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RunnableAdapter.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\ScopedLock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ScopedLock.h"/>
 				<File
-					RelativePath=".\include\Poco\ScopedUnlock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ScopedUnlock.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\SignalHandler.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SignalHandler.h"/>
 				<File
-					RelativePath=".\include\Poco\SynchronizedObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SynchronizedObject.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\ThreadLocal.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ThreadLocal.h"/>
 				<File
-					RelativePath=".\include\Poco\ThreadPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ThreadPool.h"/>
 				<File
-					RelativePath=".\include\Poco\ThreadTarget.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ThreadTarget.h"/>
 				<File
-					RelativePath=".\include\Poco\Timer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timer.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Crypt"
-			>
+			Name="Crypt">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\DigestEngine.cpp"
-					>
-				</File>
+					RelativePath=".\src\DigestEngine.cpp"/>
 				<File
-					RelativePath=".\src\DigestStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\DigestStream.cpp"/>
 				<File
-					RelativePath=".\src\MD4Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\MD4Engine.cpp"/>
 				<File
-					RelativePath=".\src\MD5Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\MD5Engine.cpp"/>
 				<File
-					RelativePath=".\src\Random.cpp"
-					>
-				</File>
+					RelativePath=".\src\Random.cpp"/>
 				<File
-					RelativePath=".\src\RandomStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\RandomStream.cpp"/>
 				<File
-					RelativePath=".\src\SHA1Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\SHA1Engine.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\DigestEngine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DigestEngine.h"/>
 				<File
-					RelativePath=".\include\Poco\DigestStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DigestStream.h"/>
 				<File
-					RelativePath=".\include\Poco\HMACEngine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HMACEngine.h"/>
 				<File
-					RelativePath=".\include\Poco\MD4Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MD4Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\MD5Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MD5Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\PBKDF2Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PBKDF2Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\Random.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Random.h"/>
 				<File
-					RelativePath=".\include\Poco\RandomStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RandomStream.h"/>
 				<File
-					RelativePath=".\include\Poco\SHA1Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SHA1Engine.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="SharedLibrary"
-			>
+			Name="SharedLibrary">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Manifest.cpp"
-					>
-				</File>
+					RelativePath=".\src\Manifest.cpp"/>
 				<File
-					RelativePath=".\src\SharedLibrary.cpp"
-					>
-				</File>
+					RelativePath=".\src\SharedLibrary.cpp"/>
 				<File
-					RelativePath=".\src\SharedLibrary_HPUX.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_HPUX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_UNIX.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_VMS.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_WIN32.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_WIN32U.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ClassLibrary.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ClassLibrary.h"/>
 				<File
-					RelativePath=".\include\Poco\ClassLoader.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ClassLoader.h"/>
 				<File
-					RelativePath=".\include\Poco\Manifest.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Manifest.h"/>
 				<File
-					RelativePath=".\include\Poco\MetaObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MetaObject.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_HPUX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_HPUX.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_WIN32U.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="RegularExpression"
-			>
+			Name="RegularExpression">
 			<Filter
-				Name="PCRE Header Files"
-				>
+				Name="PCRE Header Files">
 				<File
-					RelativePath=".\src\pcre.h"
-					>
-				</File>
+					RelativePath=".\src\pcre.h"/>
 				<File
-					RelativePath=".\src\pcre_config.h"
-					>
-				</File>
+					RelativePath=".\src\pcre_config.h"/>
 				<File
-					RelativePath=".\src\pcre_internal.h"
-					>
-				</File>
+					RelativePath=".\src\pcre_internal.h"/>
 				<File
-					RelativePath=".\src\ucp.h"
-					>
-				</File>
+					RelativePath=".\src\ucp.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\RegularExpression.cpp"
-					>
-				</File>
+					RelativePath=".\src\RegularExpression.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\RegularExpression.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RegularExpression.h"/>
 			</Filter>
 			<Filter
-				Name="PCRE Source Files"
-				>
+				Name="PCRE Source Files">
 				<File
-					RelativePath=".\src\pcre_byte_order.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_byte_order.c"/>
 				<File
-					RelativePath=".\src\pcre_chartables.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_chartables.c"/>
 				<File
-					RelativePath=".\src\pcre_compile.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_compile.c"/>
 				<File
-					RelativePath=".\src\pcre_config.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_config.c"/>
 				<File
-					RelativePath=".\src\pcre_dfa_exec.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_dfa_exec.c"/>
 				<File
-					RelativePath=".\src\pcre_exec.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_exec.c"/>
 				<File
-					RelativePath=".\src\pcre_fullinfo.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_fullinfo.c"/>
 				<File
-					RelativePath=".\src\pcre_get.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_get.c"/>
 				<File
-					RelativePath=".\src\pcre_globals.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_globals.c"/>
 				<File
-					RelativePath=".\src\pcre_jit_compile.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_jit_compile.c"/>
 				<File
-					RelativePath=".\src\pcre_maketables.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_maketables.c"/>
 				<File
-					RelativePath=".\src\pcre_newline.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_newline.c"/>
 				<File
-					RelativePath=".\src\pcre_ord2utf8.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_ord2utf8.c"/>
 				<File
-					RelativePath=".\src\pcre_refcount.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_refcount.c"/>
 				<File
-					RelativePath=".\src\pcre_string_utils.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_string_utils.c"/>
 				<File
-					RelativePath=".\src\pcre_study.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_study.c"/>
 				<File
-					RelativePath=".\src\pcre_tables.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_tables.c"/>
 				<File
-					RelativePath=".\src\pcre_ucd.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_ucd.c"/>
 				<File
-					RelativePath=".\src\pcre_valid_utf8.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_valid_utf8.c"/>
 				<File
-					RelativePath=".\src\pcre_version.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_version.c"/>
 				<File
-					RelativePath=".\src\pcre_xclass.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_xclass.c"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Logging"
-			>
+			Name="Logging">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\ArchiveStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\ArchiveStrategy.cpp"/>
 				<File
-					RelativePath=".\src\AsyncChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\AsyncChannel.cpp"/>
 				<File
-					RelativePath=".\src\Channel.cpp"
-					>
-				</File>
+					RelativePath=".\src\Channel.cpp"/>
 				<File
-					RelativePath=".\src\Configurable.cpp"
-					>
-				</File>
+					RelativePath=".\src\Configurable.cpp"/>
 				<File
-					RelativePath=".\src\ConsoleChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\ConsoleChannel.cpp"/>
 				<File
-					RelativePath=".\src\EventLogChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\EventLogChannel.cpp"/>
 				<File
-					RelativePath=".\src\FileChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\FileChannel.cpp"/>
 				<File
-					RelativePath=".\src\Formatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\Formatter.cpp"/>
 				<File
-					RelativePath=".\src\FormattingChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\FormattingChannel.cpp"/>
 				<File
-					RelativePath=".\src\LogFile.cpp"
-					>
-				</File>
+					RelativePath=".\src\LogFile.cpp"/>
 				<File
-					RelativePath=".\src\LogFile_STD.cpp"
-					>
+					RelativePath=".\src\LogFile_STD.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_VMS.cpp"
-					>
+					RelativePath=".\src\LogFile_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_WIN32.cpp"
-					>
+					RelativePath=".\src\LogFile_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_WIN32U.cpp"
-					>
+					RelativePath=".\src\LogFile_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Logger.cpp"
-					>
-				</File>
+					RelativePath=".\src\Logger.cpp"/>
 				<File
-					RelativePath=".\src\LoggingFactory.cpp"
-					>
-				</File>
+					RelativePath=".\src\LoggingFactory.cpp"/>
 				<File
-					RelativePath=".\src\LoggingRegistry.cpp"
-					>
-				</File>
+					RelativePath=".\src\LoggingRegistry.cpp"/>
 				<File
-					RelativePath=".\src\LogStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\LogStream.cpp"/>
 				<File
-					RelativePath=".\src\Message.cpp"
-					>
-				</File>
+					RelativePath=".\src\Message.cpp"/>
 				<File
-					RelativePath=".\src\NullChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\NullChannel.cpp"/>
 				<File
-					RelativePath=".\src\OpcomChannel.cpp"
-					>
+					RelativePath=".\src\OpcomChannel.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PatternFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\PatternFormatter.cpp"/>
 				<File
-					RelativePath=".\src\PurgeStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\PurgeStrategy.cpp"/>
 				<File
-					RelativePath=".\src\RotateStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\RotateStrategy.cpp"/>
 				<File
-					RelativePath=".\src\SimpleFileChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\SimpleFileChannel.cpp"/>
 				<File
-					RelativePath=".\src\SplitterChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\SplitterChannel.cpp"/>
 				<File
-					RelativePath=".\src\StreamChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamChannel.cpp"/>
 				<File
-					RelativePath=".\src\SyslogChannel.cpp"
-					>
+					RelativePath=".\src\SyslogChannel.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\WindowsConsoleChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\WindowsConsoleChannel.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ArchiveStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ArchiveStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\AsyncChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AsyncChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\Channel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Channel.h"/>
 				<File
-					RelativePath=".\include\Poco\Configurable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Configurable.h"/>
 				<File
-					RelativePath=".\include\Poco\ConsoleChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ConsoleChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\EventLogChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\EventLogChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\FileChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\Formatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Formatter.h"/>
 				<File
-					RelativePath=".\include\Poco\FormattingChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FormattingChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_STD.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_STD.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Logger.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Logger.h"/>
 				<File
-					RelativePath=".\include\Poco\LoggingFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LoggingFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\LoggingRegistry.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LoggingRegistry.h"/>
 				<File
-					RelativePath=".\include\Poco\LogStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Message.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Message.h"/>
 				<File
-					RelativePath=".\include\Poco\NullChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NullChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\OpcomChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\OpcomChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\PatternFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PatternFormatter.h"/>
 				<File
-					RelativePath=".\src\pocomsg.h"
-					>
-				</File>
+					RelativePath=".\src\pocomsg.h"/>
 				<File
-					RelativePath=".\include\Poco\PurgeStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PurgeStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\RotateStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RotateStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\SimpleFileChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SimpleFileChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\SplitterChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SplitterChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\SyslogChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SyslogChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\WindowsConsoleChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\WindowsConsoleChannel.h"/>
 			</Filter>
 			<Filter
-				Name="Message Files"
-				>
+				Name="Message Files">
 				<File
-					RelativePath=".\src\pocomsg.mc"
-					>
+					RelativePath=".\src\pocomsg.mc">
 					<FileConfiguration
-						Name="debug_shared|Win32"
-						>
+						Name="debug_shared|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_shared|Win32"
-						>
+						Name="release_shared|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						>
+						Name="debug_static_mt|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						>
+						Name="release_static_mt|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						>
+						Name="debug_static_md|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						>
+						Name="release_static_md|Win32">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Resource Files"
-				>
+				Name="Resource Files">
 				<File
-					RelativePath=".\src\pocomsg.rc"
-					>
-				</File>
+					RelativePath=".\src\pocomsg.rc"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Notifications"
-			>
+			Name="Notifications">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\AbstractObserver.cpp"
-					>
-				</File>
+					RelativePath=".\src\AbstractObserver.cpp"/>
 				<File
-					RelativePath=".\src\Notification.cpp"
-					>
-				</File>
+					RelativePath=".\src\Notification.cpp"/>
 				<File
-					RelativePath=".\src\NotificationCenter.cpp"
-					>
-				</File>
+					RelativePath=".\src\NotificationCenter.cpp"/>
 				<File
-					RelativePath=".\src\NotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\NotificationQueue.cpp"/>
 				<File
-					RelativePath=".\src\PriorityNotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\PriorityNotificationQueue.cpp"/>
 				<File
-					RelativePath=".\src\TimedNotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\TimedNotificationQueue.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\AbstractObserver.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractObserver.h"/>
 				<File
-					RelativePath=".\include\Poco\NObserver.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NObserver.h"/>
 				<File
-					RelativePath=".\include\Poco\Notification.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Notification.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationCenter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationCenter.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationQueue.h"/>
 				<File
-					RelativePath=".\include\Poco\Observer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Observer.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityNotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityNotificationQueue.h"/>
 				<File
-					RelativePath=".\include\Poco\TimedNotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TimedNotificationQueue.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Filesystem"
-			>
+			Name="Filesystem">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\DirectoryIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryIterator.cpp"/>
 				<File
-					RelativePath=".\src\DirectoryIterator_UNIX.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_VMS.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_WIN32.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_WIN32U.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryWatcher.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryWatcher.cpp"/>
 				<File
-					RelativePath=".\src\File.cpp"
-					>
-				</File>
+					RelativePath=".\src\File.cpp"/>
 				<File
-					RelativePath=".\src\File_UNIX.cpp"
-					>
+					RelativePath=".\src\File_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_VMS.cpp"
-					>
+					RelativePath=".\src\File_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_WIN32.cpp"
-					>
+					RelativePath=".\src\File_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_WIN32U.cpp"
-					>
+					RelativePath=".\src\File_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Glob.cpp"
-					>
-				</File>
+					RelativePath=".\src\Glob.cpp"/>
 				<File
-					RelativePath=".\src\Path.cpp"
-					>
-				</File>
+					RelativePath=".\src\Path.cpp"/>
 				<File
-					RelativePath=".\src\Path_UNIX.cpp"
-					>
+					RelativePath=".\src\Path_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_VMS.cpp"
-					>
+					RelativePath=".\src\Path_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_WIN32.cpp"
-					>
+					RelativePath=".\src\Path_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_WIN32U.cpp"
-					>
+					RelativePath=".\src\Path_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\TemporaryFile.cpp"
-					>
-				</File>
+					RelativePath=".\src\TemporaryFile.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryWatcher.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryWatcher.h"/>
 				<File
-					RelativePath=".\include\Poco\File.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File.h"/>
 				<File
-					RelativePath=".\include\Poco\File_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\File_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\File_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\File_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Glob.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Glob.h"/>
 				<File
-					RelativePath=".\include\Poco\Path.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\TemporaryFile.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TemporaryFile.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Processes"
-			>
+			Name="Processes">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\NamedEvent.cpp"
-					>
-				</File>
+					RelativePath=".\src\NamedEvent.cpp"/>
 				<File
-					RelativePath=".\src\NamedEvent_UNIX.cpp"
-					>
+					RelativePath=".\src\NamedEvent_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_VMS.cpp"
-					>
+					RelativePath=".\src\NamedEvent_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_WIN32.cpp"
-					>
+					RelativePath=".\src\NamedEvent_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_WIN32U.cpp"
-					>
+					RelativePath=".\src\NamedEvent_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex.cpp"
-					>
-				</File>
+					RelativePath=".\src\NamedMutex.cpp"/>
 				<File
-					RelativePath=".\src\NamedMutex_UNIX.cpp"
-					>
+					RelativePath=".\src\NamedMutex_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_VMS.cpp"
-					>
+					RelativePath=".\src\NamedMutex_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_WIN32.cpp"
-					>
+					RelativePath=".\src\NamedMutex_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_WIN32U.cpp"
-					>
+					RelativePath=".\src\NamedMutex_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Pipe.cpp"
-					>
-				</File>
+					RelativePath=".\src\Pipe.cpp"/>
 				<File
-					RelativePath=".\src\PipeImpl.cpp"
-					>
-				</File>
+					RelativePath=".\src\PipeImpl.cpp"/>
 				<File
-					RelativePath=".\src\PipeImpl_DUMMY.cpp"
-					>
+					RelativePath=".\src\PipeImpl_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeImpl_POSIX.cpp"
-					>
+					RelativePath=".\src\PipeImpl_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeImpl_WIN32.cpp"
-					>
+					RelativePath=".\src\PipeImpl_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\PipeStream.cpp"/>
 				<File
-					RelativePath=".\src\Process.cpp"
-					>
-				</File>
+					RelativePath=".\src\Process.cpp"/>
 				<File
-					RelativePath=".\src\Process_UNIX.cpp"
-					>
+					RelativePath=".\src\Process_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_VMS.cpp"
-					>
+					RelativePath=".\src\Process_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_WIN32.cpp"
-					>
+					RelativePath=".\src\Process_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_WIN32U.cpp"
-					>
+					RelativePath=".\src\Process_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory.cpp"
-					>
-				</File>
+					RelativePath=".\src\SharedMemory.cpp"/>
 				<File
-					RelativePath=".\src\SharedMemory_DUMMY.cpp"
-					>
+					RelativePath=".\src\SharedMemory_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory_POSIX.cpp"
-					>
+					RelativePath=".\src\SharedMemory_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory_WIN32.cpp"
-					>
+					RelativePath=".\src\SharedMemory_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\NamedEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Pipe.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Pipe.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl_DUMMY.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl_DUMMY.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Process.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory_DUMMY.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory_DUMMY.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory_WIN32.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="UUID"
-			>
+			Name="UUID">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\UUID.cpp"
-					>
-				</File>
+					RelativePath=".\src\UUID.cpp"/>
 				<File
-					RelativePath=".\src\UUIDGenerator.cpp"
-					>
-				</File>
+					RelativePath=".\src\UUIDGenerator.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\UUID.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UUID.h"/>
 				<File
-					RelativePath=".\include\Poco\UUIDGenerator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UUIDGenerator.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="DateTime"
-			>
+			Name="DateTime">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Clock.cpp"
-					>
-				</File>
+					RelativePath=".\src\Clock.cpp"/>
 				<File
-					RelativePath=".\src\DateTime.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTime.cpp"/>
 				<File
-					RelativePath=".\src\DateTimeFormat.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTimeFormat.cpp"/>
 				<File
-					RelativePath=".\src\DateTimeFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTimeFormatter.cpp"/>
 				<File
-					RelativePath=".\src\DateTimeParser.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTimeParser.cpp"/>
 				<File
-					RelativePath=".\src\LocalDateTime.cpp"
-					>
-				</File>
+					RelativePath=".\src\LocalDateTime.cpp"/>
 				<File
-					RelativePath=".\src\Stopwatch.cpp"
-					>
-				</File>
+					RelativePath=".\src\Stopwatch.cpp"/>
 				<File
-					RelativePath=".\src\Timespan.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timespan.cpp"/>
 				<File
-					RelativePath=".\src\Timestamp.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timestamp.cpp"/>
 				<File
-					RelativePath=".\src\Timezone.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timezone.cpp"/>
 				<File
-					RelativePath=".\src\Timezone_UNIX.cpp"
-					>
+					RelativePath=".\src\Timezone_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Timezone_WIN32.cpp"
-					>
+					RelativePath=".\src\Timezone_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|Win32"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|Win32"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|Win32"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Clock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Clock.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTime.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTime.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTimeFormat.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeFormat.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTimeFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeFormatter.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTimeParser.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeParser.h"/>
 				<File
-					RelativePath=".\include\Poco\LocalDateTime.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LocalDateTime.h"/>
 				<File
-					RelativePath=".\include\Poco\Stopwatch.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Stopwatch.h"/>
 				<File
-					RelativePath=".\include\Poco\Timespan.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timespan.h"/>
 				<File
-					RelativePath=".\include\Poco\Timestamp.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timestamp.h"/>
 				<File
-					RelativePath=".\include\Poco\Timezone.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timezone.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Text"
-			>
+			Name="Text">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\ASCIIEncoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\ASCIIEncoding.cpp"/>
 				<File
-					RelativePath=".\src\Latin1Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Latin1Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Latin2Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Latin2Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Latin9Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Latin9Encoding.cpp"/>
 				<File
-					RelativePath=".\src\StreamConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamConverter.cpp"/>
 				<File
-					RelativePath=".\src\TextBufferIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextBufferIterator.cpp"/>
 				<File
-					RelativePath=".\src\TextConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextConverter.cpp"/>
 				<File
-					RelativePath=".\src\TextEncoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextEncoding.cpp"/>
 				<File
-					RelativePath=".\src\TextIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextIterator.cpp"/>
 				<File
-					RelativePath=".\src\Unicode.cpp"
-					>
-				</File>
+					RelativePath=".\src\Unicode.cpp"/>
 				<File
-					RelativePath=".\src\UnicodeConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\UnicodeConverter.cpp"/>
 				<File
-					RelativePath=".\src\UTF16Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF16Encoding.cpp"/>
 				<File
-					RelativePath=".\src\UTF32Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF32Encoding.cpp"/>
 				<File
-					RelativePath=".\src\UTF8Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF8Encoding.cpp"/>
 				<File
-					RelativePath=".\src\UTF8String.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF8String.cpp"/>
 				<File
-					RelativePath=".\src\Windows1250Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Windows1250Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Windows1251Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Windows1251Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Windows1252Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Windows1252Encoding.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ASCIIEncoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ASCIIEncoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Latin1Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin1Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Latin2Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin2Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Latin9Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin9Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\ListMap.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ListMap.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\TextBufferIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextBufferIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\TextConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\TextEncoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextEncoding.h"/>
 				<File
-					RelativePath=".\include\Poco\TextIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\Unicode.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Unicode.h"/>
 				<File
-					RelativePath=".\include\Poco\UnicodeConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnicodeConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF16Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF16Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF32Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF32Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF8Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF8Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF8String.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF8String.h"/>
 				<File
-					RelativePath=".\include\Poco\Windows1250Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1250Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Windows1251Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1251Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Windows1252Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1252Encoding.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="URI"
-			>
+			Name="URI">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\FileStreamFactory.cpp"
-					>
-				</File>
+					RelativePath=".\src\FileStreamFactory.cpp"/>
 				<File
-					RelativePath=".\src\URI.cpp"
-					>
-				</File>
+					RelativePath=".\src\URI.cpp"/>
 				<File
-					RelativePath=".\src\URIStreamFactory.cpp"
-					>
-				</File>
+					RelativePath=".\src\URIStreamFactory.cpp"/>
 				<File
-					RelativePath=".\src\URIStreamOpener.cpp"
-					>
-				</File>
+					RelativePath=".\src\URIStreamOpener.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\FileStreamFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStreamFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\URI.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URI.h"/>
 				<File
-					RelativePath=".\include\Poco\URIStreamFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URIStreamFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\URIStreamOpener.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URIStreamOpener.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Tasks"
-			>
+			Name="Tasks">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Task.cpp"
-					>
-				</File>
+					RelativePath=".\src\Task.cpp"/>
 				<File
-					RelativePath=".\src\TaskManager.cpp"
-					>
-				</File>
+					RelativePath=".\src\TaskManager.cpp"/>
 				<File
-					RelativePath=".\src\TaskNotification.cpp"
-					>
-				</File>
+					RelativePath=".\src\TaskNotification.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Task.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Task.h"/>
 				<File
-					RelativePath=".\include\Poco\TaskManager.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TaskManager.h"/>
 				<File
-					RelativePath=".\include\Poco\TaskNotification.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TaskNotification.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Events"
-			>
+			Name="Events">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\AbstractDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\AbstractEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\AbstractPriorityDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractPriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\BasicEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BasicEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\DefaultStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DefaultStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\Delegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Delegate.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIteratorStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIteratorStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\EventArgs.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\EventArgs.h"/>
 				<File
-					RelativePath=".\include\Poco\Expire.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Expire.h"/>
 				<File
-					RelativePath=".\include\Poco\FIFOEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\FIFOStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\FunctionDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FunctionDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\FunctionPriorityDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FunctionPriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityExpire.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityExpire.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\RecursiveDirectoryIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RecursiveDirectoryIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\RecursiveDirectoryIteratorImpl.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RecursiveDirectoryIteratorImpl.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\EventArgs.cpp"
-					>
-				</File>
+					RelativePath=".\src\EventArgs.cpp"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Cache"
-			>
+			Name="Cache">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\AbstractCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractCache.h"/>
 				<File
-					RelativePath=".\include\Poco\AbstractStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpirationDecorator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpirationDecorator.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpirationDecorator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpirationDecorator.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\KeyValueArgs.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\KeyValueArgs.h"/>
 				<File
-					RelativePath=".\include\Poco\LRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\LRUStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LRUStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\StrategyCollection.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StrategyCollection.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueAccessExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueAccessExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueAccessExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\ValidArgs.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ValidArgs.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
-			</Filter>
+				Name="Source Files"/>
 		</Filter>
 		<Filter
-			Name="Hashing"
-			>
+			Name="Hashing">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Hash.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Hash.h"/>
 				<File
-					RelativePath=".\include\Poco\HashFunction.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashFunction.h"/>
 				<File
-					RelativePath=".\include\Poco\HashMap.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashMap.h"/>
 				<File
-					RelativePath=".\include\Poco\HashSet.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashSet.h"/>
 				<File
-					RelativePath=".\include\Poco\HashStatistic.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashStatistic.h"/>
 				<File
-					RelativePath=".\include\Poco\HashTable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashTable.h"/>
 				<File
-					RelativePath=".\include\Poco\LinearHashTable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LinearHashTable.h"/>
 				<File
-					RelativePath=".\include\Poco\SimpleHashTable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SimpleHashTable.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Hash.cpp"
-					>
-				</File>
+					RelativePath=".\src\Hash.cpp"/>
 				<File
-					RelativePath=".\src\HashStatistic.cpp"
-					>
-				</File>
+					RelativePath=".\src\HashStatistic.cpp"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Dynamic"
-			>
+			Name="Dynamic">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Dynamic\Pair.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\Pair.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\Struct.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\Struct.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\Var.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\Var.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\VarHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\VarHolder.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\VarIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\VarIterator.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Var.cpp"
-					>
-				</File>
+					RelativePath=".\src\Var.cpp"/>
 				<File
-					RelativePath=".\src\VarHolder.cpp"
-					>
-				</File>
+					RelativePath=".\src\VarHolder.cpp"/>
 				<File
-					RelativePath=".\src\VarIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\VarIterator.cpp"/>
 			</Filter>
 		</Filter>
 		<File
-			RelativePath="..\DLLVersion.rc"
-			>
+			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="release_static_md|Win32"
-				ExcludedFromBuild="true"
-				>
+				Name="debug_shared|Win32"
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="debug_static_md|Win32"
-				ExcludedFromBuild="true"
-				>
+				Name="release_shared|Win32"
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_mt|Win32"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_mt|Win32"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="debug_static_md|Win32"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="release_static_md|Win32"
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 		</File>
 	</Files>
-	<Globals>
-	</Globals>
+	<Globals/>
 </VisualStudioProject>
diff --git a/Foundation/Foundation_x64_vs100.sln b/Foundation/Foundation_x64_vs100.sln
index b1241c69bb..844a202784 100644
--- a/Foundation/Foundation_x64_vs100.sln
+++ b/Foundation/Foundation_x64_vs100.sln
@@ -1,21 +1,20 @@
-
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs100.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs100.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs100.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs100.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs100.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs100.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs100.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
@@ -28,18 +27,42 @@ Global
 		release_static_mt|x64 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.Build.0 = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.Build.0 = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.ActiveCfg = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.Build.0 = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.ActiveCfg = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.Build.0 = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Build.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Deploy.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.ActiveCfg = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Build.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Deploy.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.ActiveCfg = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Build.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Deploy.0 = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Deploy.0 = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.Build.0 = debug_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
@@ -64,18 +87,6 @@ Global
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.Build.0 = release_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.ActiveCfg = release_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.Build.0 = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_x64_vs100.vcxproj b/Foundation/Foundation_x64_vs100.vcxproj
index 8939858b16..d47b598f69 100644
--- a/Foundation/Foundation_x64_vs100.vcxproj
+++ b/Foundation/Foundation_x64_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|x64">
@@ -28,24 +28,24 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Foundation</ProjectName>
-    <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
+    <ProjectGuid>{B01196CC-B693-4548-8464-2FF60499E73F}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -57,46 +57,43 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">..\bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\Foundation\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">..\bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\Foundation\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\Foundation\$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\Foundation\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\Foundation\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\Foundation\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoFoundation64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoFoundationmtd</TargetName>
@@ -108,7 +105,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -117,12 +114,12 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -130,9 +127,11 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>..\bin64\PocoFoundation64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\lib64\PocoFoundationd.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
@@ -143,125 +142,111 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoFoundation64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <ImportLibrary>..\lib64\PocoFoundation.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
+      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib64\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ProgramDataBaseFileName>..\lib64\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib64\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ProgramDataBaseFileName>..\lib64\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -269,34 +254,28 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\Ascii.cpp" />
-    <ClCompile Include="src\AtomicCounter.cpp" />
-    <ClCompile Include="src\Bugcheck.cpp" />
+    <ClCompile Include="src\Ascii.cpp"/>
+    <ClCompile Include="src\AtomicCounter.cpp"/>
+    <ClCompile Include="src\Bugcheck.cpp"/>
     <ClCompile Include="src\ByteOrder.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -305,10 +284,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Checksum.cpp" />
-    <ClCompile Include="src\Debugger.cpp" />
-    <ClCompile Include="src\DirectoryWatcher.cpp" />
-    <ClCompile Include="src\Environment.cpp" />
+    <ClCompile Include="src\Checksum.cpp"/>
+    <ClCompile Include="src\Debugger.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp"/>
+    <ClCompile Include="src\Environment.cpp"/>
     <ClCompile Include="src\Environment_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -341,11 +320,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Error.cpp" />
-    <ClCompile Include="src\Exception.cpp" />
-    <ClCompile Include="src\FIFOBufferStream.cpp" />
-    <ClCompile Include="src\Format.cpp" />
-    <ClCompile Include="src\FPEnvironment.cpp" />
+    <ClCompile Include="src\Error.cpp"/>
+    <ClCompile Include="src\Exception.cpp"/>
+    <ClCompile Include="src\Format.cpp"/>
+    <ClCompile Include="src\FPEnvironment.cpp"/>
     <ClCompile Include="src\FPEnvironment_C99.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -386,13 +364,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp" />
-    <ClCompile Include="src\MemoryPool.cpp" />
-    <ClCompile Include="src\NestedDiagnosticContext.cpp" />
-    <ClCompile Include="src\NumberFormatter.cpp" />
-    <ClCompile Include="src\NumberParser.cpp" />
-    <ClCompile Include="src\RefCountedObject.cpp" />
-    <ClCompile Include="src\SortedDirectoryIterator.cpp" />
+    <ClCompile Include="src\JSONString.cpp"/>
+    <ClCompile Include="src\MemoryPool.cpp"/>
+    <ClCompile Include="src\NestedDiagnosticContext.cpp"/>
+    <ClCompile Include="src\NumberFormatter.cpp"/>
+    <ClCompile Include="src\NumberParser.cpp"/>
+    <ClCompile Include="src\NumericString.cpp"/>
+    <ClCompile Include="src\RefCountedObject.cpp"/>
+    <ClCompile Include="src\SortedDirectoryIterator.cpp"/>
     <ClCompile Include="src\String.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -401,23 +380,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp" />
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
-    <ClCompile Include="src\StringTokenizer.cpp" />
-    <ClCompile Include="src\UTF32Encoding.cpp" />
-    <ClCompile Include="src\Var.cpp" />
-    <ClCompile Include="src\VarHolder.cpp" />
-    <ClCompile Include="src\VarIterator.cpp" />
-    <ClCompile Include="src\Void.cpp" />
-    <ClCompile Include="src\Base32Decoder.cpp" />
-    <ClCompile Include="src\Base32Encoder.cpp" />
-    <ClCompile Include="src\Base64Decoder.cpp" />
-    <ClCompile Include="src\Base64Encoder.cpp" />
-    <ClCompile Include="src\BinaryReader.cpp" />
-    <ClCompile Include="src\BinaryWriter.cpp" />
-    <ClCompile Include="src\CountingStream.cpp" />
-    <ClCompile Include="src\DeflatingStream.cpp" />
-    <ClCompile Include="src\FileStream.cpp" />
+    <ClCompile Include="src\StringTokenizer.cpp"/>
+    <ClCompile Include="src\Void.cpp"/>
+    <ClCompile Include="src\Base32Decoder.cpp"/>
+    <ClCompile Include="src\Base32Encoder.cpp"/>
+    <ClCompile Include="src\Base64Decoder.cpp"/>
+    <ClCompile Include="src\Base64Encoder.cpp"/>
+    <ClCompile Include="src\BinaryReader.cpp"/>
+    <ClCompile Include="src\BinaryWriter.cpp"/>
+    <ClCompile Include="src\CountingStream.cpp"/>
+    <ClCompile Include="src\DeflatingStream.cpp"/>
+    <ClCompile Include="src\FIFOBufferStream.cpp"/>
+    <ClCompile Include="src\FileStream.cpp"/>
     <ClCompile Include="src\FileStream_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -434,32 +408,30 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\HexBinaryDecoder.cpp" />
-    <ClCompile Include="src\HexBinaryEncoder.cpp" />
-    <ClCompile Include="src\InflatingStream.cpp" />
-    <ClCompile Include="src\LineEndingConverter.cpp" />
-    <ClCompile Include="src\MemoryStream.cpp" />
-    <ClCompile Include="src\NullStream.cpp" />
-    <ClCompile Include="src\StreamCopier.cpp" />
-    <ClCompile Include="src\StreamTokenizer.cpp" />
-    <ClCompile Include="src\TeeStream.cpp" />
-    <ClCompile Include="src\Token.cpp" />
-    <ClCompile Include="src\adler32.c" />
-    <ClCompile Include="src\compress.c" />
-    <ClCompile Include="src\crc32.c" />
-    <ClCompile Include="src\deflate.c" />
-    <ClCompile Include="src\infback.c" />
-    <ClCompile Include="src\inffast.c" />
-    <ClCompile Include="src\inflate.c" />
-    <ClCompile Include="src\inftrees.c" />
-    <ClCompile Include="src\trees.c" />
-    <ClCompile Include="src\Windows1250Encoding.cpp" />
-    <ClCompile Include="src\Windows1251Encoding.cpp" />
-    <ClCompile Include="src\zutil.c" />
-    <ClCompile Include="src\ActiveDispatcher.cpp" />
-    <ClCompile Include="src\Condition.cpp" />
-    <ClCompile Include="src\ErrorHandler.cpp" />
-    <ClCompile Include="src\Event.cpp" />
+    <ClCompile Include="src\HexBinaryDecoder.cpp"/>
+    <ClCompile Include="src\HexBinaryEncoder.cpp"/>
+    <ClCompile Include="src\InflatingStream.cpp"/>
+    <ClCompile Include="src\LineEndingConverter.cpp"/>
+    <ClCompile Include="src\MemoryStream.cpp"/>
+    <ClCompile Include="src\NullStream.cpp"/>
+    <ClCompile Include="src\StreamCopier.cpp"/>
+    <ClCompile Include="src\StreamTokenizer.cpp"/>
+    <ClCompile Include="src\TeeStream.cpp"/>
+    <ClCompile Include="src\Token.cpp"/>
+    <ClCompile Include="src\adler32.c"/>
+    <ClCompile Include="src\compress.c"/>
+    <ClCompile Include="src\crc32.c"/>
+    <ClCompile Include="src\deflate.c"/>
+    <ClCompile Include="src\infback.c"/>
+    <ClCompile Include="src\inffast.c"/>
+    <ClCompile Include="src\inflate.c"/>
+    <ClCompile Include="src\inftrees.c"/>
+    <ClCompile Include="src\trees.c"/>
+    <ClCompile Include="src\zutil.c"/>
+    <ClCompile Include="src\ActiveDispatcher.cpp"/>
+    <ClCompile Include="src\Condition.cpp"/>
+    <ClCompile Include="src\ErrorHandler.cpp"/>
+    <ClCompile Include="src\Event.cpp"/>
     <ClCompile Include="src\Event_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -476,7 +448,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Mutex.cpp" />
+    <ClCompile Include="src\Mutex.cpp"/>
     <ClCompile Include="src\Mutex_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -493,8 +465,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Runnable.cpp" />
-    <ClCompile Include="src\RWLock.cpp" />
+    <ClCompile Include="src\Runnable.cpp"/>
+    <ClCompile Include="src\RWLock.cpp"/>
     <ClCompile Include="src\RWLock_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -511,7 +483,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Semaphore.cpp" />
+    <ClCompile Include="src\Semaphore.cpp"/>
     <ClCompile Include="src\Semaphore_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -536,8 +508,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SynchronizedObject.cpp" />
-    <ClCompile Include="src\Thread.cpp" />
+    <ClCompile Include="src\SynchronizedObject.cpp"/>
+    <ClCompile Include="src\Thread.cpp"/>
     <ClCompile Include="src\Thread_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -554,19 +526,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ThreadLocal.cpp" />
-    <ClCompile Include="src\ThreadPool.cpp" />
-    <ClCompile Include="src\ThreadTarget.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
-    <ClCompile Include="src\DigestEngine.cpp" />
-    <ClCompile Include="src\DigestStream.cpp" />
-    <ClCompile Include="src\MD4Engine.cpp" />
-    <ClCompile Include="src\MD5Engine.cpp" />
-    <ClCompile Include="src\Random.cpp" />
-    <ClCompile Include="src\RandomStream.cpp" />
-    <ClCompile Include="src\SHA1Engine.cpp" />
-    <ClCompile Include="src\Manifest.cpp" />
-    <ClCompile Include="src\SharedLibrary.cpp" />
+    <ClCompile Include="src\ThreadLocal.cpp"/>
+    <ClCompile Include="src\ThreadPool.cpp"/>
+    <ClCompile Include="src\ThreadTarget.cpp"/>
+    <ClCompile Include="src\Timer.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\DigestStream.cpp"/>
+    <ClCompile Include="src\MD4Engine.cpp"/>
+    <ClCompile Include="src\MD5Engine.cpp"/>
+    <ClCompile Include="src\Random.cpp"/>
+    <ClCompile Include="src\RandomStream.cpp"/>
+    <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\Manifest.cpp"/>
+    <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -607,38 +579,38 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\RegularExpression.cpp" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
-    <ClCompile Include="src\ArchiveStrategy.cpp" />
-    <ClCompile Include="src\AsyncChannel.cpp" />
-    <ClCompile Include="src\Channel.cpp" />
-    <ClCompile Include="src\Configurable.cpp" />
-    <ClCompile Include="src\ConsoleChannel.cpp" />
-    <ClCompile Include="src\EventLogChannel.cpp" />
-    <ClCompile Include="src\FileChannel.cpp" />
-    <ClCompile Include="src\Formatter.cpp" />
-    <ClCompile Include="src\FormattingChannel.cpp" />
-    <ClCompile Include="src\LogFile.cpp" />
+    <ClCompile Include="src\RegularExpression.cpp"/>
+    <ClCompile Include="src\pcre_byte_order.c"/>
+    <ClCompile Include="src\pcre_chartables.c"/>
+    <ClCompile Include="src\pcre_compile.c"/>
+    <ClCompile Include="src\pcre_config.c"/>
+    <ClCompile Include="src\pcre_dfa_exec.c"/>
+    <ClCompile Include="src\pcre_exec.c"/>
+    <ClCompile Include="src\pcre_fullinfo.c"/>
+    <ClCompile Include="src\pcre_get.c"/>
+    <ClCompile Include="src\pcre_globals.c"/>
+    <ClCompile Include="src\pcre_jit_compile.c"/>
+    <ClCompile Include="src\pcre_maketables.c"/>
+    <ClCompile Include="src\pcre_newline.c"/>
+    <ClCompile Include="src\pcre_ord2utf8.c"/>
+    <ClCompile Include="src\pcre_refcount.c"/>
+    <ClCompile Include="src\pcre_string_utils.c"/>
+    <ClCompile Include="src\pcre_study.c"/>
+    <ClCompile Include="src\pcre_tables.c"/>
+    <ClCompile Include="src\pcre_ucd.c"/>
+    <ClCompile Include="src\pcre_valid_utf8.c"/>
+    <ClCompile Include="src\pcre_version.c"/>
+    <ClCompile Include="src\pcre_xclass.c"/>
+    <ClCompile Include="src\ArchiveStrategy.cpp"/>
+    <ClCompile Include="src\AsyncChannel.cpp"/>
+    <ClCompile Include="src\Channel.cpp"/>
+    <ClCompile Include="src\Configurable.cpp"/>
+    <ClCompile Include="src\ConsoleChannel.cpp"/>
+    <ClCompile Include="src\EventLogChannel.cpp"/>
+    <ClCompile Include="src\FileChannel.cpp"/>
+    <ClCompile Include="src\Formatter.cpp"/>
+    <ClCompile Include="src\FormattingChannel.cpp"/>
+    <ClCompile Include="src\LogFile.cpp"/>
     <ClCompile Include="src\LogFile_STD.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -671,12 +643,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Logger.cpp" />
-    <ClCompile Include="src\LoggingFactory.cpp" />
-    <ClCompile Include="src\LoggingRegistry.cpp" />
-    <ClCompile Include="src\LogStream.cpp" />
-    <ClCompile Include="src\Message.cpp" />
-    <ClCompile Include="src\NullChannel.cpp" />
+    <ClCompile Include="src\Logger.cpp"/>
+    <ClCompile Include="src\LoggingFactory.cpp"/>
+    <ClCompile Include="src\LoggingRegistry.cpp"/>
+    <ClCompile Include="src\LogStream.cpp"/>
+    <ClCompile Include="src\Message.cpp"/>
+    <ClCompile Include="src\NullChannel.cpp"/>
     <ClCompile Include="src\OpcomChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -685,12 +657,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\PurgeStrategy.cpp" />
-    <ClCompile Include="src\RotateStrategy.cpp" />
-    <ClCompile Include="src\SimpleFileChannel.cpp" />
-    <ClCompile Include="src\SplitterChannel.cpp" />
-    <ClCompile Include="src\StreamChannel.cpp" />
+    <ClCompile Include="src\PatternFormatter.cpp"/>
+    <ClCompile Include="src\PurgeStrategy.cpp"/>
+    <ClCompile Include="src\RotateStrategy.cpp"/>
+    <ClCompile Include="src\SimpleFileChannel.cpp"/>
+    <ClCompile Include="src\SplitterChannel.cpp"/>
+    <ClCompile Include="src\StreamChannel.cpp"/>
     <ClCompile Include="src\SyslogChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -699,14 +671,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\WindowsConsoleChannel.cpp" />
-    <ClCompile Include="src\AbstractObserver.cpp" />
-    <ClCompile Include="src\Notification.cpp" />
-    <ClCompile Include="src\NotificationCenter.cpp" />
-    <ClCompile Include="src\NotificationQueue.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueue.cpp" />
-    <ClCompile Include="src\TimedNotificationQueue.cpp" />
-    <ClCompile Include="src\DirectoryIterator.cpp" />
+    <ClCompile Include="src\WindowsConsoleChannel.cpp"/>
+    <ClCompile Include="src\AbstractObserver.cpp"/>
+    <ClCompile Include="src\Notification.cpp"/>
+    <ClCompile Include="src\NotificationCenter.cpp"/>
+    <ClCompile Include="src\NotificationQueue.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueue.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueue.cpp"/>
+    <ClCompile Include="src\DirectoryIterator.cpp"/>
     <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -739,7 +711,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\File.cpp" />
+    <ClCompile Include="src\DirectoryWatcher.cpp"/>
+    <ClCompile Include="src\File.cpp"/>
     <ClCompile Include="src\File_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -772,8 +745,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Glob.cpp" />
-    <ClCompile Include="src\Path.cpp" />
+    <ClCompile Include="src\Glob.cpp"/>
+    <ClCompile Include="src\Path.cpp"/>
     <ClCompile Include="src\Path_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -806,8 +779,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\TemporaryFile.cpp" />
-    <ClCompile Include="src\NamedEvent.cpp" />
+    <ClCompile Include="src\TemporaryFile.cpp"/>
+    <ClCompile Include="src\NamedEvent.cpp"/>
     <ClCompile Include="src\NamedEvent_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -840,7 +813,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NamedMutex.cpp" />
+    <ClCompile Include="src\NamedMutex.cpp"/>
     <ClCompile Include="src\NamedMutex_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -873,8 +846,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Pipe.cpp" />
-    <ClCompile Include="src\PipeImpl.cpp" />
+    <ClCompile Include="src\Pipe.cpp"/>
+    <ClCompile Include="src\PipeImpl.cpp"/>
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -899,8 +872,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PipeStream.cpp" />
-    <ClCompile Include="src\Process.cpp" />
+    <ClCompile Include="src\PipeStream.cpp"/>
+    <ClCompile Include="src\Process.cpp"/>
     <ClCompile Include="src\Process_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -933,7 +906,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SharedMemory.cpp" />
+    <ClCompile Include="src\SharedMemory.cpp"/>
     <ClCompile Include="src\SharedMemory_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -958,18 +931,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\UUID.cpp" />
-    <ClCompile Include="src\UUIDGenerator.cpp" />
-    <ClCompile Include="src\Clock.cpp" />
-    <ClCompile Include="src\DateTime.cpp" />
-    <ClCompile Include="src\DateTimeFormat.cpp" />
-    <ClCompile Include="src\DateTimeFormatter.cpp" />
-    <ClCompile Include="src\DateTimeParser.cpp" />
-    <ClCompile Include="src\LocalDateTime.cpp" />
-    <ClCompile Include="src\Stopwatch.cpp" />
-    <ClCompile Include="src\Timespan.cpp" />
-    <ClCompile Include="src\Timestamp.cpp" />
-    <ClCompile Include="src\Timezone.cpp" />
+    <ClCompile Include="src\UUID.cpp"/>
+    <ClCompile Include="src\UUIDGenerator.cpp"/>
+    <ClCompile Include="src\Clock.cpp"/>
+    <ClCompile Include="src\DateTime.cpp"/>
+    <ClCompile Include="src\DateTimeFormat.cpp"/>
+    <ClCompile Include="src\DateTimeFormatter.cpp"/>
+    <ClCompile Include="src\DateTimeParser.cpp"/>
+    <ClCompile Include="src\LocalDateTime.cpp"/>
+    <ClCompile Include="src\Stopwatch.cpp"/>
+    <ClCompile Include="src\Timespan.cpp"/>
+    <ClCompile Include="src\Timestamp.cpp"/>
+    <ClCompile Include="src\Timezone.cpp"/>
     <ClCompile Include="src\Timezone_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -986,390 +959,399 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ASCIIEncoding.cpp" />
-    <ClCompile Include="src\Latin1Encoding.cpp" />
-    <ClCompile Include="src\Latin9Encoding.cpp" />
-    <ClCompile Include="src\StreamConverter.cpp" />
-    <ClCompile Include="src\TextBufferIterator.cpp" />
-    <ClCompile Include="src\TextConverter.cpp" />
-    <ClCompile Include="src\TextEncoding.cpp" />
-    <ClCompile Include="src\TextIterator.cpp" />
-    <ClCompile Include="src\Unicode.cpp" />
-    <ClCompile Include="src\UnicodeConverter.cpp" />
-    <ClCompile Include="src\UTF16Encoding.cpp" />
-    <ClCompile Include="src\UTF8Encoding.cpp" />
-    <ClCompile Include="src\UTF8String.cpp" />
-    <ClCompile Include="src\Windows1252Encoding.cpp" />
-    <ClCompile Include="src\FileStreamFactory.cpp" />
-    <ClCompile Include="src\URI.cpp" />
-    <ClCompile Include="src\URIStreamFactory.cpp" />
-    <ClCompile Include="src\URIStreamOpener.cpp" />
-    <ClCompile Include="src\Task.cpp" />
-    <ClCompile Include="src\TaskManager.cpp" />
-    <ClCompile Include="src\TaskNotification.cpp" />
-    <ClCompile Include="src\EventArgs.cpp" />
-    <ClCompile Include="src\Hash.cpp" />
-    <ClCompile Include="src\HashStatistic.cpp" />
+    <ClCompile Include="src\ASCIIEncoding.cpp"/>
+    <ClCompile Include="src\Latin1Encoding.cpp"/>
+    <ClCompile Include="src\Latin2Encoding.cpp"/>
+    <ClCompile Include="src\Latin9Encoding.cpp"/>
+    <ClCompile Include="src\StreamConverter.cpp"/>
+    <ClCompile Include="src\TextBufferIterator.cpp"/>
+    <ClCompile Include="src\TextConverter.cpp"/>
+    <ClCompile Include="src\TextEncoding.cpp"/>
+    <ClCompile Include="src\TextIterator.cpp"/>
+    <ClCompile Include="src\Unicode.cpp"/>
+    <ClCompile Include="src\UnicodeConverter.cpp"/>
+    <ClCompile Include="src\UTF16Encoding.cpp"/>
+    <ClCompile Include="src\UTF32Encoding.cpp"/>
+    <ClCompile Include="src\UTF8Encoding.cpp"/>
+    <ClCompile Include="src\UTF8String.cpp"/>
+    <ClCompile Include="src\Windows1250Encoding.cpp"/>
+    <ClCompile Include="src\Windows1251Encoding.cpp"/>
+    <ClCompile Include="src\Windows1252Encoding.cpp"/>
+    <ClCompile Include="src\FileStreamFactory.cpp"/>
+    <ClCompile Include="src\URI.cpp"/>
+    <ClCompile Include="src\URIStreamFactory.cpp"/>
+    <ClCompile Include="src\URIStreamOpener.cpp"/>
+    <ClCompile Include="src\Task.cpp"/>
+    <ClCompile Include="src\TaskManager.cpp"/>
+    <ClCompile Include="src\TaskNotification.cpp"/>
+    <ClCompile Include="src\EventArgs.cpp"/>
+    <ClCompile Include="src\Hash.cpp"/>
+    <ClCompile Include="src\HashStatistic.cpp"/>
+    <ClCompile Include="src\Var.cpp"/>
+    <ClCompile Include="src\VarHolder.cpp"/>
+    <ClCompile Include="src\VarIterator.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Any.h" />
-    <ClInclude Include="include\Poco\Ascii.h" />
-    <ClInclude Include="include\Poco\AtomicCounter.h" />
-    <ClInclude Include="include\Poco\AutoPtr.h" />
-    <ClInclude Include="include\Poco\AutoReleasePool.h" />
-    <ClInclude Include="include\Poco\Buffer.h" />
-    <ClInclude Include="include\Poco\Bugcheck.h" />
-    <ClInclude Include="include\Poco\ByteOrder.h" />
-    <ClInclude Include="include\Poco\Checksum.h" />
-    <ClInclude Include="include\Poco\Config.h" />
-    <ClInclude Include="include\Poco\Debugger.h" />
-    <ClInclude Include="include\Poco\DirectoryWatcher.h" />
-    <ClInclude Include="include\Poco\DynamicAny.h" />
-    <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
-    <ClInclude Include="include\Poco\DynamicFactory.h" />
-    <ClInclude Include="include\Poco\Dynamic\Pair.h" />
-    <ClInclude Include="include\Poco\Dynamic\Struct.h" />
-    <ClInclude Include="include\Poco\Dynamic\Var.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
-    <ClInclude Include="include\Poco\Environment.h" />
-    <ClInclude Include="include\Poco\Environment_UNIX.h" />
-    <ClInclude Include="include\Poco\Environment_VMS.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-    <ClInclude Include="include\Poco\Error.h" />
-    <ClInclude Include="include\Poco\Exception.h" />
-    <ClInclude Include="include\Poco\FIFOBufferStream.h" />
-    <ClInclude Include="include\Poco\Format.h" />
-    <ClInclude Include="include\Poco\Foundation.h" />
-    <ClInclude Include="include\Poco\FPEnvironment.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_C99.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DEC.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
-    <ClInclude Include="include\Poco\Instantiator.h" />
-    <ClInclude Include="include\Poco\Latin2Encoding.h" />
-    <ClInclude Include="include\Poco\ListMap.h" />
-    <ClInclude Include="include\Poco\MemoryPool.h" />
-    <ClInclude Include="include\Poco\MetaProgramming.h" />
-    <ClInclude Include="include\Poco\NamedTuple.h" />
-    <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
-    <ClInclude Include="include\Poco\Nullable.h" />
-    <ClInclude Include="include\Poco\NumberFormatter.h" />
-    <ClInclude Include="include\Poco\NumberParser.h" />
-    <ClInclude Include="include\Poco\NumericString.h" />
-    <ClInclude Include="include\Poco\ObjectPool.h" />
-    <ClInclude Include="include\Poco\Optional.h" />
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
-    <ClInclude Include="include\Poco\Platform.h" />
-    <ClInclude Include="include\Poco\Platform_POSIX.h" />
-    <ClInclude Include="include\Poco\Platform_VMS.h" />
-    <ClInclude Include="include\Poco\Platform_WIN32.h" />
-    <ClInclude Include="include\Poco\Poco.h" />
-    <ClInclude Include="include\Poco\PriorityStrategy.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
-    <ClInclude Include="include\Poco\RefCountedObject.h" />
-    <ClInclude Include="include\Poco\SharedPtr.h" />
-    <ClInclude Include="include\Poco\SingletonHolder.h" />
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\String.h" />
-    <ClInclude Include="include\Poco\StringTokenizer.h" />
-    <ClInclude Include="include\Poco\Tuple.h" />
-    <ClInclude Include="include\Poco\TypeList.h" />
-    <ClInclude Include="include\Poco\Types.h" />
-    <ClInclude Include="include\Poco\UnWindows.h" />
-    <ClInclude Include="include\Poco\UTF32Encoding.h" />
-    <ClInclude Include="include\Poco\Version.h" />
-    <ClInclude Include="include\Poco\Void.h" />
-    <ClInclude Include="include\Poco\Base32Decoder.h" />
-    <ClInclude Include="include\Poco\Base32Encoder.h" />
-    <ClInclude Include="include\Poco\Base64Decoder.h" />
-    <ClInclude Include="include\Poco\Base64Encoder.h" />
-    <ClInclude Include="include\Poco\BinaryReader.h" />
-    <ClInclude Include="include\Poco\BinaryWriter.h" />
-    <ClInclude Include="include\Poco\BufferAllocator.h" />
-    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h" />
-    <ClInclude Include="include\Poco\BufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\CountingStream.h" />
-    <ClInclude Include="include\Poco\DeflatingStream.h" />
-    <ClInclude Include="include\Poco\FileStream.h" />
-    <ClInclude Include="include\Poco\FileStream_POSIX.h" />
-    <ClInclude Include="include\Poco\FileStream_WIN32.h" />
-    <ClInclude Include="include\Poco\HexBinaryDecoder.h" />
-    <ClInclude Include="include\Poco\HexBinaryEncoder.h" />
-    <ClInclude Include="include\Poco\InflatingStream.h" />
-    <ClInclude Include="include\Poco\LineEndingConverter.h" />
-    <ClInclude Include="include\Poco\MemoryStream.h" />
-    <ClInclude Include="include\Poco\NullStream.h" />
-    <ClInclude Include="include\Poco\StreamCopier.h" />
-    <ClInclude Include="include\Poco\StreamTokenizer.h" />
-    <ClInclude Include="include\Poco\StreamUtil.h" />
-    <ClInclude Include="include\Poco\TeeStream.h" />
-    <ClInclude Include="include\Poco\Token.h" />
-    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\Windows1250Encoding.h" />
-    <ClInclude Include="include\Poco\Windows1251Encoding.h" />
-    <ClInclude Include="src\crc32.h" />
-    <ClInclude Include="src\deflate.h" />
-    <ClInclude Include="src\inffast.h" />
-    <ClInclude Include="src\inffixed.h" />
-    <ClInclude Include="src\inflate.h" />
-    <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\zconf.h" />
-    <ClInclude Include="src\zlib.h" />
-    <ClInclude Include="src\zutil.h" />
-    <ClInclude Include="include\Poco\ActiveDispatcher.h" />
-    <ClInclude Include="include\Poco\ActiveMethod.h" />
-    <ClInclude Include="include\Poco\ActiveResult.h" />
-    <ClInclude Include="include\Poco\ActiveRunnable.h" />
-    <ClInclude Include="include\Poco\ActiveStarter.h" />
-    <ClInclude Include="include\Poco\Activity.h" />
-    <ClInclude Include="include\Poco\Condition.h" />
-    <ClInclude Include="include\Poco\ErrorHandler.h" />
-    <ClInclude Include="include\Poco\Event.h" />
-    <ClInclude Include="include\Poco\Event_POSIX.h" />
-    <ClInclude Include="include\Poco\Event_WIN32.h" />
-    <ClInclude Include="include\Poco\Mutex.h" />
-    <ClInclude Include="include\Poco\Mutex_POSIX.h" />
-    <ClInclude Include="include\Poco\Mutex_WIN32.h" />
-    <ClInclude Include="include\Poco\Runnable.h" />
-    <ClInclude Include="include\Poco\RunnableAdapter.h" />
-    <ClInclude Include="include\Poco\RWLock.h" />
-    <ClInclude Include="include\Poco\RWLock_POSIX.h" />
-    <ClInclude Include="include\Poco\RWLock_WIN32.h" />
-    <ClInclude Include="include\Poco\ScopedLock.h" />
-    <ClInclude Include="include\Poco\ScopedUnlock.h" />
-    <ClInclude Include="include\Poco\Semaphore.h" />
-    <ClInclude Include="include\Poco\Semaphore_POSIX.h" />
-    <ClInclude Include="include\Poco\Semaphore_WIN32.h" />
-    <ClInclude Include="include\Poco\SignalHandler.h" />
-    <ClInclude Include="include\Poco\SynchronizedObject.h" />
-    <ClInclude Include="include\Poco\Thread.h" />
-    <ClInclude Include="include\Poco\Thread_POSIX.h" />
-    <ClInclude Include="include\Poco\Thread_WIN32.h" />
-    <ClInclude Include="include\Poco\ThreadLocal.h" />
-    <ClInclude Include="include\Poco\ThreadPool.h" />
-    <ClInclude Include="include\Poco\ThreadTarget.h" />
-    <ClInclude Include="include\Poco\Timer.h" />
-    <ClInclude Include="include\Poco\DigestEngine.h" />
-    <ClInclude Include="include\Poco\DigestStream.h" />
-    <ClInclude Include="include\Poco\HMACEngine.h" />
-    <ClInclude Include="include\Poco\MD4Engine.h" />
-    <ClInclude Include="include\Poco\MD5Engine.h" />
-    <ClInclude Include="include\Poco\Random.h" />
-    <ClInclude Include="include\Poco\RandomStream.h" />
-    <ClInclude Include="include\Poco\SHA1Engine.h" />
-    <ClInclude Include="include\Poco\ClassLibrary.h" />
-    <ClInclude Include="include\Poco\ClassLoader.h" />
-    <ClInclude Include="include\Poco\Manifest.h" />
-    <ClInclude Include="include\Poco\MetaObject.h" />
-    <ClInclude Include="include\Poco\SharedLibrary.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_VMS.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
-    <ClInclude Include="src\ucp.h" />
-    <ClInclude Include="include\Poco\RegularExpression.h" />
-    <ClInclude Include="include\Poco\ArchiveStrategy.h" />
-    <ClInclude Include="include\Poco\AsyncChannel.h" />
-    <ClInclude Include="include\Poco\Channel.h" />
-    <ClInclude Include="include\Poco\Configurable.h" />
-    <ClInclude Include="include\Poco\ConsoleChannel.h" />
-    <ClInclude Include="include\Poco\EventLogChannel.h" />
-    <ClInclude Include="include\Poco\FileChannel.h" />
-    <ClInclude Include="include\Poco\Formatter.h" />
-    <ClInclude Include="include\Poco\FormattingChannel.h" />
-    <ClInclude Include="include\Poco\LogFile.h" />
-    <ClInclude Include="include\Poco\LogFile_STD.h" />
-    <ClInclude Include="include\Poco\LogFile_VMS.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
-    <ClInclude Include="include\Poco\Logger.h" />
-    <ClInclude Include="include\Poco\LoggingFactory.h" />
-    <ClInclude Include="include\Poco\LoggingRegistry.h" />
-    <ClInclude Include="include\Poco\LogStream.h" />
-    <ClInclude Include="include\Poco\Message.h" />
-    <ClInclude Include="include\Poco\NullChannel.h" />
-    <ClInclude Include="include\Poco\OpcomChannel.h" />
-    <ClInclude Include="include\Poco\PatternFormatter.h" />
-    <ClInclude Include="src\pocomsg.h" />
-    <ClInclude Include="include\Poco\PurgeStrategy.h" />
-    <ClInclude Include="include\Poco\RotateStrategy.h" />
-    <ClInclude Include="include\Poco\SimpleFileChannel.h" />
-    <ClInclude Include="include\Poco\SplitterChannel.h" />
-    <ClInclude Include="include\Poco\StreamChannel.h" />
-    <ClInclude Include="include\Poco\SyslogChannel.h" />
-    <ClInclude Include="include\Poco\WindowsConsoleChannel.h" />
-    <ClInclude Include="include\Poco\AbstractObserver.h" />
-    <ClInclude Include="include\Poco\NObserver.h" />
-    <ClInclude Include="include\Poco\Notification.h" />
-    <ClInclude Include="include\Poco\NotificationCenter.h" />
-    <ClInclude Include="include\Poco\NotificationQueue.h" />
-    <ClInclude Include="include\Poco\Observer.h" />
-    <ClInclude Include="include\Poco\PriorityNotificationQueue.h" />
-    <ClInclude Include="include\Poco\TimedNotificationQueue.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
-    <ClInclude Include="include\Poco\File.h" />
-    <ClInclude Include="include\Poco\File_UNIX.h" />
-    <ClInclude Include="include\Poco\File_VMS.h" />
-    <ClInclude Include="include\Poco\File_WIN32.h" />
-    <ClInclude Include="include\Poco\File_WIN32U.h" />
-    <ClInclude Include="include\Poco\Glob.h" />
-    <ClInclude Include="include\Poco\Path.h" />
-    <ClInclude Include="include\Poco\Path_UNIX.h" />
-    <ClInclude Include="include\Poco\Path_VMS.h" />
-    <ClInclude Include="include\Poco\Path_WIN32.h" />
-    <ClInclude Include="include\Poco\Path_WIN32U.h" />
-    <ClInclude Include="include\Poco\TemporaryFile.h" />
-    <ClInclude Include="include\Poco\NamedEvent.h" />
-    <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedEvent_VMS.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
-    <ClInclude Include="include\Poco\NamedMutex.h" />
-    <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedMutex_VMS.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
-    <ClInclude Include="include\Poco\Pipe.h" />
-    <ClInclude Include="include\Poco\PipeImpl.h" />
-    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h" />
-    <ClInclude Include="include\Poco\PipeImpl_POSIX.h" />
-    <ClInclude Include="include\Poco\PipeImpl_WIN32.h" />
-    <ClInclude Include="include\Poco\PipeStream.h" />
-    <ClInclude Include="include\Poco\Process.h" />
-    <ClInclude Include="include\Poco\Process_UNIX.h" />
-    <ClInclude Include="include\Poco\Process_VMS.h" />
-    <ClInclude Include="include\Poco\Process_WIN32.h" />
-    <ClInclude Include="include\Poco\Process_WIN32U.h" />
-    <ClInclude Include="include\Poco\SharedMemory.h" />
-    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />
-    <ClInclude Include="include\Poco\SharedMemory_POSIX.h" />
-    <ClInclude Include="include\Poco\SharedMemory_WIN32.h" />
-    <ClInclude Include="include\Poco\UUID.h" />
-    <ClInclude Include="include\Poco\UUIDGenerator.h" />
-    <ClInclude Include="include\Poco\Clock.h" />
-    <ClInclude Include="include\Poco\DateTime.h" />
-    <ClInclude Include="include\Poco\DateTimeFormat.h" />
-    <ClInclude Include="include\Poco\DateTimeFormatter.h" />
-    <ClInclude Include="include\Poco\DateTimeParser.h" />
-    <ClInclude Include="include\Poco\LocalDateTime.h" />
-    <ClInclude Include="include\Poco\Stopwatch.h" />
-    <ClInclude Include="include\Poco\Timespan.h" />
-    <ClInclude Include="include\Poco\Timestamp.h" />
-    <ClInclude Include="include\Poco\Timezone.h" />
-    <ClInclude Include="include\Poco\ASCIIEncoding.h" />
-    <ClInclude Include="include\Poco\Latin1Encoding.h" />
-    <ClInclude Include="include\Poco\Latin9Encoding.h" />
-    <ClInclude Include="include\Poco\StreamConverter.h" />
-    <ClInclude Include="include\Poco\TextBufferIterator.h" />
-    <ClInclude Include="include\Poco\TextConverter.h" />
-    <ClInclude Include="include\Poco\TextEncoding.h" />
-    <ClInclude Include="include\Poco\TextIterator.h" />
-    <ClInclude Include="include\Poco\Unicode.h" />
-    <ClInclude Include="include\Poco\UnicodeConverter.h" />
-    <ClInclude Include="include\Poco\UTF16Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8String.h" />
-    <ClInclude Include="include\Poco\Windows1252Encoding.h" />
-    <ClInclude Include="include\Poco\FileStreamFactory.h" />
-    <ClInclude Include="include\Poco\URI.h" />
-    <ClInclude Include="include\Poco\URIStreamFactory.h" />
-    <ClInclude Include="include\Poco\URIStreamOpener.h" />
-    <ClInclude Include="include\Poco\Task.h" />
-    <ClInclude Include="include\Poco\TaskManager.h" />
-    <ClInclude Include="include\Poco\TaskNotification.h" />
-    <ClInclude Include="include\Poco\AbstractDelegate.h" />
-    <ClInclude Include="include\Poco\AbstractEvent.h" />
-    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\BasicEvent.h" />
-    <ClInclude Include="include\Poco\DefaultStrategy.h" />
-    <ClInclude Include="include\Poco\Delegate.h" />
-    <ClInclude Include="include\Poco\EventArgs.h" />
-    <ClInclude Include="include\Poco\Expire.h" />
-    <ClInclude Include="include\Poco\FIFOEvent.h" />
-    <ClInclude Include="include\Poco\FIFOStrategy.h" />
-    <ClInclude Include="include\Poco\FunctionDelegate.h" />
-    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\NotificationStrategy.h" />
-    <ClInclude Include="include\Poco\PriorityDelegate.h" />
-    <ClInclude Include="include\Poco\PriorityEvent.h" />
-    <ClInclude Include="include\Poco\PriorityExpire.h" />
-    <ClInclude Include="include\Poco\AbstractCache.h" />
-    <ClInclude Include="include\Poco\AbstractStrategy.h" />
-    <ClInclude Include="include\Poco\AccessExpireCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\ExpireCache.h" />
-    <ClInclude Include="include\Poco\ExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\ExpireStrategy.h" />
-    <ClInclude Include="include\Poco\KeyValueArgs.h" />
-    <ClInclude Include="include\Poco\LRUCache.h" />
-    <ClInclude Include="include\Poco\LRUStrategy.h" />
-    <ClInclude Include="include\Poco\StrategyCollection.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\UniqueExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ValidArgs.h" />
-    <ClInclude Include="include\Poco\Hash.h" />
-    <ClInclude Include="include\Poco\HashFunction.h" />
-    <ClInclude Include="include\Poco\HashMap.h" />
-    <ClInclude Include="include\Poco\HashSet.h" />
-    <ClInclude Include="include\Poco\HashStatistic.h" />
-    <ClInclude Include="include\Poco\HashTable.h" />
-    <ClInclude Include="include\Poco\LinearHashTable.h" />
-    <ClInclude Include="include\Poco\SimpleHashTable.h" />
+    <ClInclude Include="include\Poco\Any.h"/>
+    <ClInclude Include="include\Poco\Ascii.h"/>
+    <ClInclude Include="include\Poco\AtomicCounter.h"/>
+    <ClInclude Include="include\Poco\AutoPtr.h"/>
+    <ClInclude Include="include\Poco\AutoReleasePool.h"/>
+    <ClInclude Include="include\Poco\Buffer.h"/>
+    <ClInclude Include="include\Poco\Bugcheck.h"/>
+    <ClInclude Include="include\Poco\ByteOrder.h"/>
+    <ClInclude Include="include\Poco\Checksum.h"/>
+    <ClInclude Include="include\Poco\Config.h"/>
+    <ClInclude Include="include\Poco\Debugger.h"/>
+    <ClInclude Include="include\Poco\DynamicAny.h"/>
+    <ClInclude Include="include\Poco\DynamicAnyHolder.h"/>
+    <ClInclude Include="include\Poco\DynamicFactory.h"/>
+    <ClInclude Include="include\Poco\Environment.h"/>
+    <ClInclude Include="include\Poco\Environment_UNIX.h"/>
+    <ClInclude Include="include\Poco\Environment_VMS.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Error.h"/>
+    <ClInclude Include="include\Poco\Exception.h"/>
+    <ClInclude Include="include\Poco\FIFOBuffer.h"/>
+    <ClInclude Include="include\Poco\Format.h"/>
+    <ClInclude Include="include\Poco\Foundation.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_C99.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DEC.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_SUN.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Instantiator.h"/>
+    <ClInclude Include="include\Poco\JSONString.h"/>
+    <ClInclude Include="include\Poco\MemoryPool.h"/>
+    <ClInclude Include="include\Poco\MetaProgramming.h"/>
+    <ClInclude Include="include\Poco\NamedTuple.h"/>
+    <ClInclude Include="include\Poco\NestedDiagnosticContext.h"/>
+    <ClInclude Include="include\Poco\Nullable.h"/>
+    <ClInclude Include="include\Poco\NumberFormatter.h"/>
+    <ClInclude Include="include\Poco\NumberParser.h"/>
+    <ClInclude Include="include\Poco\NumericString.h"/>
+    <ClInclude Include="include\Poco\ObjectPool.h"/>
+    <ClInclude Include="include\Poco\Optional.h"/>
+    <ClInclude Include="include\Poco\Platform.h"/>
+    <ClInclude Include="include\Poco\Platform_POSIX.h"/>
+    <ClInclude Include="include\Poco\Platform_VMS.h"/>
+    <ClInclude Include="include\Poco\Platform_WIN32.h"/>
+    <ClInclude Include="include\Poco\Poco.h"/>
+    <ClInclude Include="include\Poco\RefCountedObject.h"/>
+    <ClInclude Include="include\Poco\SharedPtr.h"/>
+    <ClInclude Include="include\Poco\SingletonHolder.h"/>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\String.h"/>
+    <ClInclude Include="include\Poco\StringTokenizer.h"/>
+    <ClInclude Include="include\Poco\Tuple.h"/>
+    <ClInclude Include="include\Poco\TypeList.h"/>
+    <ClInclude Include="include\Poco\Types.h"/>
+    <ClInclude Include="include\Poco\UnWindows.h"/>
+    <ClInclude Include="include\Poco\Version.h"/>
+    <ClInclude Include="include\Poco\Void.h"/>
+    <ClInclude Include="include\Poco\Base32Decoder.h"/>
+    <ClInclude Include="include\Poco\Base32Encoder.h"/>
+    <ClInclude Include="include\Poco\Base64Decoder.h"/>
+    <ClInclude Include="include\Poco\Base64Encoder.h"/>
+    <ClInclude Include="include\Poco\BinaryReader.h"/>
+    <ClInclude Include="include\Poco\BinaryWriter.h"/>
+    <ClInclude Include="include\Poco\BufferAllocator.h"/>
+    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h"/>
+    <ClInclude Include="include\Poco\BufferedStreamBuf.h"/>
+    <ClInclude Include="include\Poco\CountingStream.h"/>
+    <ClInclude Include="include\Poco\DeflatingStream.h"/>
+    <ClInclude Include="include\Poco\FileStream.h"/>
+    <ClInclude Include="include\Poco\FileStream_POSIX.h"/>
+    <ClInclude Include="include\Poco\FileStream_WIN32.h"/>
+    <ClInclude Include="include\Poco\HexBinaryDecoder.h"/>
+    <ClInclude Include="include\Poco\HexBinaryEncoder.h"/>
+    <ClInclude Include="include\Poco\InflatingStream.h"/>
+    <ClInclude Include="include\Poco\LineEndingConverter.h"/>
+    <ClInclude Include="include\Poco\MemoryStream.h"/>
+    <ClInclude Include="include\Poco\NullStream.h"/>
+    <ClInclude Include="include\Poco\StreamCopier.h"/>
+    <ClInclude Include="include\Poco\StreamTokenizer.h"/>
+    <ClInclude Include="include\Poco\StreamUtil.h"/>
+    <ClInclude Include="include\Poco\TeeStream.h"/>
+    <ClInclude Include="include\Poco\Token.h"/>
+    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h"/>
+    <ClInclude Include="src\crc32.h"/>
+    <ClInclude Include="src\deflate.h"/>
+    <ClInclude Include="src\inffast.h"/>
+    <ClInclude Include="src\inffixed.h"/>
+    <ClInclude Include="src\inflate.h"/>
+    <ClInclude Include="src\inftrees.h"/>
+    <ClInclude Include="src\trees.h"/>
+    <ClInclude Include="src\zconf.h"/>
+    <ClInclude Include="src\zlib.h"/>
+    <ClInclude Include="src\zutil.h"/>
+    <ClInclude Include="include\Poco\ActiveDispatcher.h"/>
+    <ClInclude Include="include\Poco\ActiveMethod.h"/>
+    <ClInclude Include="include\Poco\ActiveResult.h"/>
+    <ClInclude Include="include\Poco\ActiveRunnable.h"/>
+    <ClInclude Include="include\Poco\ActiveStarter.h"/>
+    <ClInclude Include="include\Poco\Activity.h"/>
+    <ClInclude Include="include\Poco\Condition.h"/>
+    <ClInclude Include="include\Poco\ErrorHandler.h"/>
+    <ClInclude Include="include\Poco\Event.h"/>
+    <ClInclude Include="include\Poco\Event_POSIX.h"/>
+    <ClInclude Include="include\Poco\Event_WIN32.h"/>
+    <ClInclude Include="include\Poco\Mutex.h"/>
+    <ClInclude Include="include\Poco\Mutex_POSIX.h"/>
+    <ClInclude Include="include\Poco\Mutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\Runnable.h"/>
+    <ClInclude Include="include\Poco\RunnableAdapter.h"/>
+    <ClInclude Include="include\Poco\RWLock.h"/>
+    <ClInclude Include="include\Poco\RWLock_POSIX.h"/>
+    <ClInclude Include="include\Poco\RWLock_WIN32.h"/>
+    <ClInclude Include="include\Poco\ScopedLock.h"/>
+    <ClInclude Include="include\Poco\ScopedUnlock.h"/>
+    <ClInclude Include="include\Poco\Semaphore.h"/>
+    <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
+    <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
+    <ClInclude Include="include\Poco\SignalHandler.h"/>
+    <ClInclude Include="include\Poco\SynchronizedObject.h"/>
+    <ClInclude Include="include\Poco\Thread.h"/>
+    <ClInclude Include="include\Poco\Thread_POSIX.h"/>
+    <ClInclude Include="include\Poco\Thread_WIN32.h"/>
+    <ClInclude Include="include\Poco\ThreadLocal.h"/>
+    <ClInclude Include="include\Poco\ThreadPool.h"/>
+    <ClInclude Include="include\Poco\ThreadTarget.h"/>
+    <ClInclude Include="include\Poco\Timer.h"/>
+    <ClInclude Include="include\Poco\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\DigestStream.h"/>
+    <ClInclude Include="include\Poco\HMACEngine.h"/>
+    <ClInclude Include="include\Poco\MD4Engine.h"/>
+    <ClInclude Include="include\Poco\MD5Engine.h"/>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h"/>
+    <ClInclude Include="include\Poco\Random.h"/>
+    <ClInclude Include="include\Poco\RandomStream.h"/>
+    <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\ClassLibrary.h"/>
+    <ClInclude Include="include\Poco\ClassLoader.h"/>
+    <ClInclude Include="include\Poco\Manifest.h"/>
+    <ClInclude Include="include\Poco\MetaObject.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_VMS.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"/>
+    <ClInclude Include="src\pcre.h"/>
+    <ClInclude Include="src\pcre_config.h"/>
+    <ClInclude Include="src\pcre_internal.h"/>
+    <ClInclude Include="src\ucp.h"/>
+    <ClInclude Include="include\Poco\RegularExpression.h"/>
+    <ClInclude Include="include\Poco\ArchiveStrategy.h"/>
+    <ClInclude Include="include\Poco\AsyncChannel.h"/>
+    <ClInclude Include="include\Poco\Channel.h"/>
+    <ClInclude Include="include\Poco\Configurable.h"/>
+    <ClInclude Include="include\Poco\ConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\EventLogChannel.h"/>
+    <ClInclude Include="include\Poco\FileChannel.h"/>
+    <ClInclude Include="include\Poco\Formatter.h"/>
+    <ClInclude Include="include\Poco\FormattingChannel.h"/>
+    <ClInclude Include="include\Poco\LogFile.h"/>
+    <ClInclude Include="include\Poco\LogFile_STD.h"/>
+    <ClInclude Include="include\Poco\LogFile_VMS.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Logger.h"/>
+    <ClInclude Include="include\Poco\LoggingFactory.h"/>
+    <ClInclude Include="include\Poco\LoggingRegistry.h"/>
+    <ClInclude Include="include\Poco\LogStream.h"/>
+    <ClInclude Include="include\Poco\Message.h"/>
+    <ClInclude Include="include\Poco\NullChannel.h"/>
+    <ClInclude Include="include\Poco\OpcomChannel.h"/>
+    <ClInclude Include="include\Poco\PatternFormatter.h"/>
+    <ClInclude Include="src\pocomsg.h"/>
+    <ClInclude Include="include\Poco\PurgeStrategy.h"/>
+    <ClInclude Include="include\Poco\RotateStrategy.h"/>
+    <ClInclude Include="include\Poco\SimpleFileChannel.h"/>
+    <ClInclude Include="include\Poco\SplitterChannel.h"/>
+    <ClInclude Include="include\Poco\StreamChannel.h"/>
+    <ClInclude Include="include\Poco\SyslogChannel.h"/>
+    <ClInclude Include="include\Poco\WindowsConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\AbstractObserver.h"/>
+    <ClInclude Include="include\Poco\NObserver.h"/>
+    <ClInclude Include="include\Poco\Notification.h"/>
+    <ClInclude Include="include\Poco\NotificationCenter.h"/>
+    <ClInclude Include="include\Poco\NotificationQueue.h"/>
+    <ClInclude Include="include\Poco\Observer.h"/>
+    <ClInclude Include="include\Poco\PriorityNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\TimedNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"/>
+    <ClInclude Include="include\Poco\DirectoryWatcher.h"/>
+    <ClInclude Include="include\Poco\File.h"/>
+    <ClInclude Include="include\Poco\File_UNIX.h"/>
+    <ClInclude Include="include\Poco\File_VMS.h"/>
+    <ClInclude Include="include\Poco\File_WIN32.h"/>
+    <ClInclude Include="include\Poco\File_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Glob.h"/>
+    <ClInclude Include="include\Poco\Path.h"/>
+    <ClInclude Include="include\Poco\Path_UNIX.h"/>
+    <ClInclude Include="include\Poco\Path_VMS.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32U.h"/>
+    <ClInclude Include="include\Poco\TemporaryFile.h"/>
+    <ClInclude Include="include\Poco\NamedEvent.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h"/>
+    <ClInclude Include="include\Poco\NamedMutex.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Pipe.h"/>
+    <ClInclude Include="include\Poco\PipeImpl.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_POSIX.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_WIN32.h"/>
+    <ClInclude Include="include\Poco\PipeStream.h"/>
+    <ClInclude Include="include\Poco\Process.h"/>
+    <ClInclude Include="include\Poco\Process_UNIX.h"/>
+    <ClInclude Include="include\Poco\Process_VMS.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32U.h"/>
+    <ClInclude Include="include\Poco\SharedMemory.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_POSIX.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_WIN32.h"/>
+    <ClInclude Include="include\Poco\UUID.h"/>
+    <ClInclude Include="include\Poco\UUIDGenerator.h"/>
+    <ClInclude Include="include\Poco\Clock.h"/>
+    <ClInclude Include="include\Poco\DateTime.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormat.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormatter.h"/>
+    <ClInclude Include="include\Poco\DateTimeParser.h"/>
+    <ClInclude Include="include\Poco\LocalDateTime.h"/>
+    <ClInclude Include="include\Poco\Stopwatch.h"/>
+    <ClInclude Include="include\Poco\Timespan.h"/>
+    <ClInclude Include="include\Poco\Timestamp.h"/>
+    <ClInclude Include="include\Poco\Timezone.h"/>
+    <ClInclude Include="include\Poco\ASCIIEncoding.h"/>
+    <ClInclude Include="include\Poco\Latin1Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin2Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin9Encoding.h"/>
+    <ClInclude Include="include\Poco\ListMap.h"/>
+    <ClInclude Include="include\Poco\StreamConverter.h"/>
+    <ClInclude Include="include\Poco\TextBufferIterator.h"/>
+    <ClInclude Include="include\Poco\TextConverter.h"/>
+    <ClInclude Include="include\Poco\TextEncoding.h"/>
+    <ClInclude Include="include\Poco\TextIterator.h"/>
+    <ClInclude Include="include\Poco\Unicode.h"/>
+    <ClInclude Include="include\Poco\UnicodeConverter.h"/>
+    <ClInclude Include="include\Poco\UTF16Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF32Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8String.h"/>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1252Encoding.h"/>
+    <ClInclude Include="include\Poco\FileStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URI.h"/>
+    <ClInclude Include="include\Poco\URIStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URIStreamOpener.h"/>
+    <ClInclude Include="include\Poco\Task.h"/>
+    <ClInclude Include="include\Poco\TaskManager.h"/>
+    <ClInclude Include="include\Poco\TaskNotification.h"/>
+    <ClInclude Include="include\Poco\AbstractDelegate.h"/>
+    <ClInclude Include="include\Poco\AbstractEvent.h"/>
+    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\BasicEvent.h"/>
+    <ClInclude Include="include\Poco\DefaultStrategy.h"/>
+    <ClInclude Include="include\Poco\Delegate.h"/>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h"/>
+    <ClInclude Include="include\Poco\EventArgs.h"/>
+    <ClInclude Include="include\Poco\Expire.h"/>
+    <ClInclude Include="include\Poco\FIFOEvent.h"/>
+    <ClInclude Include="include\Poco\FIFOStrategy.h"/>
+    <ClInclude Include="include\Poco\FunctionDelegate.h"/>
+    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\NotificationStrategy.h"/>
+    <ClInclude Include="include\Poco\PriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\PriorityEvent.h"/>
+    <ClInclude Include="include\Poco\PriorityExpire.h"/>
+    <ClInclude Include="include\Poco\PriorityStrategy.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h"/>
+    <ClInclude Include="include\Poco\AbstractCache.h"/>
+    <ClInclude Include="include\Poco\AbstractStrategy.h"/>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\AccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\ExpireCache.h"/>
+    <ClInclude Include="include\Poco\ExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\ExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\KeyValueArgs.h"/>
+    <ClInclude Include="include\Poco\LRUCache.h"/>
+    <ClInclude Include="include\Poco\LRUStrategy.h"/>
+    <ClInclude Include="include\Poco\StrategyCollection.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ValidArgs.h"/>
+    <ClInclude Include="include\Poco\Hash.h"/>
+    <ClInclude Include="include\Poco\HashFunction.h"/>
+    <ClInclude Include="include\Poco\HashMap.h"/>
+    <ClInclude Include="include\Poco\HashSet.h"/>
+    <ClInclude Include="include\Poco\HashStatistic.h"/>
+    <ClInclude Include="include\Poco\HashTable.h"/>
+    <ClInclude Include="include\Poco\LinearHashTable.h"/>
+    <ClInclude Include="include\Poco\SimpleHashTable.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Pair.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Struct.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Var.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarHolder.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarIterator.h"/>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\pocomsg.mc">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ResourceCompile Include="src\pocomsg.rc"/>
     <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>
-    <ResourceCompile Include="src\pocomsg.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters
index b00691dc3d..8a8ce1a348 100644
--- a/Foundation/Foundation_x64_vs100.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs100.vcxproj.filters
@@ -2,190 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{eed22eb8-615d-47c6-9148-bf4b06dcba89}</UniqueIdentifier>
+      <UniqueIdentifier>{1fb6daa6-cea2-4e3a-9646-83a4e9de1287}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{e4b65ef2-2d99-41ac-8fce-ecce748757fe}</UniqueIdentifier>
+      <UniqueIdentifier>{9e58c5a7-9bc7-4f1b-8c5e-3bb980e29e18}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{15b1d37c-f762-444f-943f-c1886dd9510c}</UniqueIdentifier>
+      <UniqueIdentifier>{10d048a7-1d43-4c9c-ab79-551dc4f08274}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{9e3b59da-7f2c-4e28-8b35-7c3e8abf2ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{b8ca6e38-4f81-4ba9-85ec-25195a87e369}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{faa35c18-be02-43c4-8d4d-7e63c97447f0}</UniqueIdentifier>
+      <UniqueIdentifier>{cda56801-369e-4a21-b6e7-453ec53d7f96}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{642a8ece-5f25-439e-aebc-f0aabc17a24d}</UniqueIdentifier>
+      <UniqueIdentifier>{37289219-029f-45b8-8438-d1947725a4d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\zlib">
-      <UniqueIdentifier>{873a6a3d-b159-495f-b307-908be9d0ca39}</UniqueIdentifier>
+      <UniqueIdentifier>{c13bfebc-e81c-4827-94da-5855bc37343b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{243ce5c9-276b-41e0-b226-d2e8c4eb399d}</UniqueIdentifier>
+      <UniqueIdentifier>{a634ab77-ed72-4e88-8087-d1b5b5e3385d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{171bf60e-c5e8-41a6-a8c4-4e5035ac40e4}</UniqueIdentifier>
+      <UniqueIdentifier>{53233c2e-e472-4463-a8f3-abee693c971f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{897efa40-8fd5-48ea-951f-5025e7bf316d}</UniqueIdentifier>
+      <UniqueIdentifier>{1e94f761-56aa-484e-8bdd-ec93db4f6644}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{5449ee1f-18c8-46f2-ba3b-4851c2bed9be}</UniqueIdentifier>
+      <UniqueIdentifier>{eef4a809-4a65-470a-b0e7-bcdc38307e72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{ed334c78-ef4a-42a2-b164-842b035b2891}</UniqueIdentifier>
+      <UniqueIdentifier>{e9777123-b9cf-470f-ba1b-fd23e9e1a752}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{cea4c790-2034-4779-a543-bb578ccb1950}</UniqueIdentifier>
+      <UniqueIdentifier>{1438e249-8da8-4f2a-ac83-97b3afd351d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{69675fb8-11fe-4ac9-b434-5fbfde370465}</UniqueIdentifier>
+      <UniqueIdentifier>{4a8bf426-187a-4cda-90d5-b99fc4189382}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{7adff1e1-d832-49d7-80fe-0c84b92932f4}</UniqueIdentifier>
+      <UniqueIdentifier>{db672bf4-99f3-473b-b4dd-c4fff63a3aac}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{d16afff9-2b9b-4afc-9417-fc60165a4820}</UniqueIdentifier>
+      <UniqueIdentifier>{fd878fb0-b242-4d12-8624-e8fe18db7183}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression">
-      <UniqueIdentifier>{27e4e676-acfb-4bdb-a9f5-1efd2d0b1e0e}</UniqueIdentifier>
+      <UniqueIdentifier>{e7118e8a-e484-4939-ae96-570f0a7179db}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{15ad7723-f5d6-4b0c-adb8-4d1cf5f47476}</UniqueIdentifier>
+      <UniqueIdentifier>{a2e6f66f-db80-4483-af1b-748bbe5d9e10}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Source Files">
-      <UniqueIdentifier>{88f53776-2079-4215-babb-230b3d06bd58}</UniqueIdentifier>
+      <UniqueIdentifier>{509d8227-365e-4199-bc1f-f86af81da9e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
-      <UniqueIdentifier>{d241990d-d11f-4929-8ffa-a2c060cb18cb}</UniqueIdentifier>
+      <UniqueIdentifier>{ee23e2ed-5e3c-4954-ac3d-05cee8723508}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{abf63bab-bd68-407d-87dd-7b49eb167dd1}</UniqueIdentifier>
+      <UniqueIdentifier>{6d5d1ff8-a899-4765-b749-37a7e8e2bb5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{cf605dfb-6591-4203-8b65-244a90cf5766}</UniqueIdentifier>
+      <UniqueIdentifier>{4c86723c-cb59-41f2-b83d-bcea98bbb9db}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{7ce7dd5c-bf1a-441c-83cd-ff01664514ff}</UniqueIdentifier>
+      <UniqueIdentifier>{3a81ff37-87d8-40f4-981f-0a632c4e3937}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{ddb92b9f-2791-4041-8669-7cbb7db75308}</UniqueIdentifier>
+      <UniqueIdentifier>{2a4fb5d7-46d4-452a-8d01-20bf914597b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Message Files">
-      <UniqueIdentifier>{e96537d4-d193-4b36-8259-0f00191ed830}</UniqueIdentifier>
+      <UniqueIdentifier>{68a712d0-bf11-4ce5-b9a8-60e3df7d2dba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Resource Files">
-      <UniqueIdentifier>{3822dfb8-f1d9-483b-8669-692755d5f989}</UniqueIdentifier>
+      <UniqueIdentifier>{d1d6e042-fadf-4527-bdb5-80b0c07e5239}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{0d24bd5b-b5b0-408a-816b-2debac7c8161}</UniqueIdentifier>
+      <UniqueIdentifier>{468440d0-9f8a-4c69-a4f3-d3e52aea6ba1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{d61210ea-a9c7-4f70-9fc4-c78bfa4287d3}</UniqueIdentifier>
+      <UniqueIdentifier>{9bfd39e4-957c-4d84-a6f6-1c46c0154c67}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ef783201-716d-4b64-b84d-4f214d2ed377}</UniqueIdentifier>
+      <UniqueIdentifier>{21690dcd-cd0d-427c-a024-5345b77f77f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{13721cc0-4976-4884-8b33-d2929ccad127}</UniqueIdentifier>
+      <UniqueIdentifier>{7f849c43-e175-40a9-a345-10e7d1352e4e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{b1219e5a-7cd3-4250-9a9f-48047a814621}</UniqueIdentifier>
+      <UniqueIdentifier>{756daed4-8a04-4227-a0e0-0041c576b103}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{0d0d9117-9915-4251-a7e7-aa65a323166b}</UniqueIdentifier>
+      <UniqueIdentifier>{0ff5cd92-62b7-4a33-aebb-60bc4a369641}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{e579e608-e12e-42be-8c49-cc9a9581bedd}</UniqueIdentifier>
+      <UniqueIdentifier>{d0c8069a-1bfa-4e10-8f22-1774ac8458fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{c0302ef2-2ddd-4ab6-859c-f9d838083207}</UniqueIdentifier>
+      <UniqueIdentifier>{7c2e1695-79bd-488b-9dd9-27956a714fe6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{902f59de-5b3b-4fa9-81fb-400142cf8ce8}</UniqueIdentifier>
+      <UniqueIdentifier>{119852dc-637e-49dd-afed-7acf9360f7d5}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{c8bb647e-3992-4e61-8574-c58262745a52}</UniqueIdentifier>
+      <UniqueIdentifier>{71748de7-1b47-4243-8f9e-9a916a476775}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{af0928d0-f150-4d35-bde2-6312ea9d5953}</UniqueIdentifier>
+      <UniqueIdentifier>{70213fc1-4cdc-45d4-a377-93e5462439d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{a9e6090f-3b21-437d-9a93-50f6c3d6bd29}</UniqueIdentifier>
+      <UniqueIdentifier>{ebe3bc1e-ac59-41f8-bc34-c6b5b38bd3d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{3d02f5d0-b1b5-4b93-9a47-063ad3f08e61}</UniqueIdentifier>
+      <UniqueIdentifier>{19e0e672-150c-4a94-8a1c-809ff94758f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{18c6c8e3-0b20-4afb-bf19-c4558e3568a9}</UniqueIdentifier>
+      <UniqueIdentifier>{6bc715c1-d26e-44d5-817e-ffb56ff9e300}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{0dbde655-aa5c-4dce-9880-3993a89efde5}</UniqueIdentifier>
+      <UniqueIdentifier>{f1b69a39-ca51-4229-b450-a99ab23d7c09}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{fdbf3495-96a6-4254-9f4c-8e420f5c568b}</UniqueIdentifier>
+      <UniqueIdentifier>{46c6aa4f-da20-460a-a2ad-f38fed2a321f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{02e6ad4a-26c8-4ab2-af6c-4a39ee850242}</UniqueIdentifier>
+      <UniqueIdentifier>{e549eae8-8251-4318-bd54-ce3d74d1f008}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{08fcdce9-22a1-4336-b1b7-abf97d9a541a}</UniqueIdentifier>
+      <UniqueIdentifier>{3100a70d-fca4-4146-a69a-64b84f9f7cca}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{fb3b5c0e-07cb-460f-bbf2-c3836bc22692}</UniqueIdentifier>
+      <UniqueIdentifier>{a43ce81c-f57d-40e6-b58c-4ee404352b64}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{82260cc1-f20d-4647-829a-3f213e88a388}</UniqueIdentifier>
+      <UniqueIdentifier>{567b23f3-d145-4b11-b93c-939932577885}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{dbd582a0-df3b-4475-abb5-043be9a79a7c}</UniqueIdentifier>
+      <UniqueIdentifier>{231372a6-87af-4498-89e8-13be7754876b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{41f46e9d-8090-426b-8562-e4d22fd2937b}</UniqueIdentifier>
+      <UniqueIdentifier>{a4988e12-a008-4c41-a05c-2c3f13316ab4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1ccf0703-d483-4a72-8abb-f601911839cc}</UniqueIdentifier>
+      <UniqueIdentifier>{97dc338a-ed58-4c39-956e-500e9fbc5272}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{ea621b2c-cdcf-4710-adb4-90265b48d2ca}</UniqueIdentifier>
+      <UniqueIdentifier>{7ec87574-4a4e-40d9-b5bf-b2dc198e996e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events">
-      <UniqueIdentifier>{dc06be98-7865-469a-a0c6-f01fe2ebeeb8}</UniqueIdentifier>
+      <UniqueIdentifier>{d7a66e04-02dd-4b67-ba9e-288a7c504fb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Header Files">
-      <UniqueIdentifier>{c179291d-1823-4297-9710-6af7123f8a91}</UniqueIdentifier>
+      <UniqueIdentifier>{ec81712f-7933-4096-bbd1-f1feaef7b4eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Source Files">
-      <UniqueIdentifier>{8831307b-6f33-460f-9069-51ee7563995d}</UniqueIdentifier>
+      <UniqueIdentifier>{db464777-36d5-4f48-bb7c-0c014c670cd2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{0aab1e27-6341-4b50-8795-404c518d783e}</UniqueIdentifier>
+      <UniqueIdentifier>{f80af544-99bf-443b-aa7f-f6f5acf0fb43}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{5cbbf1df-2a1b-47e3-a217-addab713c565}</UniqueIdentifier>
+      <UniqueIdentifier>{8b0fdcf1-4f50-4ee6-b50c-3c300c988460}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{0f008454-6d63-4c65-9b75-7717a897a428}</UniqueIdentifier>
+      <UniqueIdentifier>{5b2b9070-b60e-42a0-8005-2d0cf4fbf36a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{fb2c3d90-efdb-434a-a011-3097b35373e4}</UniqueIdentifier>
+      <UniqueIdentifier>{54cb84c2-4618-4336-80ef-101d93fd5c55}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{8db03882-c794-4ba9-b65e-e5765939e973}</UniqueIdentifier>
+      <UniqueIdentifier>{65f9f1bf-ba5d-41a7-a489-99dae78643a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{4c9c3a5f-93fa-4852-96a3-c2159bd98556}</UniqueIdentifier>
+      <UniqueIdentifier>{1429b610-f556-4229-b79c-1597f56762fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{52837383-e5d2-4f5e-bd44-eac0b06f79e0}</UniqueIdentifier>
+      <UniqueIdentifier>{f63ea610-39c4-4bcf-b98d-ecbeefb6aa8c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{4a82831e-73af-4f45-9096-d5a82f5f2052}</UniqueIdentifier>
+      <UniqueIdentifier>{3747f7fe-39aa-4367-8ee2-9ee06f1e35b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{db8200c1-46f0-4fff-90ca-db388f450539}</UniqueIdentifier>
+      <UniqueIdentifier>{8c928679-6cb8-49ce-8364-b53301c722db}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -207,6 +207,9 @@
     <ClCompile Include="src\Debugger.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Environment.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -249,6 +252,9 @@
     <ClCompile Include="src\FPEnvironment_WIN32.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MemoryPool.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -261,13 +267,16 @@
     <ClCompile Include="src\NumberParser.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NumericString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\String.cpp">
+    <ClCompile Include="src\SortedDirectoryIterator.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp">
+    <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\StringTokenizer.cpp">
@@ -300,6 +309,9 @@
     <ClCompile Include="src\DeflatingStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStream.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -489,6 +501,9 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_byte_order.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_chartables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -498,40 +513,31 @@
     <ClCompile Include="src\pcre_config.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_dfa_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_fullinfo.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
+    <ClCompile Include="src\pcre_get.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
+    <ClCompile Include="src\pcre_globals.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
+    <ClCompile Include="src\pcre_jit_compile.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
+    <ClCompile Include="src\pcre_maketables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
+    <ClCompile Include="src\pcre_newline.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
+    <ClCompile Include="src\pcre_ord2utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_refcount.c">
@@ -540,7 +546,10 @@
     <ClCompile Include="src\pcre_string_utils.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
+    <ClCompile Include="src\pcre_study.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre_tables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_ucd.c">
@@ -549,6 +558,9 @@
     <ClCompile Include="src\pcre_valid_utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_version.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_xclass.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -672,10 +684,7 @@
     <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SortedDirectoryIterator.cpp">
+    <ClCompile Include="src\DirectoryWatcher.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\File.cpp">
@@ -837,6 +846,9 @@
     <ClCompile Include="src\Latin1Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Latin2Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Latin9Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -864,12 +876,21 @@
     <ClCompile Include="src\UTF16Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\UTF32Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\UTF8Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\UTF8String.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Windows1250Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Windows1251Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1252Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -903,12 +924,6 @@
     <ClCompile Include="src\HashStatistic.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryWatcher.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStream.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Var.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
@@ -918,18 +933,6 @@
     <ClCompile Include="src\VarIterator.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1250Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1251Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UTF32Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -995,6 +998,9 @@
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\FIFOBuffer.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Format.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1022,7 +1028,7 @@
     <ClInclude Include="include\Poco\Instantiator.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\ListMap.h">
+    <ClInclude Include="include\Poco\JSONString.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\MemoryPool.h">
@@ -1079,6 +1085,9 @@
     <ClInclude Include="include\Poco\SingletonHolder.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\String.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1325,6 +1334,9 @@
     <ClInclude Include="include\Poco\MD5Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Random.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -1508,16 +1520,7 @@
     <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+    <ClInclude Include="include\Poco\DirectoryWatcher.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\File.h">
@@ -1673,9 +1676,15 @@
     <ClInclude Include="include\Poco\Latin1Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Latin2Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Latin9Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ListMap.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\StreamConverter.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1700,12 +1709,21 @@
     <ClInclude Include="include\Poco\UTF16Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\UTF32Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\UTF8Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\UTF8String.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1252Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1748,6 +1766,9 @@
     <ClInclude Include="include\Poco\Delegate.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\EventArgs.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
@@ -1778,12 +1799,24 @@
     <ClInclude Include="include\Poco\PriorityExpire.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PriorityStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AbstractCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\AbstractStrategy.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AccessExpireCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
@@ -1862,22 +1895,13 @@
     <ClInclude Include="include\Poco\SimpleHashTable.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PriorityStrategy.h">
-      <Filter>Events\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBufferStream.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\Pair.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Dynamic\Var.h">
+    <ClInclude Include="include\Poco\Dynamic\Struct.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Dynamic\Struct.h">
+    <ClInclude Include="include\Poco\Dynamic\Var.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\VarHolder.h">
@@ -1886,24 +1910,6 @@
     <ClInclude Include="include\Poco\Dynamic\VarIterator.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Latin2Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1251Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1250Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryWatcher.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTF32Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PBKDF2Engine.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_x64_vs110.sln b/Foundation/Foundation_x64_vs110.sln
index fa5c2a531e..0c761665d4 100644
--- a/Foundation/Foundation_x64_vs110.sln
+++ b/Foundation/Foundation_x64_vs110.sln
@@ -1,23 +1,20 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs110.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs110.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs110.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs110.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
@@ -30,6 +27,42 @@ Global
 		release_static_mt|x64 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Build.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Deploy.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.ActiveCfg = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Build.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Deploy.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.ActiveCfg = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Build.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Deploy.0 = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Deploy.0 = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.Build.0 = debug_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.ActiveCfg = debug_shared|x64
@@ -54,30 +87,6 @@ Global
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.Build.0 = release_static_md|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.Build.0 = release_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.Build.0 = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.Build.0 = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.ActiveCfg = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.Build.0 = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.ActiveCfg = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.Build.0 = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.Build.0 = release_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj
index c83bb0c8e8..d4998ca301 100644
--- a/Foundation/Foundation_x64_vs110.vcxproj
+++ b/Foundation/Foundation_x64_vs110.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|x64">
@@ -28,27 +28,27 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Foundation</ProjectName>
-    <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
+    <ProjectGuid>{B01196CC-B693-4548-8464-2FF60499E73F}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
@@ -63,46 +63,29 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">..\bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">..\bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\Foundation\$(Configuration)\</IntDir>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoFoundation64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoFoundationmtd</TargetName>
@@ -110,11 +93,37 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoFoundationmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoFoundationmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
+    <OutDir>..\bin64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
+    <OutDir>..\bin64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,12 +132,10 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -136,6 +143,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>..\bin64\PocoFoundation64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\lib64\PocoFoundationd.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
@@ -149,31 +157,24 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoFoundation64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -181,93 +182,77 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
+      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib64\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ProgramDataBaseFileName>..\lib64\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib64\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ProgramDataBaseFileName>..\lib64\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -275,46 +260,38 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\Ascii.cpp" />
-    <ClCompile Include="src\AtomicCounter.cpp" />
-    <ClCompile Include="src\Bugcheck.cpp" />
+    <ClCompile Include="src\Ascii.cpp"/>
+    <ClCompile Include="src\AtomicCounter.cpp"/>
+    <ClCompile Include="src\Bugcheck.cpp"/>
     <ClCompile Include="src\ByteOrder.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Checksum.cpp" />
-    <ClCompile Include="src\Debugger.cpp" />
-    <ClCompile Include="src\DirectoryWatcher.cpp" />
-    <ClCompile Include="src\Environment.cpp" />
+    <ClCompile Include="src\Checksum.cpp"/>
+    <ClCompile Include="src\Debugger.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp"/>
+    <ClCompile Include="src\Environment.cpp"/>
     <ClCompile Include="src\Environment_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -347,11 +324,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Error.cpp" />
-    <ClCompile Include="src\Exception.cpp" />
-    <ClCompile Include="src\FIFOBufferStream.cpp" />
-    <ClCompile Include="src\Format.cpp" />
-    <ClCompile Include="src\FPEnvironment.cpp" />
+    <ClCompile Include="src\Error.cpp"/>
+    <ClCompile Include="src\Exception.cpp"/>
+    <ClCompile Include="src\Format.cpp"/>
+    <ClCompile Include="src\FPEnvironment.cpp"/>
     <ClCompile Include="src\FPEnvironment_C99.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -392,38 +368,34 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp" />
-    <ClCompile Include="src\MemoryPool.cpp" />
-    <ClCompile Include="src\NestedDiagnosticContext.cpp" />
-    <ClCompile Include="src\NumberFormatter.cpp" />
-    <ClCompile Include="src\NumberParser.cpp" />
-    <ClCompile Include="src\RefCountedObject.cpp" />
-    <ClCompile Include="src\SortedDirectoryIterator.cpp" />
+    <ClCompile Include="src\JSONString.cpp"/>
+    <ClCompile Include="src\MemoryPool.cpp"/>
+    <ClCompile Include="src\NestedDiagnosticContext.cpp"/>
+    <ClCompile Include="src\NumberFormatter.cpp"/>
+    <ClCompile Include="src\NumberParser.cpp"/>
+    <ClCompile Include="src\NumericString.cpp"/>
+    <ClCompile Include="src\RefCountedObject.cpp"/>
+    <ClCompile Include="src\SortedDirectoryIterator.cpp"/>
     <ClCompile Include="src\String.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp" />
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
-    <ClCompile Include="src\StringTokenizer.cpp" />
-    <ClCompile Include="src\UTF32Encoding.cpp" />
-    <ClCompile Include="src\Var.cpp" />
-    <ClCompile Include="src\VarHolder.cpp" />
-    <ClCompile Include="src\VarIterator.cpp" />
-    <ClCompile Include="src\Void.cpp" />
-    <ClCompile Include="src\Base32Decoder.cpp" />
-    <ClCompile Include="src\Base32Encoder.cpp" />
-    <ClCompile Include="src\Base64Decoder.cpp" />
-    <ClCompile Include="src\Base64Encoder.cpp" />
-    <ClCompile Include="src\BinaryReader.cpp" />
-    <ClCompile Include="src\BinaryWriter.cpp" />
-    <ClCompile Include="src\CountingStream.cpp" />
-    <ClCompile Include="src\DeflatingStream.cpp" />
-    <ClCompile Include="src\FileStream.cpp" />
+    <ClCompile Include="src\StringTokenizer.cpp"/>
+    <ClCompile Include="src\Void.cpp"/>
+    <ClCompile Include="src\Base32Decoder.cpp"/>
+    <ClCompile Include="src\Base32Encoder.cpp"/>
+    <ClCompile Include="src\Base64Decoder.cpp"/>
+    <ClCompile Include="src\Base64Encoder.cpp"/>
+    <ClCompile Include="src\BinaryReader.cpp"/>
+    <ClCompile Include="src\BinaryWriter.cpp"/>
+    <ClCompile Include="src\CountingStream.cpp"/>
+    <ClCompile Include="src\DeflatingStream.cpp"/>
+    <ClCompile Include="src\FIFOBufferStream.cpp"/>
+    <ClCompile Include="src\FileStream.cpp"/>
     <ClCompile Include="src\FileStream_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -440,32 +412,30 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\HexBinaryDecoder.cpp" />
-    <ClCompile Include="src\HexBinaryEncoder.cpp" />
-    <ClCompile Include="src\InflatingStream.cpp" />
-    <ClCompile Include="src\LineEndingConverter.cpp" />
-    <ClCompile Include="src\MemoryStream.cpp" />
-    <ClCompile Include="src\NullStream.cpp" />
-    <ClCompile Include="src\StreamCopier.cpp" />
-    <ClCompile Include="src\StreamTokenizer.cpp" />
-    <ClCompile Include="src\TeeStream.cpp" />
-    <ClCompile Include="src\Token.cpp" />
-    <ClCompile Include="src\adler32.c" />
-    <ClCompile Include="src\compress.c" />
-    <ClCompile Include="src\crc32.c" />
-    <ClCompile Include="src\deflate.c" />
-    <ClCompile Include="src\infback.c" />
-    <ClCompile Include="src\inffast.c" />
-    <ClCompile Include="src\inflate.c" />
-    <ClCompile Include="src\inftrees.c" />
-    <ClCompile Include="src\trees.c" />
-    <ClCompile Include="src\Windows1250Encoding.cpp" />
-    <ClCompile Include="src\Windows1251Encoding.cpp" />
-    <ClCompile Include="src\zutil.c" />
-    <ClCompile Include="src\ActiveDispatcher.cpp" />
-    <ClCompile Include="src\Condition.cpp" />
-    <ClCompile Include="src\ErrorHandler.cpp" />
-    <ClCompile Include="src\Event.cpp" />
+    <ClCompile Include="src\HexBinaryDecoder.cpp"/>
+    <ClCompile Include="src\HexBinaryEncoder.cpp"/>
+    <ClCompile Include="src\InflatingStream.cpp"/>
+    <ClCompile Include="src\LineEndingConverter.cpp"/>
+    <ClCompile Include="src\MemoryStream.cpp"/>
+    <ClCompile Include="src\NullStream.cpp"/>
+    <ClCompile Include="src\StreamCopier.cpp"/>
+    <ClCompile Include="src\StreamTokenizer.cpp"/>
+    <ClCompile Include="src\TeeStream.cpp"/>
+    <ClCompile Include="src\Token.cpp"/>
+    <ClCompile Include="src\adler32.c"/>
+    <ClCompile Include="src\compress.c"/>
+    <ClCompile Include="src\crc32.c"/>
+    <ClCompile Include="src\deflate.c"/>
+    <ClCompile Include="src\infback.c"/>
+    <ClCompile Include="src\inffast.c"/>
+    <ClCompile Include="src\inflate.c"/>
+    <ClCompile Include="src\inftrees.c"/>
+    <ClCompile Include="src\trees.c"/>
+    <ClCompile Include="src\zutil.c"/>
+    <ClCompile Include="src\ActiveDispatcher.cpp"/>
+    <ClCompile Include="src\Condition.cpp"/>
+    <ClCompile Include="src\ErrorHandler.cpp"/>
+    <ClCompile Include="src\Event.cpp"/>
     <ClCompile Include="src\Event_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -482,7 +452,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Mutex.cpp" />
+    <ClCompile Include="src\Mutex.cpp"/>
     <ClCompile Include="src\Mutex_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -499,8 +469,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Runnable.cpp" />
-    <ClCompile Include="src\RWLock.cpp" />
+    <ClCompile Include="src\Runnable.cpp"/>
+    <ClCompile Include="src\RWLock.cpp"/>
     <ClCompile Include="src\RWLock_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -517,7 +487,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Semaphore.cpp" />
+    <ClCompile Include="src\Semaphore.cpp"/>
     <ClCompile Include="src\Semaphore_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -535,15 +505,15 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SignalHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SynchronizedObject.cpp" />
-    <ClCompile Include="src\Thread.cpp" />
+    <ClCompile Include="src\SynchronizedObject.cpp"/>
+    <ClCompile Include="src\Thread.cpp"/>
     <ClCompile Include="src\Thread_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -560,19 +530,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ThreadLocal.cpp" />
-    <ClCompile Include="src\ThreadPool.cpp" />
-    <ClCompile Include="src\ThreadTarget.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
-    <ClCompile Include="src\DigestEngine.cpp" />
-    <ClCompile Include="src\DigestStream.cpp" />
-    <ClCompile Include="src\MD4Engine.cpp" />
-    <ClCompile Include="src\MD5Engine.cpp" />
-    <ClCompile Include="src\Random.cpp" />
-    <ClCompile Include="src\RandomStream.cpp" />
-    <ClCompile Include="src\SHA1Engine.cpp" />
-    <ClCompile Include="src\Manifest.cpp" />
-    <ClCompile Include="src\SharedLibrary.cpp" />
+    <ClCompile Include="src\ThreadLocal.cpp"/>
+    <ClCompile Include="src\ThreadPool.cpp"/>
+    <ClCompile Include="src\ThreadTarget.cpp"/>
+    <ClCompile Include="src\Timer.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\DigestStream.cpp"/>
+    <ClCompile Include="src\MD4Engine.cpp"/>
+    <ClCompile Include="src\MD5Engine.cpp"/>
+    <ClCompile Include="src\Random.cpp"/>
+    <ClCompile Include="src\RandomStream.cpp"/>
+    <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\Manifest.cpp"/>
+    <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -613,38 +583,38 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\RegularExpression.cpp" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
-    <ClCompile Include="src\ArchiveStrategy.cpp" />
-    <ClCompile Include="src\AsyncChannel.cpp" />
-    <ClCompile Include="src\Channel.cpp" />
-    <ClCompile Include="src\Configurable.cpp" />
-    <ClCompile Include="src\ConsoleChannel.cpp" />
-    <ClCompile Include="src\EventLogChannel.cpp" />
-    <ClCompile Include="src\FileChannel.cpp" />
-    <ClCompile Include="src\Formatter.cpp" />
-    <ClCompile Include="src\FormattingChannel.cpp" />
-    <ClCompile Include="src\LogFile.cpp" />
+    <ClCompile Include="src\RegularExpression.cpp"/>
+    <ClCompile Include="src\pcre_byte_order.c"/>
+    <ClCompile Include="src\pcre_chartables.c"/>
+    <ClCompile Include="src\pcre_compile.c"/>
+    <ClCompile Include="src\pcre_config.c"/>
+    <ClCompile Include="src\pcre_dfa_exec.c"/>
+    <ClCompile Include="src\pcre_exec.c"/>
+    <ClCompile Include="src\pcre_fullinfo.c"/>
+    <ClCompile Include="src\pcre_get.c"/>
+    <ClCompile Include="src\pcre_globals.c"/>
+    <ClCompile Include="src\pcre_jit_compile.c"/>
+    <ClCompile Include="src\pcre_maketables.c"/>
+    <ClCompile Include="src\pcre_newline.c"/>
+    <ClCompile Include="src\pcre_ord2utf8.c"/>
+    <ClCompile Include="src\pcre_refcount.c"/>
+    <ClCompile Include="src\pcre_string_utils.c"/>
+    <ClCompile Include="src\pcre_study.c"/>
+    <ClCompile Include="src\pcre_tables.c"/>
+    <ClCompile Include="src\pcre_ucd.c"/>
+    <ClCompile Include="src\pcre_valid_utf8.c"/>
+    <ClCompile Include="src\pcre_version.c"/>
+    <ClCompile Include="src\pcre_xclass.c"/>
+    <ClCompile Include="src\ArchiveStrategy.cpp"/>
+    <ClCompile Include="src\AsyncChannel.cpp"/>
+    <ClCompile Include="src\Channel.cpp"/>
+    <ClCompile Include="src\Configurable.cpp"/>
+    <ClCompile Include="src\ConsoleChannel.cpp"/>
+    <ClCompile Include="src\EventLogChannel.cpp"/>
+    <ClCompile Include="src\FileChannel.cpp"/>
+    <ClCompile Include="src\Formatter.cpp"/>
+    <ClCompile Include="src\FormattingChannel.cpp"/>
+    <ClCompile Include="src\LogFile.cpp"/>
     <ClCompile Include="src\LogFile_STD.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -677,12 +647,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Logger.cpp" />
-    <ClCompile Include="src\LoggingFactory.cpp" />
-    <ClCompile Include="src\LoggingRegistry.cpp" />
-    <ClCompile Include="src\LogStream.cpp" />
-    <ClCompile Include="src\Message.cpp" />
-    <ClCompile Include="src\NullChannel.cpp" />
+    <ClCompile Include="src\Logger.cpp"/>
+    <ClCompile Include="src\LoggingFactory.cpp"/>
+    <ClCompile Include="src\LoggingRegistry.cpp"/>
+    <ClCompile Include="src\LogStream.cpp"/>
+    <ClCompile Include="src\Message.cpp"/>
+    <ClCompile Include="src\NullChannel.cpp"/>
     <ClCompile Include="src\OpcomChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -691,12 +661,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\PurgeStrategy.cpp" />
-    <ClCompile Include="src\RotateStrategy.cpp" />
-    <ClCompile Include="src\SimpleFileChannel.cpp" />
-    <ClCompile Include="src\SplitterChannel.cpp" />
-    <ClCompile Include="src\StreamChannel.cpp" />
+    <ClCompile Include="src\PatternFormatter.cpp"/>
+    <ClCompile Include="src\PurgeStrategy.cpp"/>
+    <ClCompile Include="src\RotateStrategy.cpp"/>
+    <ClCompile Include="src\SimpleFileChannel.cpp"/>
+    <ClCompile Include="src\SplitterChannel.cpp"/>
+    <ClCompile Include="src\StreamChannel.cpp"/>
     <ClCompile Include="src\SyslogChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -705,14 +675,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\WindowsConsoleChannel.cpp" />
-    <ClCompile Include="src\AbstractObserver.cpp" />
-    <ClCompile Include="src\Notification.cpp" />
-    <ClCompile Include="src\NotificationCenter.cpp" />
-    <ClCompile Include="src\NotificationQueue.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueue.cpp" />
-    <ClCompile Include="src\TimedNotificationQueue.cpp" />
-    <ClCompile Include="src\DirectoryIterator.cpp" />
+    <ClCompile Include="src\WindowsConsoleChannel.cpp"/>
+    <ClCompile Include="src\AbstractObserver.cpp"/>
+    <ClCompile Include="src\Notification.cpp"/>
+    <ClCompile Include="src\NotificationCenter.cpp"/>
+    <ClCompile Include="src\NotificationQueue.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueue.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueue.cpp"/>
+    <ClCompile Include="src\DirectoryIterator.cpp"/>
     <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -745,7 +715,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\File.cpp" />
+    <ClCompile Include="src\DirectoryWatcher.cpp"/>
+    <ClCompile Include="src\File.cpp"/>
     <ClCompile Include="src\File_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -778,8 +749,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Glob.cpp" />
-    <ClCompile Include="src\Path.cpp" />
+    <ClCompile Include="src\Glob.cpp"/>
+    <ClCompile Include="src\Path.cpp"/>
     <ClCompile Include="src\Path_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -812,8 +783,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\TemporaryFile.cpp" />
-    <ClCompile Include="src\NamedEvent.cpp" />
+    <ClCompile Include="src\TemporaryFile.cpp"/>
+    <ClCompile Include="src\NamedEvent.cpp"/>
     <ClCompile Include="src\NamedEvent_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -846,7 +817,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NamedMutex.cpp" />
+    <ClCompile Include="src\NamedMutex.cpp"/>
     <ClCompile Include="src\NamedMutex_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -879,8 +850,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Pipe.cpp" />
-    <ClCompile Include="src\PipeImpl.cpp" />
+    <ClCompile Include="src\Pipe.cpp"/>
+    <ClCompile Include="src\PipeImpl.cpp"/>
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -905,8 +876,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PipeStream.cpp" />
-    <ClCompile Include="src\Process.cpp" />
+    <ClCompile Include="src\PipeStream.cpp"/>
+    <ClCompile Include="src\Process.cpp"/>
     <ClCompile Include="src\Process_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -939,7 +910,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SharedMemory.cpp" />
+    <ClCompile Include="src\SharedMemory.cpp"/>
     <ClCompile Include="src\SharedMemory_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -964,18 +935,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\UUID.cpp" />
-    <ClCompile Include="src\UUIDGenerator.cpp" />
-    <ClCompile Include="src\Clock.cpp" />
-    <ClCompile Include="src\DateTime.cpp" />
-    <ClCompile Include="src\DateTimeFormat.cpp" />
-    <ClCompile Include="src\DateTimeFormatter.cpp" />
-    <ClCompile Include="src\DateTimeParser.cpp" />
-    <ClCompile Include="src\LocalDateTime.cpp" />
-    <ClCompile Include="src\Stopwatch.cpp" />
-    <ClCompile Include="src\Timespan.cpp" />
-    <ClCompile Include="src\Timestamp.cpp" />
-    <ClCompile Include="src\Timezone.cpp" />
+    <ClCompile Include="src\UUID.cpp"/>
+    <ClCompile Include="src\UUIDGenerator.cpp"/>
+    <ClCompile Include="src\Clock.cpp"/>
+    <ClCompile Include="src\DateTime.cpp"/>
+    <ClCompile Include="src\DateTimeFormat.cpp"/>
+    <ClCompile Include="src\DateTimeFormatter.cpp"/>
+    <ClCompile Include="src\DateTimeParser.cpp"/>
+    <ClCompile Include="src\LocalDateTime.cpp"/>
+    <ClCompile Include="src\Stopwatch.cpp"/>
+    <ClCompile Include="src\Timespan.cpp"/>
+    <ClCompile Include="src\Timestamp.cpp"/>
+    <ClCompile Include="src\Timezone.cpp"/>
     <ClCompile Include="src\Timezone_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -992,390 +963,398 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ASCIIEncoding.cpp" />
-    <ClCompile Include="src\Latin1Encoding.cpp" />
-    <ClCompile Include="src\Latin9Encoding.cpp" />
-    <ClCompile Include="src\StreamConverter.cpp" />
-    <ClCompile Include="src\TextBufferIterator.cpp" />
-    <ClCompile Include="src\TextConverter.cpp" />
-    <ClCompile Include="src\TextEncoding.cpp" />
-    <ClCompile Include="src\TextIterator.cpp" />
-    <ClCompile Include="src\Unicode.cpp" />
-    <ClCompile Include="src\UnicodeConverter.cpp" />
-    <ClCompile Include="src\UTF16Encoding.cpp" />
-    <ClCompile Include="src\UTF8Encoding.cpp" />
-    <ClCompile Include="src\UTF8String.cpp" />
-    <ClCompile Include="src\Windows1252Encoding.cpp" />
-    <ClCompile Include="src\FileStreamFactory.cpp" />
-    <ClCompile Include="src\URI.cpp" />
-    <ClCompile Include="src\URIStreamFactory.cpp" />
-    <ClCompile Include="src\URIStreamOpener.cpp" />
-    <ClCompile Include="src\Task.cpp" />
-    <ClCompile Include="src\TaskManager.cpp" />
-    <ClCompile Include="src\TaskNotification.cpp" />
-    <ClCompile Include="src\EventArgs.cpp" />
-    <ClCompile Include="src\Hash.cpp" />
-    <ClCompile Include="src\HashStatistic.cpp" />
+    <ClCompile Include="src\ASCIIEncoding.cpp"/>
+    <ClCompile Include="src\Latin1Encoding.cpp"/>
+    <ClCompile Include="src\Latin2Encoding.cpp"/>
+    <ClCompile Include="src\Latin9Encoding.cpp"/>
+    <ClCompile Include="src\StreamConverter.cpp"/>
+    <ClCompile Include="src\TextBufferIterator.cpp"/>
+    <ClCompile Include="src\TextConverter.cpp"/>
+    <ClCompile Include="src\TextEncoding.cpp"/>
+    <ClCompile Include="src\TextIterator.cpp"/>
+    <ClCompile Include="src\Unicode.cpp"/>
+    <ClCompile Include="src\UnicodeConverter.cpp"/>
+    <ClCompile Include="src\UTF16Encoding.cpp"/>
+    <ClCompile Include="src\UTF32Encoding.cpp"/>
+    <ClCompile Include="src\UTF8Encoding.cpp"/>
+    <ClCompile Include="src\UTF8String.cpp"/>
+    <ClCompile Include="src\Windows1250Encoding.cpp"/>
+    <ClCompile Include="src\Windows1251Encoding.cpp"/>
+    <ClCompile Include="src\Windows1252Encoding.cpp"/>
+    <ClCompile Include="src\FileStreamFactory.cpp"/>
+    <ClCompile Include="src\URI.cpp"/>
+    <ClCompile Include="src\URIStreamFactory.cpp"/>
+    <ClCompile Include="src\URIStreamOpener.cpp"/>
+    <ClCompile Include="src\Task.cpp"/>
+    <ClCompile Include="src\TaskManager.cpp"/>
+    <ClCompile Include="src\TaskNotification.cpp"/>
+    <ClCompile Include="src\EventArgs.cpp"/>
+    <ClCompile Include="src\Hash.cpp"/>
+    <ClCompile Include="src\HashStatistic.cpp"/>
+    <ClCompile Include="src\Var.cpp"/>
+    <ClCompile Include="src\VarHolder.cpp"/>
+    <ClCompile Include="src\VarIterator.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Any.h" />
-    <ClInclude Include="include\Poco\Ascii.h" />
-    <ClInclude Include="include\Poco\AtomicCounter.h" />
-    <ClInclude Include="include\Poco\AutoPtr.h" />
-    <ClInclude Include="include\Poco\AutoReleasePool.h" />
-    <ClInclude Include="include\Poco\Buffer.h" />
-    <ClInclude Include="include\Poco\Bugcheck.h" />
-    <ClInclude Include="include\Poco\ByteOrder.h" />
-    <ClInclude Include="include\Poco\Checksum.h" />
-    <ClInclude Include="include\Poco\Config.h" />
-    <ClInclude Include="include\Poco\Debugger.h" />
-    <ClInclude Include="include\Poco\DirectoryWatcher.h" />
-    <ClInclude Include="include\Poco\DynamicAny.h" />
-    <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
-    <ClInclude Include="include\Poco\DynamicFactory.h" />
-    <ClInclude Include="include\Poco\Dynamic\Pair.h" />
-    <ClInclude Include="include\Poco\Dynamic\Struct.h" />
-    <ClInclude Include="include\Poco\Dynamic\Var.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
-    <ClInclude Include="include\Poco\Environment.h" />
-    <ClInclude Include="include\Poco\Environment_UNIX.h" />
-    <ClInclude Include="include\Poco\Environment_VMS.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-    <ClInclude Include="include\Poco\Error.h" />
-    <ClInclude Include="include\Poco\Exception.h" />
-    <ClInclude Include="include\Poco\FIFOBufferStream.h" />
-    <ClInclude Include="include\Poco\Format.h" />
-    <ClInclude Include="include\Poco\Foundation.h" />
-    <ClInclude Include="include\Poco\FPEnvironment.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_C99.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DEC.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
-    <ClInclude Include="include\Poco\Instantiator.h" />
-    <ClInclude Include="include\Poco\Latin2Encoding.h" />
-    <ClInclude Include="include\Poco\ListMap.h" />
-    <ClInclude Include="include\Poco\MemoryPool.h" />
-    <ClInclude Include="include\Poco\MetaProgramming.h" />
-    <ClInclude Include="include\Poco\NamedTuple.h" />
-    <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
-    <ClInclude Include="include\Poco\Nullable.h" />
-    <ClInclude Include="include\Poco\NumberFormatter.h" />
-    <ClInclude Include="include\Poco\NumberParser.h" />
-    <ClInclude Include="include\Poco\NumericString.h" />
-    <ClInclude Include="include\Poco\ObjectPool.h" />
-    <ClInclude Include="include\Poco\Optional.h" />
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
-    <ClInclude Include="include\Poco\Platform.h" />
-    <ClInclude Include="include\Poco\Platform_POSIX.h" />
-    <ClInclude Include="include\Poco\Platform_VMS.h" />
-    <ClInclude Include="include\Poco\Platform_WIN32.h" />
-    <ClInclude Include="include\Poco\Poco.h" />
-    <ClInclude Include="include\Poco\PriorityStrategy.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RefCountedObject.h" />
-    <ClInclude Include="include\Poco\SharedPtr.h" />
-    <ClInclude Include="include\Poco\SingletonHolder.h" />
-    <ClInclude Include="include\Poco\String.h" />
-    <ClInclude Include="include\Poco\StringTokenizer.h" />
-    <ClInclude Include="include\Poco\Tuple.h" />
-    <ClInclude Include="include\Poco\TypeList.h" />
-    <ClInclude Include="include\Poco\Types.h" />
-    <ClInclude Include="include\Poco\UnWindows.h" />
-    <ClInclude Include="include\Poco\UTF32Encoding.h" />
-    <ClInclude Include="include\Poco\Version.h" />
-    <ClInclude Include="include\Poco\Void.h" />
-    <ClInclude Include="include\Poco\Base32Decoder.h" />
-    <ClInclude Include="include\Poco\Base32Encoder.h" />
-    <ClInclude Include="include\Poco\Base64Decoder.h" />
-    <ClInclude Include="include\Poco\Base64Encoder.h" />
-    <ClInclude Include="include\Poco\BinaryReader.h" />
-    <ClInclude Include="include\Poco\BinaryWriter.h" />
-    <ClInclude Include="include\Poco\BufferAllocator.h" />
-    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h" />
-    <ClInclude Include="include\Poco\BufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\CountingStream.h" />
-    <ClInclude Include="include\Poco\DeflatingStream.h" />
-    <ClInclude Include="include\Poco\FileStream.h" />
-    <ClInclude Include="include\Poco\FileStream_POSIX.h" />
-    <ClInclude Include="include\Poco\FileStream_WIN32.h" />
-    <ClInclude Include="include\Poco\HexBinaryDecoder.h" />
-    <ClInclude Include="include\Poco\HexBinaryEncoder.h" />
-    <ClInclude Include="include\Poco\InflatingStream.h" />
-    <ClInclude Include="include\Poco\LineEndingConverter.h" />
-    <ClInclude Include="include\Poco\MemoryStream.h" />
-    <ClInclude Include="include\Poco\NullStream.h" />
-    <ClInclude Include="include\Poco\StreamCopier.h" />
-    <ClInclude Include="include\Poco\StreamTokenizer.h" />
-    <ClInclude Include="include\Poco\StreamUtil.h" />
-    <ClInclude Include="include\Poco\TeeStream.h" />
-    <ClInclude Include="include\Poco\Token.h" />
-    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\Windows1250Encoding.h" />
-    <ClInclude Include="include\Poco\Windows1251Encoding.h" />
-    <ClInclude Include="src\crc32.h" />
-    <ClInclude Include="src\deflate.h" />
-    <ClInclude Include="src\inffast.h" />
-    <ClInclude Include="src\inffixed.h" />
-    <ClInclude Include="src\inflate.h" />
-    <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\zconf.h" />
-    <ClInclude Include="src\zlib.h" />
-    <ClInclude Include="src\zutil.h" />
-    <ClInclude Include="include\Poco\ActiveDispatcher.h" />
-    <ClInclude Include="include\Poco\ActiveMethod.h" />
-    <ClInclude Include="include\Poco\ActiveResult.h" />
-    <ClInclude Include="include\Poco\ActiveRunnable.h" />
-    <ClInclude Include="include\Poco\ActiveStarter.h" />
-    <ClInclude Include="include\Poco\Activity.h" />
-    <ClInclude Include="include\Poco\Condition.h" />
-    <ClInclude Include="include\Poco\ErrorHandler.h" />
-    <ClInclude Include="include\Poco\Event.h" />
-    <ClInclude Include="include\Poco\Event_POSIX.h" />
-    <ClInclude Include="include\Poco\Event_WIN32.h" />
-    <ClInclude Include="include\Poco\Mutex.h" />
-    <ClInclude Include="include\Poco\Mutex_POSIX.h" />
-    <ClInclude Include="include\Poco\Mutex_WIN32.h" />
-    <ClInclude Include="include\Poco\Runnable.h" />
-    <ClInclude Include="include\Poco\RunnableAdapter.h" />
-    <ClInclude Include="include\Poco\RWLock.h" />
-    <ClInclude Include="include\Poco\RWLock_POSIX.h" />
-    <ClInclude Include="include\Poco\RWLock_WIN32.h" />
-    <ClInclude Include="include\Poco\ScopedLock.h" />
-    <ClInclude Include="include\Poco\ScopedUnlock.h" />
-    <ClInclude Include="include\Poco\Semaphore.h" />
-    <ClInclude Include="include\Poco\Semaphore_POSIX.h" />
-    <ClInclude Include="include\Poco\Semaphore_WIN32.h" />
-    <ClInclude Include="include\Poco\SignalHandler.h" />
-    <ClInclude Include="include\Poco\SynchronizedObject.h" />
-    <ClInclude Include="include\Poco\Thread.h" />
-    <ClInclude Include="include\Poco\Thread_POSIX.h" />
-    <ClInclude Include="include\Poco\Thread_WIN32.h" />
-    <ClInclude Include="include\Poco\ThreadLocal.h" />
-    <ClInclude Include="include\Poco\ThreadPool.h" />
-    <ClInclude Include="include\Poco\ThreadTarget.h" />
-    <ClInclude Include="include\Poco\Timer.h" />
-    <ClInclude Include="include\Poco\DigestEngine.h" />
-    <ClInclude Include="include\Poco\DigestStream.h" />
-    <ClInclude Include="include\Poco\HMACEngine.h" />
-    <ClInclude Include="include\Poco\MD4Engine.h" />
-    <ClInclude Include="include\Poco\MD5Engine.h" />
-    <ClInclude Include="include\Poco\Random.h" />
-    <ClInclude Include="include\Poco\RandomStream.h" />
-    <ClInclude Include="include\Poco\SHA1Engine.h" />
-    <ClInclude Include="include\Poco\ClassLibrary.h" />
-    <ClInclude Include="include\Poco\ClassLoader.h" />
-    <ClInclude Include="include\Poco\Manifest.h" />
-    <ClInclude Include="include\Poco\MetaObject.h" />
-    <ClInclude Include="include\Poco\SharedLibrary.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_VMS.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
-    <ClInclude Include="src\ucp.h" />
-    <ClInclude Include="include\Poco\RegularExpression.h" />
-    <ClInclude Include="include\Poco\ArchiveStrategy.h" />
-    <ClInclude Include="include\Poco\AsyncChannel.h" />
-    <ClInclude Include="include\Poco\Channel.h" />
-    <ClInclude Include="include\Poco\Configurable.h" />
-    <ClInclude Include="include\Poco\ConsoleChannel.h" />
-    <ClInclude Include="include\Poco\EventLogChannel.h" />
-    <ClInclude Include="include\Poco\FileChannel.h" />
-    <ClInclude Include="include\Poco\Formatter.h" />
-    <ClInclude Include="include\Poco\FormattingChannel.h" />
-    <ClInclude Include="include\Poco\LogFile.h" />
-    <ClInclude Include="include\Poco\LogFile_STD.h" />
-    <ClInclude Include="include\Poco\LogFile_VMS.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
-    <ClInclude Include="include\Poco\Logger.h" />
-    <ClInclude Include="include\Poco\LoggingFactory.h" />
-    <ClInclude Include="include\Poco\LoggingRegistry.h" />
-    <ClInclude Include="include\Poco\LogStream.h" />
-    <ClInclude Include="include\Poco\Message.h" />
-    <ClInclude Include="include\Poco\NullChannel.h" />
-    <ClInclude Include="include\Poco\OpcomChannel.h" />
-    <ClInclude Include="include\Poco\PatternFormatter.h" />
-    <ClInclude Include="src\pocomsg.h" />
-    <ClInclude Include="include\Poco\PurgeStrategy.h" />
-    <ClInclude Include="include\Poco\RotateStrategy.h" />
-    <ClInclude Include="include\Poco\SimpleFileChannel.h" />
-    <ClInclude Include="include\Poco\SplitterChannel.h" />
-    <ClInclude Include="include\Poco\StreamChannel.h" />
-    <ClInclude Include="include\Poco\SyslogChannel.h" />
-    <ClInclude Include="include\Poco\WindowsConsoleChannel.h" />
-    <ClInclude Include="include\Poco\AbstractObserver.h" />
-    <ClInclude Include="include\Poco\NObserver.h" />
-    <ClInclude Include="include\Poco\Notification.h" />
-    <ClInclude Include="include\Poco\NotificationCenter.h" />
-    <ClInclude Include="include\Poco\NotificationQueue.h" />
-    <ClInclude Include="include\Poco\Observer.h" />
-    <ClInclude Include="include\Poco\PriorityNotificationQueue.h" />
-    <ClInclude Include="include\Poco\TimedNotificationQueue.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
-    <ClInclude Include="include\Poco\File.h" />
-    <ClInclude Include="include\Poco\File_UNIX.h" />
-    <ClInclude Include="include\Poco\File_VMS.h" />
-    <ClInclude Include="include\Poco\File_WIN32.h" />
-    <ClInclude Include="include\Poco\File_WIN32U.h" />
-    <ClInclude Include="include\Poco\Glob.h" />
-    <ClInclude Include="include\Poco\Path.h" />
-    <ClInclude Include="include\Poco\Path_UNIX.h" />
-    <ClInclude Include="include\Poco\Path_VMS.h" />
-    <ClInclude Include="include\Poco\Path_WIN32.h" />
-    <ClInclude Include="include\Poco\Path_WIN32U.h" />
-    <ClInclude Include="include\Poco\TemporaryFile.h" />
-    <ClInclude Include="include\Poco\NamedEvent.h" />
-    <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedEvent_VMS.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
-    <ClInclude Include="include\Poco\NamedMutex.h" />
-    <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedMutex_VMS.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
-    <ClInclude Include="include\Poco\Pipe.h" />
-    <ClInclude Include="include\Poco\PipeImpl.h" />
-    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h" />
-    <ClInclude Include="include\Poco\PipeImpl_POSIX.h" />
-    <ClInclude Include="include\Poco\PipeImpl_WIN32.h" />
-    <ClInclude Include="include\Poco\PipeStream.h" />
-    <ClInclude Include="include\Poco\Process.h" />
-    <ClInclude Include="include\Poco\Process_UNIX.h" />
-    <ClInclude Include="include\Poco\Process_VMS.h" />
-    <ClInclude Include="include\Poco\Process_WIN32.h" />
-    <ClInclude Include="include\Poco\Process_WIN32U.h" />
-    <ClInclude Include="include\Poco\SharedMemory.h" />
-    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />
-    <ClInclude Include="include\Poco\SharedMemory_POSIX.h" />
-    <ClInclude Include="include\Poco\SharedMemory_WIN32.h" />
-    <ClInclude Include="include\Poco\UUID.h" />
-    <ClInclude Include="include\Poco\UUIDGenerator.h" />
-    <ClInclude Include="include\Poco\Clock.h" />
-    <ClInclude Include="include\Poco\DateTime.h" />
-    <ClInclude Include="include\Poco\DateTimeFormat.h" />
-    <ClInclude Include="include\Poco\DateTimeFormatter.h" />
-    <ClInclude Include="include\Poco\DateTimeParser.h" />
-    <ClInclude Include="include\Poco\LocalDateTime.h" />
-    <ClInclude Include="include\Poco\Stopwatch.h" />
-    <ClInclude Include="include\Poco\Timespan.h" />
-    <ClInclude Include="include\Poco\Timestamp.h" />
-    <ClInclude Include="include\Poco\Timezone.h" />
-    <ClInclude Include="include\Poco\ASCIIEncoding.h" />
-    <ClInclude Include="include\Poco\Latin1Encoding.h" />
-    <ClInclude Include="include\Poco\Latin9Encoding.h" />
-    <ClInclude Include="include\Poco\StreamConverter.h" />
-    <ClInclude Include="include\Poco\TextBufferIterator.h" />
-    <ClInclude Include="include\Poco\TextConverter.h" />
-    <ClInclude Include="include\Poco\TextEncoding.h" />
-    <ClInclude Include="include\Poco\TextIterator.h" />
-    <ClInclude Include="include\Poco\Unicode.h" />
-    <ClInclude Include="include\Poco\UnicodeConverter.h" />
-    <ClInclude Include="include\Poco\UTF16Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8String.h" />
-    <ClInclude Include="include\Poco\Windows1252Encoding.h" />
-    <ClInclude Include="include\Poco\FileStreamFactory.h" />
-    <ClInclude Include="include\Poco\URI.h" />
-    <ClInclude Include="include\Poco\URIStreamFactory.h" />
-    <ClInclude Include="include\Poco\URIStreamOpener.h" />
-    <ClInclude Include="include\Poco\Task.h" />
-    <ClInclude Include="include\Poco\TaskManager.h" />
-    <ClInclude Include="include\Poco\TaskNotification.h" />
-    <ClInclude Include="include\Poco\AbstractDelegate.h" />
-    <ClInclude Include="include\Poco\AbstractEvent.h" />
-    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\BasicEvent.h" />
-    <ClInclude Include="include\Poco\DefaultStrategy.h" />
-    <ClInclude Include="include\Poco\Delegate.h" />
-    <ClInclude Include="include\Poco\EventArgs.h" />
-    <ClInclude Include="include\Poco\Expire.h" />
-    <ClInclude Include="include\Poco\FIFOEvent.h" />
-    <ClInclude Include="include\Poco\FIFOStrategy.h" />
-    <ClInclude Include="include\Poco\FunctionDelegate.h" />
-    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\NotificationStrategy.h" />
-    <ClInclude Include="include\Poco\PriorityDelegate.h" />
-    <ClInclude Include="include\Poco\PriorityEvent.h" />
-    <ClInclude Include="include\Poco\PriorityExpire.h" />
-    <ClInclude Include="include\Poco\AbstractCache.h" />
-    <ClInclude Include="include\Poco\AbstractStrategy.h" />
-    <ClInclude Include="include\Poco\AccessExpireCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\ExpireCache.h" />
-    <ClInclude Include="include\Poco\ExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\ExpireStrategy.h" />
-    <ClInclude Include="include\Poco\KeyValueArgs.h" />
-    <ClInclude Include="include\Poco\LRUCache.h" />
-    <ClInclude Include="include\Poco\LRUStrategy.h" />
-    <ClInclude Include="include\Poco\StrategyCollection.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\UniqueExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ValidArgs.h" />
-    <ClInclude Include="include\Poco\Hash.h" />
-    <ClInclude Include="include\Poco\HashFunction.h" />
-    <ClInclude Include="include\Poco\HashMap.h" />
-    <ClInclude Include="include\Poco\HashSet.h" />
-    <ClInclude Include="include\Poco\HashStatistic.h" />
-    <ClInclude Include="include\Poco\HashTable.h" />
-    <ClInclude Include="include\Poco\LinearHashTable.h" />
-    <ClInclude Include="include\Poco\SimpleHashTable.h" />
+    <ClInclude Include="include\Poco\Any.h"/>
+    <ClInclude Include="include\Poco\Ascii.h"/>
+    <ClInclude Include="include\Poco\AtomicCounter.h"/>
+    <ClInclude Include="include\Poco\AutoPtr.h"/>
+    <ClInclude Include="include\Poco\AutoReleasePool.h"/>
+    <ClInclude Include="include\Poco\Buffer.h"/>
+    <ClInclude Include="include\Poco\Bugcheck.h"/>
+    <ClInclude Include="include\Poco\ByteOrder.h"/>
+    <ClInclude Include="include\Poco\Checksum.h"/>
+    <ClInclude Include="include\Poco\Config.h"/>
+    <ClInclude Include="include\Poco\Debugger.h"/>
+    <ClInclude Include="include\Poco\DynamicAny.h"/>
+    <ClInclude Include="include\Poco\DynamicAnyHolder.h"/>
+    <ClInclude Include="include\Poco\DynamicFactory.h"/>
+    <ClInclude Include="include\Poco\Environment.h"/>
+    <ClInclude Include="include\Poco\Environment_UNIX.h"/>
+    <ClInclude Include="include\Poco\Environment_VMS.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Error.h"/>
+    <ClInclude Include="include\Poco\Exception.h"/>
+    <ClInclude Include="include\Poco\FIFOBuffer.h"/>
+    <ClInclude Include="include\Poco\Format.h"/>
+    <ClInclude Include="include\Poco\Foundation.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_C99.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DEC.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_SUN.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Instantiator.h"/>
+    <ClInclude Include="include\Poco\JSONString.h"/>
+    <ClInclude Include="include\Poco\MemoryPool.h"/>
+    <ClInclude Include="include\Poco\MetaProgramming.h"/>
+    <ClInclude Include="include\Poco\NamedTuple.h"/>
+    <ClInclude Include="include\Poco\NestedDiagnosticContext.h"/>
+    <ClInclude Include="include\Poco\Nullable.h"/>
+    <ClInclude Include="include\Poco\NumberFormatter.h"/>
+    <ClInclude Include="include\Poco\NumberParser.h"/>
+    <ClInclude Include="include\Poco\NumericString.h"/>
+    <ClInclude Include="include\Poco\ObjectPool.h"/>
+    <ClInclude Include="include\Poco\Optional.h"/>
+    <ClInclude Include="include\Poco\Platform.h"/>
+    <ClInclude Include="include\Poco\Platform_POSIX.h"/>
+    <ClInclude Include="include\Poco\Platform_VMS.h"/>
+    <ClInclude Include="include\Poco\Platform_WIN32.h"/>
+    <ClInclude Include="include\Poco\Poco.h"/>
+    <ClInclude Include="include\Poco\RefCountedObject.h"/>
+    <ClInclude Include="include\Poco\SharedPtr.h"/>
+    <ClInclude Include="include\Poco\SingletonHolder.h"/>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\String.h"/>
+    <ClInclude Include="include\Poco\StringTokenizer.h"/>
+    <ClInclude Include="include\Poco\Tuple.h"/>
+    <ClInclude Include="include\Poco\TypeList.h"/>
+    <ClInclude Include="include\Poco\Types.h"/>
+    <ClInclude Include="include\Poco\UnWindows.h"/>
+    <ClInclude Include="include\Poco\Version.h"/>
+    <ClInclude Include="include\Poco\Void.h"/>
+    <ClInclude Include="include\Poco\Base32Decoder.h"/>
+    <ClInclude Include="include\Poco\Base32Encoder.h"/>
+    <ClInclude Include="include\Poco\Base64Decoder.h"/>
+    <ClInclude Include="include\Poco\Base64Encoder.h"/>
+    <ClInclude Include="include\Poco\BinaryReader.h"/>
+    <ClInclude Include="include\Poco\BinaryWriter.h"/>
+    <ClInclude Include="include\Poco\BufferAllocator.h"/>
+    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h"/>
+    <ClInclude Include="include\Poco\BufferedStreamBuf.h"/>
+    <ClInclude Include="include\Poco\CountingStream.h"/>
+    <ClInclude Include="include\Poco\DeflatingStream.h"/>
+    <ClInclude Include="include\Poco\FileStream.h"/>
+    <ClInclude Include="include\Poco\FileStream_POSIX.h"/>
+    <ClInclude Include="include\Poco\FileStream_WIN32.h"/>
+    <ClInclude Include="include\Poco\HexBinaryDecoder.h"/>
+    <ClInclude Include="include\Poco\HexBinaryEncoder.h"/>
+    <ClInclude Include="include\Poco\InflatingStream.h"/>
+    <ClInclude Include="include\Poco\LineEndingConverter.h"/>
+    <ClInclude Include="include\Poco\MemoryStream.h"/>
+    <ClInclude Include="include\Poco\NullStream.h"/>
+    <ClInclude Include="include\Poco\StreamCopier.h"/>
+    <ClInclude Include="include\Poco\StreamTokenizer.h"/>
+    <ClInclude Include="include\Poco\StreamUtil.h"/>
+    <ClInclude Include="include\Poco\TeeStream.h"/>
+    <ClInclude Include="include\Poco\Token.h"/>
+    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h"/>
+    <ClInclude Include="src\crc32.h"/>
+    <ClInclude Include="src\deflate.h"/>
+    <ClInclude Include="src\inffast.h"/>
+    <ClInclude Include="src\inffixed.h"/>
+    <ClInclude Include="src\inflate.h"/>
+    <ClInclude Include="src\inftrees.h"/>
+    <ClInclude Include="src\trees.h"/>
+    <ClInclude Include="src\zconf.h"/>
+    <ClInclude Include="src\zlib.h"/>
+    <ClInclude Include="src\zutil.h"/>
+    <ClInclude Include="include\Poco\ActiveDispatcher.h"/>
+    <ClInclude Include="include\Poco\ActiveMethod.h"/>
+    <ClInclude Include="include\Poco\ActiveResult.h"/>
+    <ClInclude Include="include\Poco\ActiveRunnable.h"/>
+    <ClInclude Include="include\Poco\ActiveStarter.h"/>
+    <ClInclude Include="include\Poco\Activity.h"/>
+    <ClInclude Include="include\Poco\Condition.h"/>
+    <ClInclude Include="include\Poco\ErrorHandler.h"/>
+    <ClInclude Include="include\Poco\Event.h"/>
+    <ClInclude Include="include\Poco\Event_POSIX.h"/>
+    <ClInclude Include="include\Poco\Event_WIN32.h"/>
+    <ClInclude Include="include\Poco\Mutex.h"/>
+    <ClInclude Include="include\Poco\Mutex_POSIX.h"/>
+    <ClInclude Include="include\Poco\Mutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\Runnable.h"/>
+    <ClInclude Include="include\Poco\RunnableAdapter.h"/>
+    <ClInclude Include="include\Poco\RWLock.h"/>
+    <ClInclude Include="include\Poco\RWLock_POSIX.h"/>
+    <ClInclude Include="include\Poco\RWLock_WIN32.h"/>
+    <ClInclude Include="include\Poco\ScopedLock.h"/>
+    <ClInclude Include="include\Poco\ScopedUnlock.h"/>
+    <ClInclude Include="include\Poco\Semaphore.h"/>
+    <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
+    <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
+    <ClInclude Include="include\Poco\SignalHandler.h"/>
+    <ClInclude Include="include\Poco\SynchronizedObject.h"/>
+    <ClInclude Include="include\Poco\Thread.h"/>
+    <ClInclude Include="include\Poco\Thread_POSIX.h"/>
+    <ClInclude Include="include\Poco\Thread_WIN32.h"/>
+    <ClInclude Include="include\Poco\ThreadLocal.h"/>
+    <ClInclude Include="include\Poco\ThreadPool.h"/>
+    <ClInclude Include="include\Poco\ThreadTarget.h"/>
+    <ClInclude Include="include\Poco\Timer.h"/>
+    <ClInclude Include="include\Poco\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\DigestStream.h"/>
+    <ClInclude Include="include\Poco\HMACEngine.h"/>
+    <ClInclude Include="include\Poco\MD4Engine.h"/>
+    <ClInclude Include="include\Poco\MD5Engine.h"/>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h"/>
+    <ClInclude Include="include\Poco\Random.h"/>
+    <ClInclude Include="include\Poco\RandomStream.h"/>
+    <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\ClassLibrary.h"/>
+    <ClInclude Include="include\Poco\ClassLoader.h"/>
+    <ClInclude Include="include\Poco\Manifest.h"/>
+    <ClInclude Include="include\Poco\MetaObject.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_VMS.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"/>
+    <ClInclude Include="src\pcre.h"/>
+    <ClInclude Include="src\pcre_config.h"/>
+    <ClInclude Include="src\pcre_internal.h"/>
+    <ClInclude Include="src\ucp.h"/>
+    <ClInclude Include="include\Poco\RegularExpression.h"/>
+    <ClInclude Include="include\Poco\ArchiveStrategy.h"/>
+    <ClInclude Include="include\Poco\AsyncChannel.h"/>
+    <ClInclude Include="include\Poco\Channel.h"/>
+    <ClInclude Include="include\Poco\Configurable.h"/>
+    <ClInclude Include="include\Poco\ConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\EventLogChannel.h"/>
+    <ClInclude Include="include\Poco\FileChannel.h"/>
+    <ClInclude Include="include\Poco\Formatter.h"/>
+    <ClInclude Include="include\Poco\FormattingChannel.h"/>
+    <ClInclude Include="include\Poco\LogFile.h"/>
+    <ClInclude Include="include\Poco\LogFile_STD.h"/>
+    <ClInclude Include="include\Poco\LogFile_VMS.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Logger.h"/>
+    <ClInclude Include="include\Poco\LoggingFactory.h"/>
+    <ClInclude Include="include\Poco\LoggingRegistry.h"/>
+    <ClInclude Include="include\Poco\LogStream.h"/>
+    <ClInclude Include="include\Poco\Message.h"/>
+    <ClInclude Include="include\Poco\NullChannel.h"/>
+    <ClInclude Include="include\Poco\OpcomChannel.h"/>
+    <ClInclude Include="include\Poco\PatternFormatter.h"/>
+    <ClInclude Include="src\pocomsg.h"/>
+    <ClInclude Include="include\Poco\PurgeStrategy.h"/>
+    <ClInclude Include="include\Poco\RotateStrategy.h"/>
+    <ClInclude Include="include\Poco\SimpleFileChannel.h"/>
+    <ClInclude Include="include\Poco\SplitterChannel.h"/>
+    <ClInclude Include="include\Poco\StreamChannel.h"/>
+    <ClInclude Include="include\Poco\SyslogChannel.h"/>
+    <ClInclude Include="include\Poco\WindowsConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\AbstractObserver.h"/>
+    <ClInclude Include="include\Poco\NObserver.h"/>
+    <ClInclude Include="include\Poco\Notification.h"/>
+    <ClInclude Include="include\Poco\NotificationCenter.h"/>
+    <ClInclude Include="include\Poco\NotificationQueue.h"/>
+    <ClInclude Include="include\Poco\Observer.h"/>
+    <ClInclude Include="include\Poco\PriorityNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\TimedNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"/>
+    <ClInclude Include="include\Poco\DirectoryWatcher.h"/>
+    <ClInclude Include="include\Poco\File.h"/>
+    <ClInclude Include="include\Poco\File_UNIX.h"/>
+    <ClInclude Include="include\Poco\File_VMS.h"/>
+    <ClInclude Include="include\Poco\File_WIN32.h"/>
+    <ClInclude Include="include\Poco\File_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Glob.h"/>
+    <ClInclude Include="include\Poco\Path.h"/>
+    <ClInclude Include="include\Poco\Path_UNIX.h"/>
+    <ClInclude Include="include\Poco\Path_VMS.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32U.h"/>
+    <ClInclude Include="include\Poco\TemporaryFile.h"/>
+    <ClInclude Include="include\Poco\NamedEvent.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h"/>
+    <ClInclude Include="include\Poco\NamedMutex.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Pipe.h"/>
+    <ClInclude Include="include\Poco\PipeImpl.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_POSIX.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_WIN32.h"/>
+    <ClInclude Include="include\Poco\PipeStream.h"/>
+    <ClInclude Include="include\Poco\Process.h"/>
+    <ClInclude Include="include\Poco\Process_UNIX.h"/>
+    <ClInclude Include="include\Poco\Process_VMS.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32U.h"/>
+    <ClInclude Include="include\Poco\SharedMemory.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_POSIX.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_WIN32.h"/>
+    <ClInclude Include="include\Poco\UUID.h"/>
+    <ClInclude Include="include\Poco\UUIDGenerator.h"/>
+    <ClInclude Include="include\Poco\Clock.h"/>
+    <ClInclude Include="include\Poco\DateTime.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormat.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormatter.h"/>
+    <ClInclude Include="include\Poco\DateTimeParser.h"/>
+    <ClInclude Include="include\Poco\LocalDateTime.h"/>
+    <ClInclude Include="include\Poco\Stopwatch.h"/>
+    <ClInclude Include="include\Poco\Timespan.h"/>
+    <ClInclude Include="include\Poco\Timestamp.h"/>
+    <ClInclude Include="include\Poco\Timezone.h"/>
+    <ClInclude Include="include\Poco\ASCIIEncoding.h"/>
+    <ClInclude Include="include\Poco\Latin1Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin2Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin9Encoding.h"/>
+    <ClInclude Include="include\Poco\ListMap.h"/>
+    <ClInclude Include="include\Poco\StreamConverter.h"/>
+    <ClInclude Include="include\Poco\TextBufferIterator.h"/>
+    <ClInclude Include="include\Poco\TextConverter.h"/>
+    <ClInclude Include="include\Poco\TextEncoding.h"/>
+    <ClInclude Include="include\Poco\TextIterator.h"/>
+    <ClInclude Include="include\Poco\Unicode.h"/>
+    <ClInclude Include="include\Poco\UnicodeConverter.h"/>
+    <ClInclude Include="include\Poco\UTF16Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF32Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8String.h"/>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1252Encoding.h"/>
+    <ClInclude Include="include\Poco\FileStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URI.h"/>
+    <ClInclude Include="include\Poco\URIStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URIStreamOpener.h"/>
+    <ClInclude Include="include\Poco\Task.h"/>
+    <ClInclude Include="include\Poco\TaskManager.h"/>
+    <ClInclude Include="include\Poco\TaskNotification.h"/>
+    <ClInclude Include="include\Poco\AbstractDelegate.h"/>
+    <ClInclude Include="include\Poco\AbstractEvent.h"/>
+    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\BasicEvent.h"/>
+    <ClInclude Include="include\Poco\DefaultStrategy.h"/>
+    <ClInclude Include="include\Poco\Delegate.h"/>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h"/>
+    <ClInclude Include="include\Poco\EventArgs.h"/>
+    <ClInclude Include="include\Poco\Expire.h"/>
+    <ClInclude Include="include\Poco\FIFOEvent.h"/>
+    <ClInclude Include="include\Poco\FIFOStrategy.h"/>
+    <ClInclude Include="include\Poco\FunctionDelegate.h"/>
+    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\NotificationStrategy.h"/>
+    <ClInclude Include="include\Poco\PriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\PriorityEvent.h"/>
+    <ClInclude Include="include\Poco\PriorityExpire.h"/>
+    <ClInclude Include="include\Poco\PriorityStrategy.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h"/>
+    <ClInclude Include="include\Poco\AbstractCache.h"/>
+    <ClInclude Include="include\Poco\AbstractStrategy.h"/>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\AccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\ExpireCache.h"/>
+    <ClInclude Include="include\Poco\ExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\ExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\KeyValueArgs.h"/>
+    <ClInclude Include="include\Poco\LRUCache.h"/>
+    <ClInclude Include="include\Poco\LRUStrategy.h"/>
+    <ClInclude Include="include\Poco\StrategyCollection.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ValidArgs.h"/>
+    <ClInclude Include="include\Poco\Hash.h"/>
+    <ClInclude Include="include\Poco\HashFunction.h"/>
+    <ClInclude Include="include\Poco\HashMap.h"/>
+    <ClInclude Include="include\Poco\HashSet.h"/>
+    <ClInclude Include="include\Poco\HashStatistic.h"/>
+    <ClInclude Include="include\Poco\HashTable.h"/>
+    <ClInclude Include="include\Poco\LinearHashTable.h"/>
+    <ClInclude Include="include\Poco\SimpleHashTable.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Pair.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Struct.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Var.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarHolder.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarIterator.h"/>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\pocomsg.mc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ResourceCompile Include="src\pocomsg.rc"/>
     <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>
-    <ResourceCompile Include="src\pocomsg.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters
index b00691dc3d..f869e8192e 100644
--- a/Foundation/Foundation_x64_vs110.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs110.vcxproj.filters
@@ -2,190 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{eed22eb8-615d-47c6-9148-bf4b06dcba89}</UniqueIdentifier>
+      <UniqueIdentifier>{b6ff5f43-506b-4f4c-9cfb-b328f8c484e1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{e4b65ef2-2d99-41ac-8fce-ecce748757fe}</UniqueIdentifier>
+      <UniqueIdentifier>{86efda82-70a5-4122-bfdd-9331eb173325}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{15b1d37c-f762-444f-943f-c1886dd9510c}</UniqueIdentifier>
+      <UniqueIdentifier>{328df5d3-a777-40bb-af10-96b18ad3a081}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{9e3b59da-7f2c-4e28-8b35-7c3e8abf2ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{0602d0db-8d4d-4f94-8d63-a6a524a6f0eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{faa35c18-be02-43c4-8d4d-7e63c97447f0}</UniqueIdentifier>
+      <UniqueIdentifier>{2b3e0887-371f-4b54-b572-1dce70eb2c83}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{642a8ece-5f25-439e-aebc-f0aabc17a24d}</UniqueIdentifier>
+      <UniqueIdentifier>{960859a5-bc62-46da-8d70-d0435b37a1e1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\zlib">
-      <UniqueIdentifier>{873a6a3d-b159-495f-b307-908be9d0ca39}</UniqueIdentifier>
+      <UniqueIdentifier>{9975c6e4-226b-49d8-914f-1e29588dbbad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{243ce5c9-276b-41e0-b226-d2e8c4eb399d}</UniqueIdentifier>
+      <UniqueIdentifier>{e4ac9092-a5f8-44e4-870b-eeb357a43024}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{171bf60e-c5e8-41a6-a8c4-4e5035ac40e4}</UniqueIdentifier>
+      <UniqueIdentifier>{f48ca447-87ad-4b57-9fbd-d550ff80beb2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{897efa40-8fd5-48ea-951f-5025e7bf316d}</UniqueIdentifier>
+      <UniqueIdentifier>{f89b704a-4abc-4d9d-a671-958102fea3f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{5449ee1f-18c8-46f2-ba3b-4851c2bed9be}</UniqueIdentifier>
+      <UniqueIdentifier>{f607d16d-f1a0-4f93-90bf-c4dbb54b9b15}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{ed334c78-ef4a-42a2-b164-842b035b2891}</UniqueIdentifier>
+      <UniqueIdentifier>{d19eeefe-6b61-4db1-a96f-6eb843f959fd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{cea4c790-2034-4779-a543-bb578ccb1950}</UniqueIdentifier>
+      <UniqueIdentifier>{b28f8bc8-b78d-42c4-9238-83626df42c99}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{69675fb8-11fe-4ac9-b434-5fbfde370465}</UniqueIdentifier>
+      <UniqueIdentifier>{fce789fa-d6df-4884-8c89-20e0044a6f3f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{7adff1e1-d832-49d7-80fe-0c84b92932f4}</UniqueIdentifier>
+      <UniqueIdentifier>{031cf442-2db9-4062-891f-2217af925281}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{d16afff9-2b9b-4afc-9417-fc60165a4820}</UniqueIdentifier>
+      <UniqueIdentifier>{e3094b3c-2e21-499b-8458-dbecf70ce76f}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression">
-      <UniqueIdentifier>{27e4e676-acfb-4bdb-a9f5-1efd2d0b1e0e}</UniqueIdentifier>
+      <UniqueIdentifier>{c58dee52-7da0-4271-b92c-a543936db142}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{15ad7723-f5d6-4b0c-adb8-4d1cf5f47476}</UniqueIdentifier>
+      <UniqueIdentifier>{1c4a2033-f755-42d4-a7eb-2125ddd5ac47}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Source Files">
-      <UniqueIdentifier>{88f53776-2079-4215-babb-230b3d06bd58}</UniqueIdentifier>
+      <UniqueIdentifier>{9c8707f0-59ab-456a-864c-d7eadb52e036}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
-      <UniqueIdentifier>{d241990d-d11f-4929-8ffa-a2c060cb18cb}</UniqueIdentifier>
+      <UniqueIdentifier>{dd600278-fabd-4538-a832-0ada9b26b0c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{abf63bab-bd68-407d-87dd-7b49eb167dd1}</UniqueIdentifier>
+      <UniqueIdentifier>{f6002cb3-a01e-4124-919f-9d1431f1d302}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{cf605dfb-6591-4203-8b65-244a90cf5766}</UniqueIdentifier>
+      <UniqueIdentifier>{2ee5921a-f093-4279-a82f-4720a758703e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{7ce7dd5c-bf1a-441c-83cd-ff01664514ff}</UniqueIdentifier>
+      <UniqueIdentifier>{4ac11af9-6a49-4650-b959-defc9a303618}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{ddb92b9f-2791-4041-8669-7cbb7db75308}</UniqueIdentifier>
+      <UniqueIdentifier>{6faff899-58b9-410e-8b1a-a35e0d203a46}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Message Files">
-      <UniqueIdentifier>{e96537d4-d193-4b36-8259-0f00191ed830}</UniqueIdentifier>
+      <UniqueIdentifier>{ce7aae42-488c-4e9e-8a3d-03bdf9771c37}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Resource Files">
-      <UniqueIdentifier>{3822dfb8-f1d9-483b-8669-692755d5f989}</UniqueIdentifier>
+      <UniqueIdentifier>{cf713cb8-93be-47f3-9e8e-ebd4191292a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{0d24bd5b-b5b0-408a-816b-2debac7c8161}</UniqueIdentifier>
+      <UniqueIdentifier>{54ae87b6-3eeb-4d53-9688-1ef1c799f9de}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{d61210ea-a9c7-4f70-9fc4-c78bfa4287d3}</UniqueIdentifier>
+      <UniqueIdentifier>{19f2e41e-d900-4d25-9289-5c1f09246e73}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ef783201-716d-4b64-b84d-4f214d2ed377}</UniqueIdentifier>
+      <UniqueIdentifier>{a2239a0d-d15f-4afd-a7b6-a5a67afa9181}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{13721cc0-4976-4884-8b33-d2929ccad127}</UniqueIdentifier>
+      <UniqueIdentifier>{9941ae46-ba4c-446f-a0a8-fc7453516285}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{b1219e5a-7cd3-4250-9a9f-48047a814621}</UniqueIdentifier>
+      <UniqueIdentifier>{6b14e937-99b9-4d19-b351-e83b5dec45c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{0d0d9117-9915-4251-a7e7-aa65a323166b}</UniqueIdentifier>
+      <UniqueIdentifier>{fde7ba0c-01dc-413e-9e78-71a982f1456c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{e579e608-e12e-42be-8c49-cc9a9581bedd}</UniqueIdentifier>
+      <UniqueIdentifier>{93d9bcb1-f243-4f54-8a33-55e79b03e70a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{c0302ef2-2ddd-4ab6-859c-f9d838083207}</UniqueIdentifier>
+      <UniqueIdentifier>{0218268c-612b-400c-ac12-8074ce7f7179}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{902f59de-5b3b-4fa9-81fb-400142cf8ce8}</UniqueIdentifier>
+      <UniqueIdentifier>{08644464-8b3d-4ed3-ab07-52cf0bb31b8c}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{c8bb647e-3992-4e61-8574-c58262745a52}</UniqueIdentifier>
+      <UniqueIdentifier>{ef4bdf56-79e4-4a0a-8be1-99ffeb9596bd}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{af0928d0-f150-4d35-bde2-6312ea9d5953}</UniqueIdentifier>
+      <UniqueIdentifier>{718edecf-5c67-4013-8dbc-c420aec5e574}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{a9e6090f-3b21-437d-9a93-50f6c3d6bd29}</UniqueIdentifier>
+      <UniqueIdentifier>{ce260e93-88d1-4c1e-95e0-6d24ca6f9f1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{3d02f5d0-b1b5-4b93-9a47-063ad3f08e61}</UniqueIdentifier>
+      <UniqueIdentifier>{cf5867fb-aec1-474a-9ef9-cc71c424ef60}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{18c6c8e3-0b20-4afb-bf19-c4558e3568a9}</UniqueIdentifier>
+      <UniqueIdentifier>{46e2e249-a5e3-4e97-9168-803fe122abea}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{0dbde655-aa5c-4dce-9880-3993a89efde5}</UniqueIdentifier>
+      <UniqueIdentifier>{75bfd9d3-974b-41c4-ba5c-f8d71275bbbc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{fdbf3495-96a6-4254-9f4c-8e420f5c568b}</UniqueIdentifier>
+      <UniqueIdentifier>{7a8dcfc3-f305-486e-b210-96f2fac44675}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{02e6ad4a-26c8-4ab2-af6c-4a39ee850242}</UniqueIdentifier>
+      <UniqueIdentifier>{882da44f-4e0b-4670-8889-00e86ef6bee1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{08fcdce9-22a1-4336-b1b7-abf97d9a541a}</UniqueIdentifier>
+      <UniqueIdentifier>{44e45e7e-849e-4d3a-86a2-12b0f97638f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{fb3b5c0e-07cb-460f-bbf2-c3836bc22692}</UniqueIdentifier>
+      <UniqueIdentifier>{e6d45c36-1c10-46bd-9b65-2478d99f529a}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{82260cc1-f20d-4647-829a-3f213e88a388}</UniqueIdentifier>
+      <UniqueIdentifier>{7ad86748-a9a3-4f11-9523-3824e7602a1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{dbd582a0-df3b-4475-abb5-043be9a79a7c}</UniqueIdentifier>
+      <UniqueIdentifier>{e55b1ddc-4a80-4a4e-aa02-ba5434692d34}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{41f46e9d-8090-426b-8562-e4d22fd2937b}</UniqueIdentifier>
+      <UniqueIdentifier>{bcebb2e8-399f-461e-87a7-778fefa3a869}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1ccf0703-d483-4a72-8abb-f601911839cc}</UniqueIdentifier>
+      <UniqueIdentifier>{2f1d9174-3bb4-49dc-b014-3d7f86a20c41}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{ea621b2c-cdcf-4710-adb4-90265b48d2ca}</UniqueIdentifier>
+      <UniqueIdentifier>{194aefa4-4678-483c-8789-305bc0d46fe7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events">
-      <UniqueIdentifier>{dc06be98-7865-469a-a0c6-f01fe2ebeeb8}</UniqueIdentifier>
+      <UniqueIdentifier>{d6a4f853-0174-404f-aabd-8c1e12fbcf06}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Header Files">
-      <UniqueIdentifier>{c179291d-1823-4297-9710-6af7123f8a91}</UniqueIdentifier>
+      <UniqueIdentifier>{06866745-4b3e-48f0-8468-60a2867645d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Source Files">
-      <UniqueIdentifier>{8831307b-6f33-460f-9069-51ee7563995d}</UniqueIdentifier>
+      <UniqueIdentifier>{fe6ae7f1-dbf2-45f9-9ff2-d033b144df5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{0aab1e27-6341-4b50-8795-404c518d783e}</UniqueIdentifier>
+      <UniqueIdentifier>{99794a6b-0d95-400b-a1f4-55aa3321f380}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{5cbbf1df-2a1b-47e3-a217-addab713c565}</UniqueIdentifier>
+      <UniqueIdentifier>{e3ea585f-ac20-415a-be8b-fbb78b4e2b22}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{0f008454-6d63-4c65-9b75-7717a897a428}</UniqueIdentifier>
+      <UniqueIdentifier>{4c2edf84-d248-480e-a2c4-100bb13ea188}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{fb2c3d90-efdb-434a-a011-3097b35373e4}</UniqueIdentifier>
+      <UniqueIdentifier>{6d29d7a0-5956-456b-b713-3750677b2cac}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{8db03882-c794-4ba9-b65e-e5765939e973}</UniqueIdentifier>
+      <UniqueIdentifier>{40d8bb1b-ffa9-4124-b300-59734d767c82}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{4c9c3a5f-93fa-4852-96a3-c2159bd98556}</UniqueIdentifier>
+      <UniqueIdentifier>{9e57da8c-e7c9-482e-8c54-5d4aa949efba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{52837383-e5d2-4f5e-bd44-eac0b06f79e0}</UniqueIdentifier>
+      <UniqueIdentifier>{01588d7d-5ad2-4c04-a4cd-c61e60fe7d90}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{4a82831e-73af-4f45-9096-d5a82f5f2052}</UniqueIdentifier>
+      <UniqueIdentifier>{08fa6c43-d078-4033-b1b3-d9df4692a09b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{db8200c1-46f0-4fff-90ca-db388f450539}</UniqueIdentifier>
+      <UniqueIdentifier>{af0beec2-ba62-4921-b1a7-bb549c807eaa}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -207,6 +207,9 @@
     <ClCompile Include="src\Debugger.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Environment.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -249,6 +252,9 @@
     <ClCompile Include="src\FPEnvironment_WIN32.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MemoryPool.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -261,13 +267,16 @@
     <ClCompile Include="src\NumberParser.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NumericString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\String.cpp">
+    <ClCompile Include="src\SortedDirectoryIterator.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp">
+    <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\StringTokenizer.cpp">
@@ -300,6 +309,9 @@
     <ClCompile Include="src\DeflatingStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStream.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -489,6 +501,9 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_byte_order.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_chartables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -498,40 +513,31 @@
     <ClCompile Include="src\pcre_config.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_dfa_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_fullinfo.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
+    <ClCompile Include="src\pcre_get.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
+    <ClCompile Include="src\pcre_globals.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
+    <ClCompile Include="src\pcre_jit_compile.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
+    <ClCompile Include="src\pcre_maketables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
+    <ClCompile Include="src\pcre_newline.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
+    <ClCompile Include="src\pcre_ord2utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_refcount.c">
@@ -540,7 +546,10 @@
     <ClCompile Include="src\pcre_string_utils.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
+    <ClCompile Include="src\pcre_study.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre_tables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_ucd.c">
@@ -549,6 +558,9 @@
     <ClCompile Include="src\pcre_valid_utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_version.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_xclass.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -672,10 +684,7 @@
     <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SortedDirectoryIterator.cpp">
+    <ClCompile Include="src\DirectoryWatcher.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\File.cpp">
@@ -837,6 +846,9 @@
     <ClCompile Include="src\Latin1Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Latin2Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Latin9Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -864,12 +876,21 @@
     <ClCompile Include="src\UTF16Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\UTF32Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\UTF8Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\UTF8String.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Windows1250Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Windows1251Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1252Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -903,12 +924,6 @@
     <ClCompile Include="src\HashStatistic.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryWatcher.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStream.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Var.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
@@ -918,18 +933,6 @@
     <ClCompile Include="src\VarIterator.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1250Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1251Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UTF32Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -995,6 +998,9 @@
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\FIFOBuffer.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Format.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1022,7 +1028,7 @@
     <ClInclude Include="include\Poco\Instantiator.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\ListMap.h">
+    <ClInclude Include="include\Poco\JSONString.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\MemoryPool.h">
@@ -1079,6 +1085,9 @@
     <ClInclude Include="include\Poco\SingletonHolder.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\String.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1325,6 +1334,9 @@
     <ClInclude Include="include\Poco\MD5Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Random.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -1508,16 +1520,7 @@
     <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+    <ClInclude Include="include\Poco\DirectoryWatcher.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\File.h">
@@ -1673,9 +1676,15 @@
     <ClInclude Include="include\Poco\Latin1Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Latin2Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Latin9Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ListMap.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\StreamConverter.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1700,12 +1709,21 @@
     <ClInclude Include="include\Poco\UTF16Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\UTF32Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\UTF8Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\UTF8String.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1252Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1748,6 +1766,9 @@
     <ClInclude Include="include\Poco\Delegate.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\EventArgs.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
@@ -1778,12 +1799,24 @@
     <ClInclude Include="include\Poco\PriorityExpire.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PriorityStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AbstractCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\AbstractStrategy.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AccessExpireCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
@@ -1862,22 +1895,13 @@
     <ClInclude Include="include\Poco\SimpleHashTable.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PriorityStrategy.h">
-      <Filter>Events\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBufferStream.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\Pair.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Dynamic\Var.h">
+    <ClInclude Include="include\Poco\Dynamic\Struct.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Dynamic\Struct.h">
+    <ClInclude Include="include\Poco\Dynamic\Var.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\VarHolder.h">
@@ -1886,24 +1910,6 @@
     <ClInclude Include="include\Poco\Dynamic\VarIterator.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Latin2Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1251Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1250Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryWatcher.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTF32Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PBKDF2Engine.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_x64_vs120.sln b/Foundation/Foundation_x64_vs120.sln
index 5a9002d313..c7f98404b5 100644
--- a/Foundation/Foundation_x64_vs120.sln
+++ b/Foundation/Foundation_x64_vs120.sln
@@ -1,25 +1,22 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30825.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs120.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs120.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs120.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs120.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs120.vcxproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs120.vcxproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
@@ -32,18 +29,42 @@ Global
 		release_static_mt|x64 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.Build.0 = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.Build.0 = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.ActiveCfg = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.Build.0 = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.ActiveCfg = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.Build.0 = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Build.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Deploy.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.ActiveCfg = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Build.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Deploy.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.ActiveCfg = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Build.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|x64.Build.0 = debug_shared|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|x64.Deploy.0 = debug_shared|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|x64.ActiveCfg = release_shared|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|x64.Build.0 = release_shared|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|x64.Deploy.0 = release_shared|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.ActiveCfg = release_static_md|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.Build.0 = release_static_md|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.Build.0 = debug_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
@@ -68,18 +89,6 @@ Global
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.Build.0 = release_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.ActiveCfg = release_shared|x64
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.Build.0 = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
-		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_x64_vs120.vcxproj b/Foundation/Foundation_x64_vs120.vcxproj
index a5c6792104..f25985bebf 100644
--- a/Foundation/Foundation_x64_vs120.vcxproj
+++ b/Foundation/Foundation_x64_vs120.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|x64">
@@ -28,27 +28,27 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Foundation</ProjectName>
-    <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
+    <ProjectGuid>{B01196CC-B693-4548-8464-2FF60499E73F}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
@@ -63,46 +63,29 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">..\bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">..\bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\Foundation\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\Foundation\$(Configuration)\</IntDir>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoFoundation64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoFoundationmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoFoundationmtd</TargetName>
@@ -110,11 +93,37 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoFoundationmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoFoundationmt</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
+    <OutDir>..\bin64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
+    <OutDir>..\bin64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+    <OutDir>..\lib64\</OutDir>
+    <IntDir>obj64\Foundation\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,12 +132,10 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -136,6 +143,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>..\bin64\PocoFoundation64d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\lib64\PocoFoundationd.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
@@ -149,31 +157,24 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoFoundation64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -181,93 +182,77 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
+      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib64\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ProgramDataBaseFileName>..\lib64\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
+      <ProgramDataBaseFileName>..\lib64\PocoFoundationmdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ProgramDataBaseFileName>..\lib64\PocoFoundationmtd.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -275,46 +260,38 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
-      <TargetMachine>MachineX64</TargetMachine>
+      <OutputFile>..\lib64\PocoFoundationmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\Ascii.cpp" />
-    <ClCompile Include="src\AtomicCounter.cpp" />
-    <ClCompile Include="src\Bugcheck.cpp" />
+    <ClCompile Include="src\Ascii.cpp"/>
+    <ClCompile Include="src\AtomicCounter.cpp"/>
+    <ClCompile Include="src\Bugcheck.cpp"/>
     <ClCompile Include="src\ByteOrder.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|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>
     </ClCompile>
-    <ClCompile Include="src\Checksum.cpp" />
-    <ClCompile Include="src\Debugger.cpp" />
-    <ClCompile Include="src\DirectoryWatcher.cpp" />
-    <ClCompile Include="src\Environment.cpp" />
+    <ClCompile Include="src\Checksum.cpp"/>
+    <ClCompile Include="src\Debugger.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp"/>
+    <ClCompile Include="src\Environment.cpp"/>
     <ClCompile Include="src\Environment_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -347,11 +324,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Error.cpp" />
-    <ClCompile Include="src\Exception.cpp" />
-    <ClCompile Include="src\FIFOBufferStream.cpp" />
-    <ClCompile Include="src\Format.cpp" />
-    <ClCompile Include="src\FPEnvironment.cpp" />
+    <ClCompile Include="src\Error.cpp"/>
+    <ClCompile Include="src\Exception.cpp"/>
+    <ClCompile Include="src\Format.cpp"/>
+    <ClCompile Include="src\FPEnvironment.cpp"/>
     <ClCompile Include="src\FPEnvironment_C99.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -392,39 +368,34 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\JSONString.cpp" />
-    <ClCompile Include="src\Latin2Encoding.cpp" />
-    <ClCompile Include="src\MemoryPool.cpp" />
-    <ClCompile Include="src\NestedDiagnosticContext.cpp" />
-    <ClCompile Include="src\NumberFormatter.cpp" />
-    <ClCompile Include="src\NumberParser.cpp" />
-    <ClCompile Include="src\RefCountedObject.cpp" />
-    <ClCompile Include="src\SortedDirectoryIterator.cpp" />
+    <ClCompile Include="src\JSONString.cpp"/>
+    <ClCompile Include="src\MemoryPool.cpp"/>
+    <ClCompile Include="src\NestedDiagnosticContext.cpp"/>
+    <ClCompile Include="src\NumberFormatter.cpp"/>
+    <ClCompile Include="src\NumberParser.cpp"/>
+    <ClCompile Include="src\NumericString.cpp"/>
+    <ClCompile Include="src\RefCountedObject.cpp"/>
+    <ClCompile Include="src\SortedDirectoryIterator.cpp"/>
     <ClCompile Include="src\String.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|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>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp" />
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp" />
-    <ClCompile Include="src\StringTokenizer.cpp" />
-    <ClCompile Include="src\UTF32Encoding.cpp" />
-    <ClCompile Include="src\Var.cpp" />
-    <ClCompile Include="src\VarHolder.cpp" />
-    <ClCompile Include="src\VarIterator.cpp" />
-    <ClCompile Include="src\Void.cpp" />
-    <ClCompile Include="src\Base32Decoder.cpp" />
-    <ClCompile Include="src\Base32Encoder.cpp" />
-    <ClCompile Include="src\Base64Decoder.cpp" />
-    <ClCompile Include="src\Base64Encoder.cpp" />
-    <ClCompile Include="src\BinaryReader.cpp" />
-    <ClCompile Include="src\BinaryWriter.cpp" />
-    <ClCompile Include="src\CountingStream.cpp" />
-    <ClCompile Include="src\DeflatingStream.cpp" />
-    <ClCompile Include="src\FileStream.cpp" />
+    <ClCompile Include="src\StringTokenizer.cpp"/>
+    <ClCompile Include="src\Void.cpp"/>
+    <ClCompile Include="src\Base32Decoder.cpp"/>
+    <ClCompile Include="src\Base32Encoder.cpp"/>
+    <ClCompile Include="src\Base64Decoder.cpp"/>
+    <ClCompile Include="src\Base64Encoder.cpp"/>
+    <ClCompile Include="src\BinaryReader.cpp"/>
+    <ClCompile Include="src\BinaryWriter.cpp"/>
+    <ClCompile Include="src\CountingStream.cpp"/>
+    <ClCompile Include="src\DeflatingStream.cpp"/>
+    <ClCompile Include="src\FIFOBufferStream.cpp"/>
+    <ClCompile Include="src\FileStream.cpp"/>
     <ClCompile Include="src\FileStream_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -441,32 +412,30 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\HexBinaryDecoder.cpp" />
-    <ClCompile Include="src\HexBinaryEncoder.cpp" />
-    <ClCompile Include="src\InflatingStream.cpp" />
-    <ClCompile Include="src\LineEndingConverter.cpp" />
-    <ClCompile Include="src\MemoryStream.cpp" />
-    <ClCompile Include="src\NullStream.cpp" />
-    <ClCompile Include="src\StreamCopier.cpp" />
-    <ClCompile Include="src\StreamTokenizer.cpp" />
-    <ClCompile Include="src\TeeStream.cpp" />
-    <ClCompile Include="src\Token.cpp" />
-    <ClCompile Include="src\adler32.c" />
-    <ClCompile Include="src\compress.c" />
-    <ClCompile Include="src\crc32.c" />
-    <ClCompile Include="src\deflate.c" />
-    <ClCompile Include="src\infback.c" />
-    <ClCompile Include="src\inffast.c" />
-    <ClCompile Include="src\inflate.c" />
-    <ClCompile Include="src\inftrees.c" />
-    <ClCompile Include="src\trees.c" />
-    <ClCompile Include="src\Windows1250Encoding.cpp" />
-    <ClCompile Include="src\Windows1251Encoding.cpp" />
-    <ClCompile Include="src\zutil.c" />
-    <ClCompile Include="src\ActiveDispatcher.cpp" />
-    <ClCompile Include="src\Condition.cpp" />
-    <ClCompile Include="src\ErrorHandler.cpp" />
-    <ClCompile Include="src\Event.cpp" />
+    <ClCompile Include="src\HexBinaryDecoder.cpp"/>
+    <ClCompile Include="src\HexBinaryEncoder.cpp"/>
+    <ClCompile Include="src\InflatingStream.cpp"/>
+    <ClCompile Include="src\LineEndingConverter.cpp"/>
+    <ClCompile Include="src\MemoryStream.cpp"/>
+    <ClCompile Include="src\NullStream.cpp"/>
+    <ClCompile Include="src\StreamCopier.cpp"/>
+    <ClCompile Include="src\StreamTokenizer.cpp"/>
+    <ClCompile Include="src\TeeStream.cpp"/>
+    <ClCompile Include="src\Token.cpp"/>
+    <ClCompile Include="src\adler32.c"/>
+    <ClCompile Include="src\compress.c"/>
+    <ClCompile Include="src\crc32.c"/>
+    <ClCompile Include="src\deflate.c"/>
+    <ClCompile Include="src\infback.c"/>
+    <ClCompile Include="src\inffast.c"/>
+    <ClCompile Include="src\inflate.c"/>
+    <ClCompile Include="src\inftrees.c"/>
+    <ClCompile Include="src\trees.c"/>
+    <ClCompile Include="src\zutil.c"/>
+    <ClCompile Include="src\ActiveDispatcher.cpp"/>
+    <ClCompile Include="src\Condition.cpp"/>
+    <ClCompile Include="src\ErrorHandler.cpp"/>
+    <ClCompile Include="src\Event.cpp"/>
     <ClCompile Include="src\Event_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -483,7 +452,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Mutex.cpp" />
+    <ClCompile Include="src\Mutex.cpp"/>
     <ClCompile Include="src\Mutex_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -500,8 +469,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Runnable.cpp" />
-    <ClCompile Include="src\RWLock.cpp" />
+    <ClCompile Include="src\Runnable.cpp"/>
+    <ClCompile Include="src\RWLock.cpp"/>
     <ClCompile Include="src\RWLock_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -518,7 +487,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Semaphore.cpp" />
+    <ClCompile Include="src\Semaphore.cpp"/>
     <ClCompile Include="src\Semaphore_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -536,15 +505,15 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\SignalHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|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>
     </ClCompile>
-    <ClCompile Include="src\SynchronizedObject.cpp" />
-    <ClCompile Include="src\Thread.cpp" />
+    <ClCompile Include="src\SynchronizedObject.cpp"/>
+    <ClCompile Include="src\Thread.cpp"/>
     <ClCompile Include="src\Thread_POSIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -561,19 +530,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ThreadLocal.cpp" />
-    <ClCompile Include="src\ThreadPool.cpp" />
-    <ClCompile Include="src\ThreadTarget.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
-    <ClCompile Include="src\DigestEngine.cpp" />
-    <ClCompile Include="src\DigestStream.cpp" />
-    <ClCompile Include="src\MD4Engine.cpp" />
-    <ClCompile Include="src\MD5Engine.cpp" />
-    <ClCompile Include="src\Random.cpp" />
-    <ClCompile Include="src\RandomStream.cpp" />
-    <ClCompile Include="src\SHA1Engine.cpp" />
-    <ClCompile Include="src\Manifest.cpp" />
-    <ClCompile Include="src\SharedLibrary.cpp" />
+    <ClCompile Include="src\ThreadLocal.cpp"/>
+    <ClCompile Include="src\ThreadPool.cpp"/>
+    <ClCompile Include="src\ThreadTarget.cpp"/>
+    <ClCompile Include="src\Timer.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\DigestStream.cpp"/>
+    <ClCompile Include="src\MD4Engine.cpp"/>
+    <ClCompile Include="src\MD5Engine.cpp"/>
+    <ClCompile Include="src\Random.cpp"/>
+    <ClCompile Include="src\RandomStream.cpp"/>
+    <ClCompile Include="src\SHA1Engine.cpp"/>
+    <ClCompile Include="src\Manifest.cpp"/>
+    <ClCompile Include="src\SharedLibrary.cpp"/>
     <ClCompile Include="src\SharedLibrary_HPUX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -614,38 +583,38 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\RegularExpression.cpp" />
-    <ClCompile Include="src\pcre_version.c" />
-    <ClCompile Include="src\pcre_byte_order.c" />
-    <ClCompile Include="src\pcre_chartables.c" />
-    <ClCompile Include="src\pcre_config.c" />
-    <ClCompile Include="src\pcre_compile.c" />
-    <ClCompile Include="src\pcre_get.c" />
-    <ClCompile Include="src\pcre_jit_compile.c" />
-    <ClCompile Include="src\pcre_refcount.c" />
-    <ClCompile Include="src\pcre_string_utils.c" />
-    <ClCompile Include="src\pcre_dfa_exec.c" />
-    <ClCompile Include="src\pcre_exec.c" />
-    <ClCompile Include="src\pcre_fullinfo.c" />
-    <ClCompile Include="src\pcre_globals.c" />
-    <ClCompile Include="src\pcre_maketables.c" />
-    <ClCompile Include="src\pcre_newline.c" />
-    <ClCompile Include="src\pcre_ord2utf8.c" />
-    <ClCompile Include="src\pcre_study.c" />
-    <ClCompile Include="src\pcre_tables.c" />
-    <ClCompile Include="src\pcre_ucd.c" />
-    <ClCompile Include="src\pcre_valid_utf8.c" />
-    <ClCompile Include="src\pcre_xclass.c" />
-    <ClCompile Include="src\ArchiveStrategy.cpp" />
-    <ClCompile Include="src\AsyncChannel.cpp" />
-    <ClCompile Include="src\Channel.cpp" />
-    <ClCompile Include="src\Configurable.cpp" />
-    <ClCompile Include="src\ConsoleChannel.cpp" />
-    <ClCompile Include="src\EventLogChannel.cpp" />
-    <ClCompile Include="src\FileChannel.cpp" />
-    <ClCompile Include="src\Formatter.cpp" />
-    <ClCompile Include="src\FormattingChannel.cpp" />
-    <ClCompile Include="src\LogFile.cpp" />
+    <ClCompile Include="src\RegularExpression.cpp"/>
+    <ClCompile Include="src\pcre_byte_order.c"/>
+    <ClCompile Include="src\pcre_chartables.c"/>
+    <ClCompile Include="src\pcre_compile.c"/>
+    <ClCompile Include="src\pcre_config.c"/>
+    <ClCompile Include="src\pcre_dfa_exec.c"/>
+    <ClCompile Include="src\pcre_exec.c"/>
+    <ClCompile Include="src\pcre_fullinfo.c"/>
+    <ClCompile Include="src\pcre_get.c"/>
+    <ClCompile Include="src\pcre_globals.c"/>
+    <ClCompile Include="src\pcre_jit_compile.c"/>
+    <ClCompile Include="src\pcre_maketables.c"/>
+    <ClCompile Include="src\pcre_newline.c"/>
+    <ClCompile Include="src\pcre_ord2utf8.c"/>
+    <ClCompile Include="src\pcre_refcount.c"/>
+    <ClCompile Include="src\pcre_string_utils.c"/>
+    <ClCompile Include="src\pcre_study.c"/>
+    <ClCompile Include="src\pcre_tables.c"/>
+    <ClCompile Include="src\pcre_ucd.c"/>
+    <ClCompile Include="src\pcre_valid_utf8.c"/>
+    <ClCompile Include="src\pcre_version.c"/>
+    <ClCompile Include="src\pcre_xclass.c"/>
+    <ClCompile Include="src\ArchiveStrategy.cpp"/>
+    <ClCompile Include="src\AsyncChannel.cpp"/>
+    <ClCompile Include="src\Channel.cpp"/>
+    <ClCompile Include="src\Configurable.cpp"/>
+    <ClCompile Include="src\ConsoleChannel.cpp"/>
+    <ClCompile Include="src\EventLogChannel.cpp"/>
+    <ClCompile Include="src\FileChannel.cpp"/>
+    <ClCompile Include="src\Formatter.cpp"/>
+    <ClCompile Include="src\FormattingChannel.cpp"/>
+    <ClCompile Include="src\LogFile.cpp"/>
     <ClCompile Include="src\LogFile_STD.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -678,12 +647,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Logger.cpp" />
-    <ClCompile Include="src\LoggingFactory.cpp" />
-    <ClCompile Include="src\LoggingRegistry.cpp" />
-    <ClCompile Include="src\LogStream.cpp" />
-    <ClCompile Include="src\Message.cpp" />
-    <ClCompile Include="src\NullChannel.cpp" />
+    <ClCompile Include="src\Logger.cpp"/>
+    <ClCompile Include="src\LoggingFactory.cpp"/>
+    <ClCompile Include="src\LoggingRegistry.cpp"/>
+    <ClCompile Include="src\LogStream.cpp"/>
+    <ClCompile Include="src\Message.cpp"/>
+    <ClCompile Include="src\NullChannel.cpp"/>
     <ClCompile Include="src\OpcomChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -692,12 +661,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PatternFormatter.cpp" />
-    <ClCompile Include="src\PurgeStrategy.cpp" />
-    <ClCompile Include="src\RotateStrategy.cpp" />
-    <ClCompile Include="src\SimpleFileChannel.cpp" />
-    <ClCompile Include="src\SplitterChannel.cpp" />
-    <ClCompile Include="src\StreamChannel.cpp" />
+    <ClCompile Include="src\PatternFormatter.cpp"/>
+    <ClCompile Include="src\PurgeStrategy.cpp"/>
+    <ClCompile Include="src\RotateStrategy.cpp"/>
+    <ClCompile Include="src\SimpleFileChannel.cpp"/>
+    <ClCompile Include="src\SplitterChannel.cpp"/>
+    <ClCompile Include="src\StreamChannel.cpp"/>
     <ClCompile Include="src\SyslogChannel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -706,14 +675,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\WindowsConsoleChannel.cpp" />
-    <ClCompile Include="src\AbstractObserver.cpp" />
-    <ClCompile Include="src\Notification.cpp" />
-    <ClCompile Include="src\NotificationCenter.cpp" />
-    <ClCompile Include="src\NotificationQueue.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueue.cpp" />
-    <ClCompile Include="src\TimedNotificationQueue.cpp" />
-    <ClCompile Include="src\DirectoryIterator.cpp" />
+    <ClCompile Include="src\WindowsConsoleChannel.cpp"/>
+    <ClCompile Include="src\AbstractObserver.cpp"/>
+    <ClCompile Include="src\Notification.cpp"/>
+    <ClCompile Include="src\NotificationCenter.cpp"/>
+    <ClCompile Include="src\NotificationQueue.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueue.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueue.cpp"/>
+    <ClCompile Include="src\DirectoryIterator.cpp"/>
     <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -746,7 +715,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\File.cpp" />
+    <ClCompile Include="src\DirectoryWatcher.cpp"/>
+    <ClCompile Include="src\File.cpp"/>
     <ClCompile Include="src\File_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -779,8 +749,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Glob.cpp" />
-    <ClCompile Include="src\Path.cpp" />
+    <ClCompile Include="src\Glob.cpp"/>
+    <ClCompile Include="src\Path.cpp"/>
     <ClCompile Include="src\Path_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -813,8 +783,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\TemporaryFile.cpp" />
-    <ClCompile Include="src\NamedEvent.cpp" />
+    <ClCompile Include="src\TemporaryFile.cpp"/>
+    <ClCompile Include="src\NamedEvent.cpp"/>
     <ClCompile Include="src\NamedEvent_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -847,7 +817,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\NamedMutex.cpp" />
+    <ClCompile Include="src\NamedMutex.cpp"/>
     <ClCompile Include="src\NamedMutex_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -880,8 +850,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\Pipe.cpp" />
-    <ClCompile Include="src\PipeImpl.cpp" />
+    <ClCompile Include="src\Pipe.cpp"/>
+    <ClCompile Include="src\PipeImpl.cpp"/>
     <ClCompile Include="src\PipeImpl_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -906,8 +876,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\PipeStream.cpp" />
-    <ClCompile Include="src\Process.cpp" />
+    <ClCompile Include="src\PipeStream.cpp"/>
+    <ClCompile Include="src\Process.cpp"/>
     <ClCompile Include="src\Process_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -940,7 +910,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\SharedMemory.cpp" />
+    <ClCompile Include="src\SharedMemory.cpp"/>
     <ClCompile Include="src\SharedMemory_DUMMY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -965,18 +935,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\UUID.cpp" />
-    <ClCompile Include="src\UUIDGenerator.cpp" />
-    <ClCompile Include="src\Clock.cpp" />
-    <ClCompile Include="src\DateTime.cpp" />
-    <ClCompile Include="src\DateTimeFormat.cpp" />
-    <ClCompile Include="src\DateTimeFormatter.cpp" />
-    <ClCompile Include="src\DateTimeParser.cpp" />
-    <ClCompile Include="src\LocalDateTime.cpp" />
-    <ClCompile Include="src\Stopwatch.cpp" />
-    <ClCompile Include="src\Timespan.cpp" />
-    <ClCompile Include="src\Timestamp.cpp" />
-    <ClCompile Include="src\Timezone.cpp" />
+    <ClCompile Include="src\UUID.cpp"/>
+    <ClCompile Include="src\UUIDGenerator.cpp"/>
+    <ClCompile Include="src\Clock.cpp"/>
+    <ClCompile Include="src\DateTime.cpp"/>
+    <ClCompile Include="src\DateTimeFormat.cpp"/>
+    <ClCompile Include="src\DateTimeFormatter.cpp"/>
+    <ClCompile Include="src\DateTimeParser.cpp"/>
+    <ClCompile Include="src\LocalDateTime.cpp"/>
+    <ClCompile Include="src\Stopwatch.cpp"/>
+    <ClCompile Include="src\Timespan.cpp"/>
+    <ClCompile Include="src\Timestamp.cpp"/>
+    <ClCompile Include="src\Timezone.cpp"/>
     <ClCompile Include="src\Timezone_UNIX.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
@@ -993,392 +963,398 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\ASCIIEncoding.cpp" />
-    <ClCompile Include="src\Latin1Encoding.cpp" />
-    <ClCompile Include="src\Latin9Encoding.cpp" />
-    <ClCompile Include="src\StreamConverter.cpp" />
-    <ClCompile Include="src\TextBufferIterator.cpp" />
-    <ClCompile Include="src\TextConverter.cpp" />
-    <ClCompile Include="src\TextEncoding.cpp" />
-    <ClCompile Include="src\TextIterator.cpp" />
-    <ClCompile Include="src\Unicode.cpp" />
-    <ClCompile Include="src\UnicodeConverter.cpp" />
-    <ClCompile Include="src\UTF16Encoding.cpp" />
-    <ClCompile Include="src\UTF8Encoding.cpp" />
-    <ClCompile Include="src\UTF8String.cpp" />
-    <ClCompile Include="src\Windows1252Encoding.cpp" />
-    <ClCompile Include="src\FileStreamFactory.cpp" />
-    <ClCompile Include="src\URI.cpp" />
-    <ClCompile Include="src\URIStreamFactory.cpp" />
-    <ClCompile Include="src\URIStreamOpener.cpp" />
-    <ClCompile Include="src\Task.cpp" />
-    <ClCompile Include="src\TaskManager.cpp" />
-    <ClCompile Include="src\TaskNotification.cpp" />
-    <ClCompile Include="src\EventArgs.cpp" />
-    <ClCompile Include="src\Hash.cpp" />
-    <ClCompile Include="src\HashStatistic.cpp" />
+    <ClCompile Include="src\ASCIIEncoding.cpp"/>
+    <ClCompile Include="src\Latin1Encoding.cpp"/>
+    <ClCompile Include="src\Latin2Encoding.cpp"/>
+    <ClCompile Include="src\Latin9Encoding.cpp"/>
+    <ClCompile Include="src\StreamConverter.cpp"/>
+    <ClCompile Include="src\TextBufferIterator.cpp"/>
+    <ClCompile Include="src\TextConverter.cpp"/>
+    <ClCompile Include="src\TextEncoding.cpp"/>
+    <ClCompile Include="src\TextIterator.cpp"/>
+    <ClCompile Include="src\Unicode.cpp"/>
+    <ClCompile Include="src\UnicodeConverter.cpp"/>
+    <ClCompile Include="src\UTF16Encoding.cpp"/>
+    <ClCompile Include="src\UTF32Encoding.cpp"/>
+    <ClCompile Include="src\UTF8Encoding.cpp"/>
+    <ClCompile Include="src\UTF8String.cpp"/>
+    <ClCompile Include="src\Windows1250Encoding.cpp"/>
+    <ClCompile Include="src\Windows1251Encoding.cpp"/>
+    <ClCompile Include="src\Windows1252Encoding.cpp"/>
+    <ClCompile Include="src\FileStreamFactory.cpp"/>
+    <ClCompile Include="src\URI.cpp"/>
+    <ClCompile Include="src\URIStreamFactory.cpp"/>
+    <ClCompile Include="src\URIStreamOpener.cpp"/>
+    <ClCompile Include="src\Task.cpp"/>
+    <ClCompile Include="src\TaskManager.cpp"/>
+    <ClCompile Include="src\TaskNotification.cpp"/>
+    <ClCompile Include="src\EventArgs.cpp"/>
+    <ClCompile Include="src\Hash.cpp"/>
+    <ClCompile Include="src\HashStatistic.cpp"/>
+    <ClCompile Include="src\Var.cpp"/>
+    <ClCompile Include="src\VarHolder.cpp"/>
+    <ClCompile Include="src\VarIterator.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\Poco\Any.h" />
-    <ClInclude Include="include\Poco\Ascii.h" />
-    <ClInclude Include="include\Poco\AtomicCounter.h" />
-    <ClInclude Include="include\Poco\AutoPtr.h" />
-    <ClInclude Include="include\Poco\AutoReleasePool.h" />
-    <ClInclude Include="include\Poco\Buffer.h" />
-    <ClInclude Include="include\Poco\Bugcheck.h" />
-    <ClInclude Include="include\Poco\ByteOrder.h" />
-    <ClInclude Include="include\Poco\Checksum.h" />
-    <ClInclude Include="include\Poco\Config.h" />
-    <ClInclude Include="include\Poco\Debugger.h" />
-    <ClInclude Include="include\Poco\DirectoryWatcher.h" />
-    <ClInclude Include="include\Poco\DynamicAny.h" />
-    <ClInclude Include="include\Poco\DynamicAnyHolder.h" />
-    <ClInclude Include="include\Poco\DynamicFactory.h" />
-    <ClInclude Include="include\Poco\Dynamic\Pair.h" />
-    <ClInclude Include="include\Poco\Dynamic\Struct.h" />
-    <ClInclude Include="include\Poco\Dynamic\Var.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
-    <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
-    <ClInclude Include="include\Poco\Environment.h" />
-    <ClInclude Include="include\Poco\Environment_UNIX.h" />
-    <ClInclude Include="include\Poco\Environment_VMS.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32.h" />
-    <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-    <ClInclude Include="include\Poco\Error.h" />
-    <ClInclude Include="include\Poco\Exception.h" />
-    <ClInclude Include="include\Poco\FIFOBufferStream.h" />
-    <ClInclude Include="include\Poco\Format.h" />
-    <ClInclude Include="include\Poco\Foundation.h" />
-    <ClInclude Include="include\Poco\FPEnvironment.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_C99.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DEC.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_SUN.h" />
-    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h" />
-    <ClInclude Include="include\Poco\Instantiator.h" />
-    <ClInclude Include="include\Poco\JSONString.h" />
-    <ClInclude Include="include\Poco\Latin2Encoding.h" />
-    <ClInclude Include="include\Poco\ListMap.h" />
-    <ClInclude Include="include\Poco\MemoryPool.h" />
-    <ClInclude Include="include\Poco\MetaProgramming.h" />
-    <ClInclude Include="include\Poco\NamedTuple.h" />
-    <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
-    <ClInclude Include="include\Poco\Nullable.h" />
-    <ClInclude Include="include\Poco\NumberFormatter.h" />
-    <ClInclude Include="include\Poco\NumberParser.h" />
-    <ClInclude Include="include\Poco\NumericString.h" />
-    <ClInclude Include="include\Poco\ObjectPool.h" />
-    <ClInclude Include="include\Poco\Optional.h" />
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
-    <ClInclude Include="include\Poco\Platform.h" />
-    <ClInclude Include="include\Poco\Platform_POSIX.h" />
-    <ClInclude Include="include\Poco\Platform_VMS.h" />
-    <ClInclude Include="include\Poco\Platform_WIN32.h" />
-    <ClInclude Include="include\Poco\Poco.h" />
-    <ClInclude Include="include\Poco\PriorityStrategy.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h" />
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h" />
-    <ClInclude Include="include\Poco\RefCountedObject.h" />
-    <ClInclude Include="include\Poco\SharedPtr.h" />
-    <ClInclude Include="include\Poco\SingletonHolder.h" />
-    <ClInclude Include="include\Poco\String.h" />
-    <ClInclude Include="include\Poco\StringTokenizer.h" />
-    <ClInclude Include="include\Poco\Tuple.h" />
-    <ClInclude Include="include\Poco\TypeList.h" />
-    <ClInclude Include="include\Poco\Types.h" />
-    <ClInclude Include="include\Poco\UnWindows.h" />
-    <ClInclude Include="include\Poco\UTF32Encoding.h" />
-    <ClInclude Include="include\Poco\UTFString.h" />
-    <ClInclude Include="include\Poco\Version.h" />
-    <ClInclude Include="include\Poco\Void.h" />
-    <ClInclude Include="include\Poco\Base32Decoder.h" />
-    <ClInclude Include="include\Poco\Base32Encoder.h" />
-    <ClInclude Include="include\Poco\Base64Decoder.h" />
-    <ClInclude Include="include\Poco\Base64Encoder.h" />
-    <ClInclude Include="include\Poco\BinaryReader.h" />
-    <ClInclude Include="include\Poco\BinaryWriter.h" />
-    <ClInclude Include="include\Poco\BufferAllocator.h" />
-    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h" />
-    <ClInclude Include="include\Poco\BufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\CountingStream.h" />
-    <ClInclude Include="include\Poco\DeflatingStream.h" />
-    <ClInclude Include="include\Poco\FileStream.h" />
-    <ClInclude Include="include\Poco\FileStream_POSIX.h" />
-    <ClInclude Include="include\Poco\FileStream_WIN32.h" />
-    <ClInclude Include="include\Poco\HexBinaryDecoder.h" />
-    <ClInclude Include="include\Poco\HexBinaryEncoder.h" />
-    <ClInclude Include="include\Poco\InflatingStream.h" />
-    <ClInclude Include="include\Poco\LineEndingConverter.h" />
-    <ClInclude Include="include\Poco\MemoryStream.h" />
-    <ClInclude Include="include\Poco\NullStream.h" />
-    <ClInclude Include="include\Poco\StreamCopier.h" />
-    <ClInclude Include="include\Poco\StreamTokenizer.h" />
-    <ClInclude Include="include\Poco\StreamUtil.h" />
-    <ClInclude Include="include\Poco\TeeStream.h" />
-    <ClInclude Include="include\Poco\Token.h" />
-    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h" />
-    <ClInclude Include="include\Poco\Windows1250Encoding.h" />
-    <ClInclude Include="include\Poco\Windows1251Encoding.h" />
-    <ClInclude Include="src\crc32.h" />
-    <ClInclude Include="src\deflate.h" />
-    <ClInclude Include="src\inffast.h" />
-    <ClInclude Include="src\inffixed.h" />
-    <ClInclude Include="src\inflate.h" />
-    <ClInclude Include="src\inftrees.h" />
-    <ClInclude Include="src\trees.h" />
-    <ClInclude Include="src\zconf.h" />
-    <ClInclude Include="src\zlib.h" />
-    <ClInclude Include="src\zutil.h" />
-    <ClInclude Include="include\Poco\ActiveDispatcher.h" />
-    <ClInclude Include="include\Poco\ActiveMethod.h" />
-    <ClInclude Include="include\Poco\ActiveResult.h" />
-    <ClInclude Include="include\Poco\ActiveRunnable.h" />
-    <ClInclude Include="include\Poco\ActiveStarter.h" />
-    <ClInclude Include="include\Poco\Activity.h" />
-    <ClInclude Include="include\Poco\Condition.h" />
-    <ClInclude Include="include\Poco\ErrorHandler.h" />
-    <ClInclude Include="include\Poco\Event.h" />
-    <ClInclude Include="include\Poco\Event_POSIX.h" />
-    <ClInclude Include="include\Poco\Event_WIN32.h" />
-    <ClInclude Include="include\Poco\Mutex.h" />
-    <ClInclude Include="include\Poco\Mutex_POSIX.h" />
-    <ClInclude Include="include\Poco\Mutex_WIN32.h" />
-    <ClInclude Include="include\Poco\Runnable.h" />
-    <ClInclude Include="include\Poco\RunnableAdapter.h" />
-    <ClInclude Include="include\Poco\RWLock.h" />
-    <ClInclude Include="include\Poco\RWLock_POSIX.h" />
-    <ClInclude Include="include\Poco\RWLock_WIN32.h" />
-    <ClInclude Include="include\Poco\ScopedLock.h" />
-    <ClInclude Include="include\Poco\ScopedUnlock.h" />
-    <ClInclude Include="include\Poco\Semaphore.h" />
-    <ClInclude Include="include\Poco\Semaphore_POSIX.h" />
-    <ClInclude Include="include\Poco\Semaphore_WIN32.h" />
-    <ClInclude Include="include\Poco\SignalHandler.h" />
-    <ClInclude Include="include\Poco\SynchronizedObject.h" />
-    <ClInclude Include="include\Poco\Thread.h" />
-    <ClInclude Include="include\Poco\Thread_POSIX.h" />
-    <ClInclude Include="include\Poco\Thread_WIN32.h" />
-    <ClInclude Include="include\Poco\ThreadLocal.h" />
-    <ClInclude Include="include\Poco\ThreadPool.h" />
-    <ClInclude Include="include\Poco\ThreadTarget.h" />
-    <ClInclude Include="include\Poco\Timer.h" />
-    <ClInclude Include="include\Poco\DigestEngine.h" />
-    <ClInclude Include="include\Poco\DigestStream.h" />
-    <ClInclude Include="include\Poco\HMACEngine.h" />
-    <ClInclude Include="include\Poco\MD4Engine.h" />
-    <ClInclude Include="include\Poco\MD5Engine.h" />
-    <ClInclude Include="include\Poco\Random.h" />
-    <ClInclude Include="include\Poco\RandomStream.h" />
-    <ClInclude Include="include\Poco\SHA1Engine.h" />
-    <ClInclude Include="include\Poco\ClassLibrary.h" />
-    <ClInclude Include="include\Poco\ClassLoader.h" />
-    <ClInclude Include="include\Poco\Manifest.h" />
-    <ClInclude Include="include\Poco\MetaObject.h" />
-    <ClInclude Include="include\Poco\SharedLibrary.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_VMS.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
-    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\pcre_config.h" />
-    <ClInclude Include="src\pcre_internal.h" />
-    <ClInclude Include="src\ucp.h" />
-    <ClInclude Include="include\Poco\RegularExpression.h" />
-    <ClInclude Include="include\Poco\ArchiveStrategy.h" />
-    <ClInclude Include="include\Poco\AsyncChannel.h" />
-    <ClInclude Include="include\Poco\Channel.h" />
-    <ClInclude Include="include\Poco\Configurable.h" />
-    <ClInclude Include="include\Poco\ConsoleChannel.h" />
-    <ClInclude Include="include\Poco\EventLogChannel.h" />
-    <ClInclude Include="include\Poco\FileChannel.h" />
-    <ClInclude Include="include\Poco\Formatter.h" />
-    <ClInclude Include="include\Poco\FormattingChannel.h" />
-    <ClInclude Include="include\Poco\LogFile.h" />
-    <ClInclude Include="include\Poco\LogFile_STD.h" />
-    <ClInclude Include="include\Poco\LogFile_VMS.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32.h" />
-    <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
-    <ClInclude Include="include\Poco\Logger.h" />
-    <ClInclude Include="include\Poco\LoggingFactory.h" />
-    <ClInclude Include="include\Poco\LoggingRegistry.h" />
-    <ClInclude Include="include\Poco\LogStream.h" />
-    <ClInclude Include="include\Poco\Message.h" />
-    <ClInclude Include="include\Poco\NullChannel.h" />
-    <ClInclude Include="include\Poco\OpcomChannel.h" />
-    <ClInclude Include="include\Poco\PatternFormatter.h" />
-    <ClInclude Include="src\pocomsg.h" />
-    <ClInclude Include="include\Poco\PurgeStrategy.h" />
-    <ClInclude Include="include\Poco\RotateStrategy.h" />
-    <ClInclude Include="include\Poco\SimpleFileChannel.h" />
-    <ClInclude Include="include\Poco\SplitterChannel.h" />
-    <ClInclude Include="include\Poco\StreamChannel.h" />
-    <ClInclude Include="include\Poco\SyslogChannel.h" />
-    <ClInclude Include="include\Poco\WindowsConsoleChannel.h" />
-    <ClInclude Include="include\Poco\AbstractObserver.h" />
-    <ClInclude Include="include\Poco\NObserver.h" />
-    <ClInclude Include="include\Poco\Notification.h" />
-    <ClInclude Include="include\Poco\NotificationCenter.h" />
-    <ClInclude Include="include\Poco\NotificationQueue.h" />
-    <ClInclude Include="include\Poco\Observer.h" />
-    <ClInclude Include="include\Poco\PriorityNotificationQueue.h" />
-    <ClInclude Include="include\Poco\TimedNotificationQueue.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
-    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
-    <ClInclude Include="include\Poco\File.h" />
-    <ClInclude Include="include\Poco\File_UNIX.h" />
-    <ClInclude Include="include\Poco\File_VMS.h" />
-    <ClInclude Include="include\Poco\File_WIN32.h" />
-    <ClInclude Include="include\Poco\File_WIN32U.h" />
-    <ClInclude Include="include\Poco\Glob.h" />
-    <ClInclude Include="include\Poco\Path.h" />
-    <ClInclude Include="include\Poco\Path_UNIX.h" />
-    <ClInclude Include="include\Poco\Path_VMS.h" />
-    <ClInclude Include="include\Poco\Path_WIN32.h" />
-    <ClInclude Include="include\Poco\Path_WIN32U.h" />
-    <ClInclude Include="include\Poco\TemporaryFile.h" />
-    <ClInclude Include="include\Poco\NamedEvent.h" />
-    <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedEvent_VMS.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
-    <ClInclude Include="include\Poco\NamedMutex.h" />
-    <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
-    <ClInclude Include="include\Poco\NamedMutex_VMS.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
-    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
-    <ClInclude Include="include\Poco\Pipe.h" />
-    <ClInclude Include="include\Poco\PipeImpl.h" />
-    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h" />
-    <ClInclude Include="include\Poco\PipeImpl_POSIX.h" />
-    <ClInclude Include="include\Poco\PipeImpl_WIN32.h" />
-    <ClInclude Include="include\Poco\PipeStream.h" />
-    <ClInclude Include="include\Poco\Process.h" />
-    <ClInclude Include="include\Poco\Process_UNIX.h" />
-    <ClInclude Include="include\Poco\Process_VMS.h" />
-    <ClInclude Include="include\Poco\Process_WIN32.h" />
-    <ClInclude Include="include\Poco\Process_WIN32U.h" />
-    <ClInclude Include="include\Poco\SharedMemory.h" />
-    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />
-    <ClInclude Include="include\Poco\SharedMemory_POSIX.h" />
-    <ClInclude Include="include\Poco\SharedMemory_WIN32.h" />
-    <ClInclude Include="include\Poco\UUID.h" />
-    <ClInclude Include="include\Poco\UUIDGenerator.h" />
-    <ClInclude Include="include\Poco\Clock.h" />
-    <ClInclude Include="include\Poco\DateTime.h" />
-    <ClInclude Include="include\Poco\DateTimeFormat.h" />
-    <ClInclude Include="include\Poco\DateTimeFormatter.h" />
-    <ClInclude Include="include\Poco\DateTimeParser.h" />
-    <ClInclude Include="include\Poco\LocalDateTime.h" />
-    <ClInclude Include="include\Poco\Stopwatch.h" />
-    <ClInclude Include="include\Poco\Timespan.h" />
-    <ClInclude Include="include\Poco\Timestamp.h" />
-    <ClInclude Include="include\Poco\Timezone.h" />
-    <ClInclude Include="include\Poco\ASCIIEncoding.h" />
-    <ClInclude Include="include\Poco\Latin1Encoding.h" />
-    <ClInclude Include="include\Poco\Latin9Encoding.h" />
-    <ClInclude Include="include\Poco\StreamConverter.h" />
-    <ClInclude Include="include\Poco\TextBufferIterator.h" />
-    <ClInclude Include="include\Poco\TextConverter.h" />
-    <ClInclude Include="include\Poco\TextEncoding.h" />
-    <ClInclude Include="include\Poco\TextIterator.h" />
-    <ClInclude Include="include\Poco\Unicode.h" />
-    <ClInclude Include="include\Poco\UnicodeConverter.h" />
-    <ClInclude Include="include\Poco\UTF16Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8Encoding.h" />
-    <ClInclude Include="include\Poco\UTF8String.h" />
-    <ClInclude Include="include\Poco\Windows1252Encoding.h" />
-    <ClInclude Include="include\Poco\FileStreamFactory.h" />
-    <ClInclude Include="include\Poco\URI.h" />
-    <ClInclude Include="include\Poco\URIStreamFactory.h" />
-    <ClInclude Include="include\Poco\URIStreamOpener.h" />
-    <ClInclude Include="include\Poco\Task.h" />
-    <ClInclude Include="include\Poco\TaskManager.h" />
-    <ClInclude Include="include\Poco\TaskNotification.h" />
-    <ClInclude Include="include\Poco\AbstractDelegate.h" />
-    <ClInclude Include="include\Poco\AbstractEvent.h" />
-    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\BasicEvent.h" />
-    <ClInclude Include="include\Poco\DefaultStrategy.h" />
-    <ClInclude Include="include\Poco\Delegate.h" />
-    <ClInclude Include="include\Poco\EventArgs.h" />
-    <ClInclude Include="include\Poco\Expire.h" />
-    <ClInclude Include="include\Poco\FIFOEvent.h" />
-    <ClInclude Include="include\Poco\FIFOStrategy.h" />
-    <ClInclude Include="include\Poco\FunctionDelegate.h" />
-    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h" />
-    <ClInclude Include="include\Poco\NotificationStrategy.h" />
-    <ClInclude Include="include\Poco\PriorityDelegate.h" />
-    <ClInclude Include="include\Poco\PriorityEvent.h" />
-    <ClInclude Include="include\Poco\PriorityExpire.h" />
-    <ClInclude Include="include\Poco\AbstractCache.h" />
-    <ClInclude Include="include\Poco\AbstractStrategy.h" />
-    <ClInclude Include="include\Poco\AccessExpireCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\AccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ExpirationDecorator.h" />
-    <ClInclude Include="include\Poco\ExpireCache.h" />
-    <ClInclude Include="include\Poco\ExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\ExpireStrategy.h" />
-    <ClInclude Include="include\Poco\KeyValueArgs.h" />
-    <ClInclude Include="include\Poco\LRUCache.h" />
-    <ClInclude Include="include\Poco\LRUStrategy.h" />
-    <ClInclude Include="include\Poco\StrategyCollection.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h" />
-    <ClInclude Include="include\Poco\UniqueExpireCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h" />
-    <ClInclude Include="include\Poco\UniqueExpireStrategy.h" />
-    <ClInclude Include="include\Poco\ValidArgs.h" />
-    <ClInclude Include="include\Poco\Hash.h" />
-    <ClInclude Include="include\Poco\HashFunction.h" />
-    <ClInclude Include="include\Poco\HashMap.h" />
-    <ClInclude Include="include\Poco\HashSet.h" />
-    <ClInclude Include="include\Poco\HashStatistic.h" />
-    <ClInclude Include="include\Poco\HashTable.h" />
-    <ClInclude Include="include\Poco\LinearHashTable.h" />
-    <ClInclude Include="include\Poco\SimpleHashTable.h" />
+    <ClInclude Include="include\Poco\Any.h"/>
+    <ClInclude Include="include\Poco\Ascii.h"/>
+    <ClInclude Include="include\Poco\AtomicCounter.h"/>
+    <ClInclude Include="include\Poco\AutoPtr.h"/>
+    <ClInclude Include="include\Poco\AutoReleasePool.h"/>
+    <ClInclude Include="include\Poco\Buffer.h"/>
+    <ClInclude Include="include\Poco\Bugcheck.h"/>
+    <ClInclude Include="include\Poco\ByteOrder.h"/>
+    <ClInclude Include="include\Poco\Checksum.h"/>
+    <ClInclude Include="include\Poco\Config.h"/>
+    <ClInclude Include="include\Poco\Debugger.h"/>
+    <ClInclude Include="include\Poco\DynamicAny.h"/>
+    <ClInclude Include="include\Poco\DynamicAnyHolder.h"/>
+    <ClInclude Include="include\Poco\DynamicFactory.h"/>
+    <ClInclude Include="include\Poco\Environment.h"/>
+    <ClInclude Include="include\Poco\Environment_UNIX.h"/>
+    <ClInclude Include="include\Poco\Environment_VMS.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Environment_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Error.h"/>
+    <ClInclude Include="include\Poco\Exception.h"/>
+    <ClInclude Include="include\Poco\FIFOBuffer.h"/>
+    <ClInclude Include="include\Poco\Format.h"/>
+    <ClInclude Include="include\Poco\Foundation.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_C99.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DEC.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_DUMMY.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_SUN.h"/>
+    <ClInclude Include="include\Poco\FPEnvironment_WIN32.h"/>
+    <ClInclude Include="include\Poco\Instantiator.h"/>
+    <ClInclude Include="include\Poco\JSONString.h"/>
+    <ClInclude Include="include\Poco\MemoryPool.h"/>
+    <ClInclude Include="include\Poco\MetaProgramming.h"/>
+    <ClInclude Include="include\Poco\NamedTuple.h"/>
+    <ClInclude Include="include\Poco\NestedDiagnosticContext.h"/>
+    <ClInclude Include="include\Poco\Nullable.h"/>
+    <ClInclude Include="include\Poco\NumberFormatter.h"/>
+    <ClInclude Include="include\Poco\NumberParser.h"/>
+    <ClInclude Include="include\Poco\NumericString.h"/>
+    <ClInclude Include="include\Poco\ObjectPool.h"/>
+    <ClInclude Include="include\Poco\Optional.h"/>
+    <ClInclude Include="include\Poco\Platform.h"/>
+    <ClInclude Include="include\Poco\Platform_POSIX.h"/>
+    <ClInclude Include="include\Poco\Platform_VMS.h"/>
+    <ClInclude Include="include\Poco\Platform_WIN32.h"/>
+    <ClInclude Include="include\Poco\Poco.h"/>
+    <ClInclude Include="include\Poco\RefCountedObject.h"/>
+    <ClInclude Include="include\Poco\SharedPtr.h"/>
+    <ClInclude Include="include\Poco\SingletonHolder.h"/>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\String.h"/>
+    <ClInclude Include="include\Poco\StringTokenizer.h"/>
+    <ClInclude Include="include\Poco\Tuple.h"/>
+    <ClInclude Include="include\Poco\TypeList.h"/>
+    <ClInclude Include="include\Poco\Types.h"/>
+    <ClInclude Include="include\Poco\UnWindows.h"/>
+    <ClInclude Include="include\Poco\Version.h"/>
+    <ClInclude Include="include\Poco\Void.h"/>
+    <ClInclude Include="include\Poco\Base32Decoder.h"/>
+    <ClInclude Include="include\Poco\Base32Encoder.h"/>
+    <ClInclude Include="include\Poco\Base64Decoder.h"/>
+    <ClInclude Include="include\Poco\Base64Encoder.h"/>
+    <ClInclude Include="include\Poco\BinaryReader.h"/>
+    <ClInclude Include="include\Poco\BinaryWriter.h"/>
+    <ClInclude Include="include\Poco\BufferAllocator.h"/>
+    <ClInclude Include="include\Poco\BufferedBidirectionalStreamBuf.h"/>
+    <ClInclude Include="include\Poco\BufferedStreamBuf.h"/>
+    <ClInclude Include="include\Poco\CountingStream.h"/>
+    <ClInclude Include="include\Poco\DeflatingStream.h"/>
+    <ClInclude Include="include\Poco\FileStream.h"/>
+    <ClInclude Include="include\Poco\FileStream_POSIX.h"/>
+    <ClInclude Include="include\Poco\FileStream_WIN32.h"/>
+    <ClInclude Include="include\Poco\HexBinaryDecoder.h"/>
+    <ClInclude Include="include\Poco\HexBinaryEncoder.h"/>
+    <ClInclude Include="include\Poco\InflatingStream.h"/>
+    <ClInclude Include="include\Poco\LineEndingConverter.h"/>
+    <ClInclude Include="include\Poco\MemoryStream.h"/>
+    <ClInclude Include="include\Poco\NullStream.h"/>
+    <ClInclude Include="include\Poco\StreamCopier.h"/>
+    <ClInclude Include="include\Poco\StreamTokenizer.h"/>
+    <ClInclude Include="include\Poco\StreamUtil.h"/>
+    <ClInclude Include="include\Poco\TeeStream.h"/>
+    <ClInclude Include="include\Poco\Token.h"/>
+    <ClInclude Include="include\Poco\UnbufferedStreamBuf.h"/>
+    <ClInclude Include="src\crc32.h"/>
+    <ClInclude Include="src\deflate.h"/>
+    <ClInclude Include="src\inffast.h"/>
+    <ClInclude Include="src\inffixed.h"/>
+    <ClInclude Include="src\inflate.h"/>
+    <ClInclude Include="src\inftrees.h"/>
+    <ClInclude Include="src\trees.h"/>
+    <ClInclude Include="src\zconf.h"/>
+    <ClInclude Include="src\zlib.h"/>
+    <ClInclude Include="src\zutil.h"/>
+    <ClInclude Include="include\Poco\ActiveDispatcher.h"/>
+    <ClInclude Include="include\Poco\ActiveMethod.h"/>
+    <ClInclude Include="include\Poco\ActiveResult.h"/>
+    <ClInclude Include="include\Poco\ActiveRunnable.h"/>
+    <ClInclude Include="include\Poco\ActiveStarter.h"/>
+    <ClInclude Include="include\Poco\Activity.h"/>
+    <ClInclude Include="include\Poco\Condition.h"/>
+    <ClInclude Include="include\Poco\ErrorHandler.h"/>
+    <ClInclude Include="include\Poco\Event.h"/>
+    <ClInclude Include="include\Poco\Event_POSIX.h"/>
+    <ClInclude Include="include\Poco\Event_WIN32.h"/>
+    <ClInclude Include="include\Poco\Mutex.h"/>
+    <ClInclude Include="include\Poco\Mutex_POSIX.h"/>
+    <ClInclude Include="include\Poco\Mutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\Runnable.h"/>
+    <ClInclude Include="include\Poco\RunnableAdapter.h"/>
+    <ClInclude Include="include\Poco\RWLock.h"/>
+    <ClInclude Include="include\Poco\RWLock_POSIX.h"/>
+    <ClInclude Include="include\Poco\RWLock_WIN32.h"/>
+    <ClInclude Include="include\Poco\ScopedLock.h"/>
+    <ClInclude Include="include\Poco\ScopedUnlock.h"/>
+    <ClInclude Include="include\Poco\Semaphore.h"/>
+    <ClInclude Include="include\Poco\Semaphore_POSIX.h"/>
+    <ClInclude Include="include\Poco\Semaphore_WIN32.h"/>
+    <ClInclude Include="include\Poco\SignalHandler.h"/>
+    <ClInclude Include="include\Poco\SynchronizedObject.h"/>
+    <ClInclude Include="include\Poco\Thread.h"/>
+    <ClInclude Include="include\Poco\Thread_POSIX.h"/>
+    <ClInclude Include="include\Poco\Thread_WIN32.h"/>
+    <ClInclude Include="include\Poco\ThreadLocal.h"/>
+    <ClInclude Include="include\Poco\ThreadPool.h"/>
+    <ClInclude Include="include\Poco\ThreadTarget.h"/>
+    <ClInclude Include="include\Poco\Timer.h"/>
+    <ClInclude Include="include\Poco\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\DigestStream.h"/>
+    <ClInclude Include="include\Poco\HMACEngine.h"/>
+    <ClInclude Include="include\Poco\MD4Engine.h"/>
+    <ClInclude Include="include\Poco\MD5Engine.h"/>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h"/>
+    <ClInclude Include="include\Poco\Random.h"/>
+    <ClInclude Include="include\Poco\RandomStream.h"/>
+    <ClInclude Include="include\Poco\SHA1Engine.h"/>
+    <ClInclude Include="include\Poco\ClassLibrary.h"/>
+    <ClInclude Include="include\Poco\ClassLoader.h"/>
+    <ClInclude Include="include\Poco\Manifest.h"/>
+    <ClInclude Include="include\Poco\MetaObject.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_HPUX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_UNIX.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_VMS.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32.h"/>
+    <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"/>
+    <ClInclude Include="src\pcre.h"/>
+    <ClInclude Include="src\pcre_config.h"/>
+    <ClInclude Include="src\pcre_internal.h"/>
+    <ClInclude Include="src\ucp.h"/>
+    <ClInclude Include="include\Poco\RegularExpression.h"/>
+    <ClInclude Include="include\Poco\ArchiveStrategy.h"/>
+    <ClInclude Include="include\Poco\AsyncChannel.h"/>
+    <ClInclude Include="include\Poco\Channel.h"/>
+    <ClInclude Include="include\Poco\Configurable.h"/>
+    <ClInclude Include="include\Poco\ConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\EventLogChannel.h"/>
+    <ClInclude Include="include\Poco\FileChannel.h"/>
+    <ClInclude Include="include\Poco\Formatter.h"/>
+    <ClInclude Include="include\Poco\FormattingChannel.h"/>
+    <ClInclude Include="include\Poco\LogFile.h"/>
+    <ClInclude Include="include\Poco\LogFile_STD.h"/>
+    <ClInclude Include="include\Poco\LogFile_VMS.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32.h"/>
+    <ClInclude Include="include\Poco\LogFile_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Logger.h"/>
+    <ClInclude Include="include\Poco\LoggingFactory.h"/>
+    <ClInclude Include="include\Poco\LoggingRegistry.h"/>
+    <ClInclude Include="include\Poco\LogStream.h"/>
+    <ClInclude Include="include\Poco\Message.h"/>
+    <ClInclude Include="include\Poco\NullChannel.h"/>
+    <ClInclude Include="include\Poco\OpcomChannel.h"/>
+    <ClInclude Include="include\Poco\PatternFormatter.h"/>
+    <ClInclude Include="src\pocomsg.h"/>
+    <ClInclude Include="include\Poco\PurgeStrategy.h"/>
+    <ClInclude Include="include\Poco\RotateStrategy.h"/>
+    <ClInclude Include="include\Poco\SimpleFileChannel.h"/>
+    <ClInclude Include="include\Poco\SplitterChannel.h"/>
+    <ClInclude Include="include\Poco\StreamChannel.h"/>
+    <ClInclude Include="include\Poco\SyslogChannel.h"/>
+    <ClInclude Include="include\Poco\WindowsConsoleChannel.h"/>
+    <ClInclude Include="include\Poco\AbstractObserver.h"/>
+    <ClInclude Include="include\Poco\NObserver.h"/>
+    <ClInclude Include="include\Poco\Notification.h"/>
+    <ClInclude Include="include\Poco\NotificationCenter.h"/>
+    <ClInclude Include="include\Poco\NotificationQueue.h"/>
+    <ClInclude Include="include\Poco\Observer.h"/>
+    <ClInclude Include="include\Poco\PriorityNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\TimedNotificationQueue.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_VMS.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32.h"/>
+    <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"/>
+    <ClInclude Include="include\Poco\DirectoryWatcher.h"/>
+    <ClInclude Include="include\Poco\File.h"/>
+    <ClInclude Include="include\Poco\File_UNIX.h"/>
+    <ClInclude Include="include\Poco\File_VMS.h"/>
+    <ClInclude Include="include\Poco\File_WIN32.h"/>
+    <ClInclude Include="include\Poco\File_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Glob.h"/>
+    <ClInclude Include="include\Poco\Path.h"/>
+    <ClInclude Include="include\Poco\Path_UNIX.h"/>
+    <ClInclude Include="include\Poco\Path_VMS.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32.h"/>
+    <ClInclude Include="include\Poco\Path_WIN32U.h"/>
+    <ClInclude Include="include\Poco\TemporaryFile.h"/>
+    <ClInclude Include="include\Poco\NamedEvent.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedEvent_WIN32U.h"/>
+    <ClInclude Include="include\Poco\NamedMutex.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_UNIX.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_VMS.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32.h"/>
+    <ClInclude Include="include\Poco\NamedMutex_WIN32U.h"/>
+    <ClInclude Include="include\Poco\Pipe.h"/>
+    <ClInclude Include="include\Poco\PipeImpl.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_DUMMY.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_POSIX.h"/>
+    <ClInclude Include="include\Poco\PipeImpl_WIN32.h"/>
+    <ClInclude Include="include\Poco\PipeStream.h"/>
+    <ClInclude Include="include\Poco\Process.h"/>
+    <ClInclude Include="include\Poco\Process_UNIX.h"/>
+    <ClInclude Include="include\Poco\Process_VMS.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32.h"/>
+    <ClInclude Include="include\Poco\Process_WIN32U.h"/>
+    <ClInclude Include="include\Poco\SharedMemory.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_DUMMY.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_POSIX.h"/>
+    <ClInclude Include="include\Poco\SharedMemory_WIN32.h"/>
+    <ClInclude Include="include\Poco\UUID.h"/>
+    <ClInclude Include="include\Poco\UUIDGenerator.h"/>
+    <ClInclude Include="include\Poco\Clock.h"/>
+    <ClInclude Include="include\Poco\DateTime.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormat.h"/>
+    <ClInclude Include="include\Poco\DateTimeFormatter.h"/>
+    <ClInclude Include="include\Poco\DateTimeParser.h"/>
+    <ClInclude Include="include\Poco\LocalDateTime.h"/>
+    <ClInclude Include="include\Poco\Stopwatch.h"/>
+    <ClInclude Include="include\Poco\Timespan.h"/>
+    <ClInclude Include="include\Poco\Timestamp.h"/>
+    <ClInclude Include="include\Poco\Timezone.h"/>
+    <ClInclude Include="include\Poco\ASCIIEncoding.h"/>
+    <ClInclude Include="include\Poco\Latin1Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin2Encoding.h"/>
+    <ClInclude Include="include\Poco\Latin9Encoding.h"/>
+    <ClInclude Include="include\Poco\ListMap.h"/>
+    <ClInclude Include="include\Poco\StreamConverter.h"/>
+    <ClInclude Include="include\Poco\TextBufferIterator.h"/>
+    <ClInclude Include="include\Poco\TextConverter.h"/>
+    <ClInclude Include="include\Poco\TextEncoding.h"/>
+    <ClInclude Include="include\Poco\TextIterator.h"/>
+    <ClInclude Include="include\Poco\Unicode.h"/>
+    <ClInclude Include="include\Poco\UnicodeConverter.h"/>
+    <ClInclude Include="include\Poco\UTF16Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF32Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8Encoding.h"/>
+    <ClInclude Include="include\Poco\UTF8String.h"/>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h"/>
+    <ClInclude Include="include\Poco\Windows1252Encoding.h"/>
+    <ClInclude Include="include\Poco\FileStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URI.h"/>
+    <ClInclude Include="include\Poco\URIStreamFactory.h"/>
+    <ClInclude Include="include\Poco\URIStreamOpener.h"/>
+    <ClInclude Include="include\Poco\Task.h"/>
+    <ClInclude Include="include\Poco\TaskManager.h"/>
+    <ClInclude Include="include\Poco\TaskNotification.h"/>
+    <ClInclude Include="include\Poco\AbstractDelegate.h"/>
+    <ClInclude Include="include\Poco\AbstractEvent.h"/>
+    <ClInclude Include="include\Poco\AbstractPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\BasicEvent.h"/>
+    <ClInclude Include="include\Poco\DefaultStrategy.h"/>
+    <ClInclude Include="include\Poco\Delegate.h"/>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h"/>
+    <ClInclude Include="include\Poco\EventArgs.h"/>
+    <ClInclude Include="include\Poco\Expire.h"/>
+    <ClInclude Include="include\Poco\FIFOEvent.h"/>
+    <ClInclude Include="include\Poco\FIFOStrategy.h"/>
+    <ClInclude Include="include\Poco\FunctionDelegate.h"/>
+    <ClInclude Include="include\Poco\FunctionPriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\NotificationStrategy.h"/>
+    <ClInclude Include="include\Poco\PriorityDelegate.h"/>
+    <ClInclude Include="include\Poco\PriorityEvent.h"/>
+    <ClInclude Include="include\Poco\PriorityExpire.h"/>
+    <ClInclude Include="include\Poco\PriorityStrategy.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h"/>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h"/>
+    <ClInclude Include="include\Poco\AbstractCache.h"/>
+    <ClInclude Include="include\Poco\AbstractStrategy.h"/>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\AccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\AccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ExpirationDecorator.h"/>
+    <ClInclude Include="include\Poco\ExpireCache.h"/>
+    <ClInclude Include="include\Poco\ExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\ExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\KeyValueArgs.h"/>
+    <ClInclude Include="include\Poco\LRUCache.h"/>
+    <ClInclude Include="include\Poco\LRUStrategy.h"/>
+    <ClInclude Include="include\Poco\StrategyCollection.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueAccessExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireLRUCache.h"/>
+    <ClInclude Include="include\Poco\UniqueExpireStrategy.h"/>
+    <ClInclude Include="include\Poco\ValidArgs.h"/>
+    <ClInclude Include="include\Poco\Hash.h"/>
+    <ClInclude Include="include\Poco\HashFunction.h"/>
+    <ClInclude Include="include\Poco\HashMap.h"/>
+    <ClInclude Include="include\Poco\HashSet.h"/>
+    <ClInclude Include="include\Poco\HashStatistic.h"/>
+    <ClInclude Include="include\Poco\HashTable.h"/>
+    <ClInclude Include="include\Poco\LinearHashTable.h"/>
+    <ClInclude Include="include\Poco\SimpleHashTable.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Pair.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Struct.h"/>
+    <ClInclude Include="include\Poco\Dynamic\Var.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarHolder.h"/>
+    <ClInclude Include="include\Poco\Dynamic\VarIterator.h"/>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\pocomsg.mc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath)
+      <Command Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">mc -h &quot;%(RootDir)%(Directory).&quot; -r &quot;%(RootDir)%(Directory).&quot; &quot;%(FullPath)
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">%(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ResourceCompile Include="src\pocomsg.rc"/>
     <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>
-    <ResourceCompile Include="src\pocomsg.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/Foundation_x64_vs120.vcxproj.filters b/Foundation/Foundation_x64_vs120.vcxproj.filters
index de071f668e..3bcb7b75c5 100644
--- a/Foundation/Foundation_x64_vs120.vcxproj.filters
+++ b/Foundation/Foundation_x64_vs120.vcxproj.filters
@@ -2,190 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{eed22eb8-615d-47c6-9148-bf4b06dcba89}</UniqueIdentifier>
+      <UniqueIdentifier>{7f22656e-f2e4-47d9-af35-e3b8f42a18fd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{e4b65ef2-2d99-41ac-8fce-ecce748757fe}</UniqueIdentifier>
+      <UniqueIdentifier>{b209138f-c282-4683-9386-ba7b947cd18a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{15b1d37c-f762-444f-943f-c1886dd9510c}</UniqueIdentifier>
+      <UniqueIdentifier>{1126a1a1-fe09-410d-88b4-b1d6267dc11c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{9e3b59da-7f2c-4e28-8b35-7c3e8abf2ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{d794dbab-3685-4834-a125-6f463e49c849}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{faa35c18-be02-43c4-8d4d-7e63c97447f0}</UniqueIdentifier>
+      <UniqueIdentifier>{545d187c-c702-4438-84f4-db0c0f960d5b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{642a8ece-5f25-439e-aebc-f0aabc17a24d}</UniqueIdentifier>
+      <UniqueIdentifier>{3cfbdc33-5cb4-43ba-8adc-4eb2ffae974b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\zlib">
-      <UniqueIdentifier>{873a6a3d-b159-495f-b307-908be9d0ca39}</UniqueIdentifier>
+      <UniqueIdentifier>{a0ab58c0-02d3-4325-b1ba-322878b8aae4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{243ce5c9-276b-41e0-b226-d2e8c4eb399d}</UniqueIdentifier>
+      <UniqueIdentifier>{d58ecaa7-b94b-4dcb-9222-29f2d558b86a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{171bf60e-c5e8-41a6-a8c4-4e5035ac40e4}</UniqueIdentifier>
+      <UniqueIdentifier>{0aae80e2-8daa-4ae5-8908-dbca15ea64c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{897efa40-8fd5-48ea-951f-5025e7bf316d}</UniqueIdentifier>
+      <UniqueIdentifier>{cad93c79-7ebd-4240-b34d-207cffab6c41}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{5449ee1f-18c8-46f2-ba3b-4851c2bed9be}</UniqueIdentifier>
+      <UniqueIdentifier>{95906cf2-c195-4d27-af4a-c2daf0f17bd8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{ed334c78-ef4a-42a2-b164-842b035b2891}</UniqueIdentifier>
+      <UniqueIdentifier>{bfc82f96-1d15-43fb-bbc2-4fc7990a7cc1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{cea4c790-2034-4779-a543-bb578ccb1950}</UniqueIdentifier>
+      <UniqueIdentifier>{caef2358-8c66-46d2-b1ed-30e47b784931}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{69675fb8-11fe-4ac9-b434-5fbfde370465}</UniqueIdentifier>
+      <UniqueIdentifier>{969f2215-0649-4ba8-bce7-d79961d811bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{7adff1e1-d832-49d7-80fe-0c84b92932f4}</UniqueIdentifier>
+      <UniqueIdentifier>{fe8329b6-abc1-4af3-b28f-368ebaff357a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{d16afff9-2b9b-4afc-9417-fc60165a4820}</UniqueIdentifier>
+      <UniqueIdentifier>{04faeb82-c52c-4152-95e5-ea48e7afdadd}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression">
-      <UniqueIdentifier>{27e4e676-acfb-4bdb-a9f5-1efd2d0b1e0e}</UniqueIdentifier>
+      <UniqueIdentifier>{37337268-1bed-47df-b3aa-a9072c1fc3aa}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Header Files">
-      <UniqueIdentifier>{15ad7723-f5d6-4b0c-adb8-4d1cf5f47476}</UniqueIdentifier>
+      <UniqueIdentifier>{204875b0-bd78-4483-a2f7-ac6ad37bd824}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Source Files">
-      <UniqueIdentifier>{88f53776-2079-4215-babb-230b3d06bd58}</UniqueIdentifier>
+      <UniqueIdentifier>{91f6d111-840d-40bd-8e5a-db734f14a489}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\Header Files">
-      <UniqueIdentifier>{d241990d-d11f-4929-8ffa-a2c060cb18cb}</UniqueIdentifier>
+      <UniqueIdentifier>{cca2043f-3e8d-4da5-8b39-e17cb9d460d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="RegularExpression\PCRE Source Files">
-      <UniqueIdentifier>{abf63bab-bd68-407d-87dd-7b49eb167dd1}</UniqueIdentifier>
+      <UniqueIdentifier>{f9f31cd2-201d-4a7d-b2dd-40212ea17b6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{cf605dfb-6591-4203-8b65-244a90cf5766}</UniqueIdentifier>
+      <UniqueIdentifier>{b1886ffc-dc5f-4931-a6e0-b96efe04ee7f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{7ce7dd5c-bf1a-441c-83cd-ff01664514ff}</UniqueIdentifier>
+      <UniqueIdentifier>{3bda36a6-ae30-499c-8b6f-2e1a081a7b98}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{ddb92b9f-2791-4041-8669-7cbb7db75308}</UniqueIdentifier>
+      <UniqueIdentifier>{88d3d468-f193-4eb5-878a-be0d91417771}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Message Files">
-      <UniqueIdentifier>{e96537d4-d193-4b36-8259-0f00191ed830}</UniqueIdentifier>
+      <UniqueIdentifier>{eb660148-b19d-469d-abc8-6f088eda0567}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Resource Files">
-      <UniqueIdentifier>{3822dfb8-f1d9-483b-8669-692755d5f989}</UniqueIdentifier>
+      <UniqueIdentifier>{45df7b72-3dda-48c7-882f-895983e3a287}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{0d24bd5b-b5b0-408a-816b-2debac7c8161}</UniqueIdentifier>
+      <UniqueIdentifier>{b6ca47a9-677a-4070-bee1-7f5912d6ccdb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{d61210ea-a9c7-4f70-9fc4-c78bfa4287d3}</UniqueIdentifier>
+      <UniqueIdentifier>{174c9372-8f7c-4328-b146-c4f99124f32f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ef783201-716d-4b64-b84d-4f214d2ed377}</UniqueIdentifier>
+      <UniqueIdentifier>{8cba533e-1f86-4d7f-b74f-f0f2114c9f77}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{13721cc0-4976-4884-8b33-d2929ccad127}</UniqueIdentifier>
+      <UniqueIdentifier>{f3b6e434-276f-4f00-afe3-197e93566c33}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{b1219e5a-7cd3-4250-9a9f-48047a814621}</UniqueIdentifier>
+      <UniqueIdentifier>{49a06afe-efa0-4ce6-bb57-88c5f8fb0dd8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{0d0d9117-9915-4251-a7e7-aa65a323166b}</UniqueIdentifier>
+      <UniqueIdentifier>{f76b7b69-223a-460f-b315-ba929e274e37}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{e579e608-e12e-42be-8c49-cc9a9581bedd}</UniqueIdentifier>
+      <UniqueIdentifier>{de7ead1e-f8d4-41cb-9a20-836a965f3943}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{c0302ef2-2ddd-4ab6-859c-f9d838083207}</UniqueIdentifier>
+      <UniqueIdentifier>{e757ec36-8605-415d-8fa2-8da30b4d9a97}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{902f59de-5b3b-4fa9-81fb-400142cf8ce8}</UniqueIdentifier>
+      <UniqueIdentifier>{f50354e2-5414-4a75-8f8b-2f2b95b66eba}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{c8bb647e-3992-4e61-8574-c58262745a52}</UniqueIdentifier>
+      <UniqueIdentifier>{7aff3142-b869-42e6-80f1-873b049874dc}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{af0928d0-f150-4d35-bde2-6312ea9d5953}</UniqueIdentifier>
+      <UniqueIdentifier>{2bc945d0-9dd3-465a-9d17-6527023f4723}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{a9e6090f-3b21-437d-9a93-50f6c3d6bd29}</UniqueIdentifier>
+      <UniqueIdentifier>{9fc5a3f0-0131-44c5-9238-78a492df82c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{3d02f5d0-b1b5-4b93-9a47-063ad3f08e61}</UniqueIdentifier>
+      <UniqueIdentifier>{6c749222-b4e5-43ba-8624-e6b4c40284de}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{18c6c8e3-0b20-4afb-bf19-c4558e3568a9}</UniqueIdentifier>
+      <UniqueIdentifier>{9659476a-88a8-4838-9303-350576c09484}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{0dbde655-aa5c-4dce-9880-3993a89efde5}</UniqueIdentifier>
+      <UniqueIdentifier>{a088124b-a40b-4669-abaa-81e2a99d2485}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{fdbf3495-96a6-4254-9f4c-8e420f5c568b}</UniqueIdentifier>
+      <UniqueIdentifier>{700a024c-19bf-463b-bf44-c4f751ae824e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{02e6ad4a-26c8-4ab2-af6c-4a39ee850242}</UniqueIdentifier>
+      <UniqueIdentifier>{0e217fde-6151-4e9d-81d2-a5f6cd68db0f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{08fcdce9-22a1-4336-b1b7-abf97d9a541a}</UniqueIdentifier>
+      <UniqueIdentifier>{646c504f-a20c-4586-9618-94ec5a58896b}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{fb3b5c0e-07cb-460f-bbf2-c3836bc22692}</UniqueIdentifier>
+      <UniqueIdentifier>{42b5c70d-55ea-4836-bcb6-8a6f6dadaaeb}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{82260cc1-f20d-4647-829a-3f213e88a388}</UniqueIdentifier>
+      <UniqueIdentifier>{2e597a2f-4e89-4078-8473-17d963590c3a}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{dbd582a0-df3b-4475-abb5-043be9a79a7c}</UniqueIdentifier>
+      <UniqueIdentifier>{a886e466-f2af-44e3-b414-cd6a77f2523e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{41f46e9d-8090-426b-8562-e4d22fd2937b}</UniqueIdentifier>
+      <UniqueIdentifier>{281a3c68-ed32-45ab-835f-b31597485125}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1ccf0703-d483-4a72-8abb-f601911839cc}</UniqueIdentifier>
+      <UniqueIdentifier>{f4c28e95-c80d-4c28-9087-0853058af595}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{ea621b2c-cdcf-4710-adb4-90265b48d2ca}</UniqueIdentifier>
+      <UniqueIdentifier>{bd33df64-f285-49f6-a245-519454c52ef8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events">
-      <UniqueIdentifier>{dc06be98-7865-469a-a0c6-f01fe2ebeeb8}</UniqueIdentifier>
+      <UniqueIdentifier>{ae2be318-55e6-4ee0-80ba-64800ab8ec87}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Header Files">
-      <UniqueIdentifier>{c179291d-1823-4297-9710-6af7123f8a91}</UniqueIdentifier>
+      <UniqueIdentifier>{18a89299-1cf3-4f9e-8a3c-c523145a9e72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Events\Source Files">
-      <UniqueIdentifier>{8831307b-6f33-460f-9069-51ee7563995d}</UniqueIdentifier>
+      <UniqueIdentifier>{91fa9a1b-8bbc-46fa-b9e6-01e9410279d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{0aab1e27-6341-4b50-8795-404c518d783e}</UniqueIdentifier>
+      <UniqueIdentifier>{23d39ace-8363-4ac0-abdf-462807e93360}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{5cbbf1df-2a1b-47e3-a217-addab713c565}</UniqueIdentifier>
+      <UniqueIdentifier>{23adbef7-b8a9-4b98-91b8-970c13e1f92f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{0f008454-6d63-4c65-9b75-7717a897a428}</UniqueIdentifier>
+      <UniqueIdentifier>{8f4c3ce7-cba6-45f3-ab5a-5521bc31f7e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{fb2c3d90-efdb-434a-a011-3097b35373e4}</UniqueIdentifier>
+      <UniqueIdentifier>{cbed86d3-0fbb-40a9-877d-a71f9fbb518d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{8db03882-c794-4ba9-b65e-e5765939e973}</UniqueIdentifier>
+      <UniqueIdentifier>{9b2e8e22-2ee7-42b4-a1bd-200b3cf74f16}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{4c9c3a5f-93fa-4852-96a3-c2159bd98556}</UniqueIdentifier>
+      <UniqueIdentifier>{73dd96c6-5732-4da8-af12-638cb64b7d80}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{52837383-e5d2-4f5e-bd44-eac0b06f79e0}</UniqueIdentifier>
+      <UniqueIdentifier>{a3535c49-7458-4ab3-b4d7-d0a3d8fa1210}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{4a82831e-73af-4f45-9096-d5a82f5f2052}</UniqueIdentifier>
+      <UniqueIdentifier>{b02d390e-b018-446c-a7b9-1f7f36afea8d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{db8200c1-46f0-4fff-90ca-db388f450539}</UniqueIdentifier>
+      <UniqueIdentifier>{37e58e90-28b0-4676-8022-1ec6cade7fcb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -207,6 +207,9 @@
     <ClCompile Include="src\Debugger.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Environment.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -249,6 +252,9 @@
     <ClCompile Include="src\FPEnvironment_WIN32.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\JSONString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MemoryPool.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -261,13 +267,16 @@
     <ClCompile Include="src\NumberParser.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\NumericString.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RefCountedObject.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\String.cpp">
+    <ClCompile Include="src\SortedDirectoryIterator.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\NumericString.cpp">
+    <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\StringTokenizer.cpp">
@@ -300,6 +309,9 @@
     <ClCompile Include="src\DeflatingStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStream.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStream.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -489,6 +501,9 @@
     <ClCompile Include="src\RegularExpression.cpp">
       <Filter>RegularExpression\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_byte_order.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_chartables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -498,40 +513,31 @@
     <ClCompile Include="src\pcre_config.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_byte_order.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_dfa_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_get.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\pcre_exec.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_fullinfo.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_globals.c">
-      <Filter>RegularExpression\PCRE Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre_maketables.c">
+    <ClCompile Include="src\pcre_get.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_newline.c">
+    <ClCompile Include="src\pcre_globals.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_ord2utf8.c">
+    <ClCompile Include="src\pcre_jit_compile.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_study.c">
+    <ClCompile Include="src\pcre_maketables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_tables.c">
+    <ClCompile Include="src\pcre_newline.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_jit_compile.c">
+    <ClCompile Include="src\pcre_ord2utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_refcount.c">
@@ -540,7 +546,10 @@
     <ClCompile Include="src\pcre_string_utils.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\pcre_version.c">
+    <ClCompile Include="src\pcre_study.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\pcre_tables.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\pcre_ucd.c">
@@ -549,6 +558,9 @@
     <ClCompile Include="src\pcre_valid_utf8.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre_version.c">
+      <Filter>RegularExpression\PCRE Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre_xclass.c">
       <Filter>RegularExpression\PCRE Source Files</Filter>
     </ClCompile>
@@ -672,10 +684,7 @@
     <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorStrategy.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SortedDirectoryIterator.cpp">
+    <ClCompile Include="src\DirectoryWatcher.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\File.cpp">
@@ -837,6 +846,9 @@
     <ClCompile Include="src\Latin1Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Latin2Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Latin9Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -864,12 +876,21 @@
     <ClCompile Include="src\UTF16Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\UTF32Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\UTF8Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\UTF8String.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Windows1250Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Windows1251Encoding.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1252Encoding.cpp">
       <Filter>Text\Source Files</Filter>
     </ClCompile>
@@ -903,12 +924,6 @@
     <ClCompile Include="src\HashStatistic.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryWatcher.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStream.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Var.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
@@ -918,21 +933,6 @@
     <ClCompile Include="src\VarIterator.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Latin2Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1250Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Windows1251Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UTF32Encoding.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\JSONString.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -998,6 +998,9 @@
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\FIFOBuffer.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Format.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1025,7 +1028,7 @@
     <ClInclude Include="include\Poco\Instantiator.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\ListMap.h">
+    <ClInclude Include="include\Poco\JSONString.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\MemoryPool.h">
@@ -1082,6 +1085,9 @@
     <ClInclude Include="include\Poco\SingletonHolder.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\String.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1328,6 +1334,9 @@
     <ClInclude Include="include\Poco\MD5Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Random.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -1511,16 +1520,7 @@
     <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\SortedDirectoryIterator.h">
+    <ClInclude Include="include\Poco\DirectoryWatcher.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\File.h">
@@ -1676,9 +1676,15 @@
     <ClInclude Include="include\Poco\Latin1Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Latin2Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Latin9Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\ListMap.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\StreamConverter.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1703,12 +1709,21 @@
     <ClInclude Include="include\Poco\UTF16Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\UTF32Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\UTF8Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\UTF8String.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Windows1250Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\Windows1251Encoding.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1252Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
@@ -1751,6 +1766,9 @@
     <ClInclude Include="include\Poco\Delegate.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\EventArgs.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
@@ -1781,12 +1799,24 @@
     <ClInclude Include="include\Poco\PriorityExpire.h">
       <Filter>Events\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PriorityStrategy.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIterator.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\RecursiveDirectoryIteratorImpl.h">
+      <Filter>Events\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AbstractCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\AbstractStrategy.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\AccessExpireCache.h">
       <Filter>Cache\Header Files</Filter>
     </ClInclude>
@@ -1865,22 +1895,13 @@
     <ClInclude Include="include\Poco\SimpleHashTable.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\AccessExpirationDecorator.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PriorityStrategy.h">
-      <Filter>Events\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\FIFOBufferStream.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\Pair.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Dynamic\Var.h">
+    <ClInclude Include="include\Poco\Dynamic\Struct.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Dynamic\Struct.h">
+    <ClInclude Include="include\Poco\Dynamic\Var.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\Dynamic\VarHolder.h">
@@ -1889,30 +1910,6 @@
     <ClInclude Include="include\Poco\Dynamic\VarIterator.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\Latin2Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1251Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\Windows1250Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\DirectoryWatcher.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTF32Encoding.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\UTFString.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\PBKDF2Engine.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Poco\JSONString.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">
diff --git a/Foundation/Foundation_x64_vs90.sln b/Foundation/Foundation_x64_vs90.sln
index 8862cb944f..6338564979 100644
--- a/Foundation/Foundation_x64_vs90.sln
+++ b/Foundation/Foundation_x64_vs90.sln
@@ -1,21 +1,20 @@
-
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs90.vcproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_x64_vs90.vcproj", "{B01196CC-B693-4548-8464-2FF60499E73F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs90.vcproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs90.vcproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_x64_vs90.vcproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_x64_vs90.vcproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F}
 	EndProjectSection
 EndProject
 Global
@@ -28,42 +27,42 @@ Global
 		release_static_mt|x64 = release_static_mt|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|x64.Build.0 = debug_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|x64.Build.0 = debug_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.ActiveCfg = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|x64.Build.0 = release_shared|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.ActiveCfg = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|x64.Build.0 = release_static_md|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
-		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|x64.Build.0 = release_static_mt|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.ActiveCfg = debug_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.Build.0 = debug_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.ActiveCfg = debug_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.Build.0 = debug_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.ActiveCfg = debug_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.Build.0 = debug_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.ActiveCfg = release_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.Build.0 = release_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.ActiveCfg = release_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.Build.0 = release_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.ActiveCfg = release_shared|x64
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.Build.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Build.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Deploy.0 = debug_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.ActiveCfg = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Build.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Deploy.0 = release_shared|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.ActiveCfg = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Build.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Deploy.0 = release_static_md|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Build.0 = debug_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|x64.Deploy.0 = debug_shared|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Build.0 = debug_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.ActiveCfg = release_shared|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Build.0 = release_shared|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|x64.Deploy.0 = release_shared|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.ActiveCfg = release_static_md|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Build.0 = release_static_md|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|x64.Deploy.0 = release_static_md|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.ActiveCfg = debug_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|x64.Build.0 = debug_shared|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
@@ -76,6 +75,18 @@ Global
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|x64.Build.0 = release_static_md|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|x64.Build.0 = release_static_mt|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.ActiveCfg = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|x64.Build.0 = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.ActiveCfg = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|x64.Build.0 = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.ActiveCfg = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|x64.Build.0 = debug_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.ActiveCfg = release_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|x64.Build.0 = release_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.ActiveCfg = release_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|x64.Build.0 = release_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.ActiveCfg = release_shared|x64
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|x64.Build.0 = release_shared|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj
index 06cdf7e025..be06072f5c 100644
--- a/Foundation/Foundation_x64_vs90.vcproj
+++ b/Foundation/Foundation_x64_vs90.vcproj
@@ -1,48 +1,38 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
 	Name="Foundation"
-	ProjectGUID="{8164D41D-B053-405B-826C-CF37AC0EF176}"
+	Version="9.00"
+	ProjectType="Visual C++"
+	ProjectGUID="{B01196CC-B693-4548-8464-2FF60499E73F}"
 	RootNamespace="Foundation"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="x64"
-		/>
+			Name="x64"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
+	<ToolFiles/>
 	<Configurations>
 		<Configuration
 			Name="debug_shared|x64"
-			OutputDirectory="obj64\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj64\Foundation\$(ConfigurationName)"
+			OutputDirectory="obj64\$(ConfigurationName)"
+			IntermediateDirectory="obj64\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -53,19 +43,17 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4244"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="iphlpapi.lib"
@@ -74,54 +62,42 @@
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\bin64\PocoFoundation64d.pdb"
+				AdditionalLibraryDirectories="..\lib64"
 				SubSystem="1"
 				ImportLibrary="..\lib64\PocoFoundationd.lib"
 				TargetMachine="17"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCManifestTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="release_shared|x64"
-			OutputDirectory="obj64\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj64\Foundation\$(ConfigurationName)"
+			OutputDirectory="obj64\$(ConfigurationName)"
+			IntermediateDirectory="obj64\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
@@ -129,10 +105,8 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;PCRE_STATIC"
-				GeneratePreprocessedFile="0"
-				KeepComments="false"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -141,19 +115,17 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 				CompileAs="0"
-				DisableSpecificWarnings="4244"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="iphlpapi.lib"
@@ -161,276 +133,220 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="false"
-				ProgramDatabaseFile=""
+				AdditionalLibraryDirectories="..\lib64"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				OptimizeForWindows98="0"
 				ImportLibrary="..\lib64\PocoFoundation.lib"
 				TargetMachine="17"
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCManifestTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="release_static_md|x64"
-			OutputDirectory="obj64\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj64\Foundation\$(ConfigurationName)"
+			Name="debug_static_mt|x64"
+			OutputDirectory="obj64\$(ConfigurationName)"
+			IntermediateDirectory="obj64\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
-				GeneratePreprocessedFile="0"
-				KeepComments="false"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="..\lib64\PocoFoundationmtd.pdb"
 				WarningLevel="3"
-				DebugInformationFormat="0"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4244"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib64\PocoFoundationmd.lib"
-			/>
+				OutputFile="..\lib64\PocoFoundationmtd.lib"
+				TargetMachine="17"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="debug_static_md|x64"
-			OutputDirectory="obj64\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj64\Foundation\$(ConfigurationName)"
+			Name="release_static_mt|x64"
+			OutputDirectory="obj64\$(ConfigurationName)"
+			IntermediateDirectory="obj64\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
 				CompileAs="0"
-				DisableSpecificWarnings="4244"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib64\PocoFoundationmdd.lib"
-			/>
+				OutputFile="..\lib64\PocoFoundationmt.lib"
+				TargetMachine="17"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="debug_static_mt|x64"
-			OutputDirectory="obj64\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj64\Foundation\$(ConfigurationName)"
+			Name="debug_static_md|x64"
+			OutputDirectory="obj64\$(ConfigurationName)"
+			IntermediateDirectory="obj64\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="..\lib64\PocoFoundationmdd.pdb"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4244"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib64\PocoFoundationmtd.lib"
-			/>
+				OutputFile="..\lib64\PocoFoundationmdd.lib"
+				TargetMachine="17"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
-			Name="release_static_mt|x64"
-			OutputDirectory="obj64\Foundation\$(ConfigurationName)"
-			IntermediateDirectory="obj64\Foundation\$(ConfigurationName)"
+			Name="release_static_md|x64"
+			OutputDirectory="obj64\$(ConfigurationName)"
+			IntermediateDirectory="obj64\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCMIDLTool"
-			/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
@@ -438,5907 +354,3941 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC"
-				GeneratePreprocessedFile="0"
-				KeepComments="false"
+				AdditionalIncludeDirectories=".\include;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 				CompileAs="0"
-				DisableSpecificWarnings="4244"
-			/>
+				DisableSpecificWarnings=""
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
-				OutputFile="..\lib64\PocoFoundationmt.lib"
-			/>
+				OutputFile="..\lib64\PocoFoundationmd.lib"
+				TargetMachine="17"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCBscMakeTool"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
+	<References/>
 	<Files>
 		<Filter
-			Name="Core"
-			>
+			Name="Core">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Ascii.cpp"
-					>
-				</File>
+					RelativePath=".\src\Ascii.cpp"/>
 				<File
-					RelativePath=".\src\AtomicCounter.cpp"
-					>
-				</File>
+					RelativePath=".\src\AtomicCounter.cpp"/>
 				<File
-					RelativePath=".\src\Bugcheck.cpp"
-					>
-				</File>
+					RelativePath=".\src\Bugcheck.cpp"/>
 				<File
-					RelativePath=".\src\ByteOrder.cpp"
-					>
+					RelativePath=".\src\ByteOrder.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Checksum.cpp"
-					>
-				</File>
+					RelativePath=".\src\Checksum.cpp"/>
 				<File
-					RelativePath=".\src\Debugger.cpp"
-					>
-				</File>
+					RelativePath=".\src\Debugger.cpp"/>
 				<File
-					RelativePath=".\src\DirectoryIteratorStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryIteratorStrategy.cpp"/>
 				<File
-					RelativePath=".\src\Environment.cpp"
-					>
-				</File>
+					RelativePath=".\src\Environment.cpp"/>
 				<File
-					RelativePath=".\src\Environment_UNIX.cpp"
-					>
+					RelativePath=".\src\Environment_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Environment_VMS.cpp"
-					>
+					RelativePath=".\src\Environment_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Environment_WIN32.cpp"
-					>
+					RelativePath=".\src\Environment_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Environment_WIN32U.cpp"
-					>
+					RelativePath=".\src\Environment_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Error.cpp"
-					>
-				</File>
+					RelativePath=".\src\Error.cpp"/>
 				<File
-					RelativePath=".\src\Exception.cpp"
-					>
-				</File>
+					RelativePath=".\src\Exception.cpp"/>
 				<File
-					RelativePath=".\src\Format.cpp"
-					>
-				</File>
+					RelativePath=".\src\Format.cpp"/>
 				<File
-					RelativePath=".\src\FPEnvironment.cpp"
-					>
-				</File>
+					RelativePath=".\src\FPEnvironment.cpp"/>
 				<File
-					RelativePath=".\src\FPEnvironment_C99.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_C99.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_DEC.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_DEC.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_DUMMY.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_SUN.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_SUN.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FPEnvironment_WIN32.cpp"
-					>
+					RelativePath=".\src\FPEnvironment_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\MemoryPool.cpp"
-					>
-				</File>
+					RelativePath=".\src\JSONString.cpp"/>
 				<File
-					RelativePath=".\src\NestedDiagnosticContext.cpp"
-					>
-				</File>
+					RelativePath=".\src\MemoryPool.cpp"/>
 				<File
-					RelativePath=".\src\NumberFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\NestedDiagnosticContext.cpp"/>
 				<File
-					RelativePath=".\src\NumberParser.cpp"
-					>
-				</File>
+					RelativePath=".\src\NumberFormatter.cpp"/>
 				<File
-					RelativePath=".\src\NumericString.cpp"
-					>
-				</File>
+					RelativePath=".\src\NumberParser.cpp"/>
 				<File
-					RelativePath=".\src\RefCountedObject.cpp"
-					>
-				</File>
+					RelativePath=".\src\NumericString.cpp"/>
 				<File
-					RelativePath=".\src\SortedDirectoryIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\RefCountedObject.cpp"/>
 				<File
-					RelativePath=".\src\String.cpp"
-					>
+					RelativePath=".\src\SortedDirectoryIterator.cpp"/>
+				<File
+					RelativePath=".\src\String.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\StringTokenizer.cpp"
-					>
-				</File>
+					RelativePath=".\src\StringTokenizer.cpp"/>
 				<File
-					RelativePath=".\src\Void.cpp"
-					>
-				</File>
+					RelativePath=".\src\Void.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Any.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Any.h"/>
 				<File
-					RelativePath=".\include\Poco\Ascii.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Ascii.h"/>
 				<File
-					RelativePath=".\include\Poco\AtomicCounter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AtomicCounter.h"/>
 				<File
-					RelativePath=".\include\Poco\AutoPtr.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AutoPtr.h"/>
 				<File
-					RelativePath=".\include\Poco\AutoReleasePool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AutoReleasePool.h"/>
 				<File
-					RelativePath=".\include\Poco\Buffer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Buffer.h"/>
 				<File
-					RelativePath=".\include\Poco\Bugcheck.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Bugcheck.h"/>
 				<File
-					RelativePath=".\include\Poco\ByteOrder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ByteOrder.h"/>
 				<File
-					RelativePath=".\include\Poco\Checksum.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Checksum.h"/>
 				<File
-					RelativePath=".\include\Poco\Config.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Config.h"/>
 				<File
-					RelativePath=".\include\Poco\Debugger.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Debugger.h"/>
 				<File
-					RelativePath=".\include\Poco\DynamicAny.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DynamicAny.h"/>
 				<File
-					RelativePath=".\include\Poco\DynamicAnyHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DynamicAnyHolder.h"/>
 				<File
-					RelativePath=".\include\Poco\DynamicFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DynamicFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Environment_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Environment_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Error.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Error.h"/>
 				<File
-					RelativePath=".\include\Poco\Exception.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Exception.h"/>
 				<File
-					RelativePath=".\include\Poco\FIFOBuffer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOBuffer.h"/>
 				<File
-					RelativePath=".\include\Poco\Format.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Format.h"/>
 				<File
-					RelativePath=".\include\Poco\Foundation.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Foundation.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_C99.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_C99.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_DEC.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_DEC.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_DUMMY.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_DUMMY.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_SUN.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_SUN.h"/>
 				<File
-					RelativePath=".\include\Poco\FPEnvironment_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FPEnvironment_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Instantiator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Instantiator.h"/>
 				<File
-					RelativePath=".\include\Poco\MemoryPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\JSONString.h"/>
 				<File
-					RelativePath=".\include\Poco\MetaProgramming.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MemoryPool.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedTuple.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MetaProgramming.h"/>
 				<File
-					RelativePath=".\include\Poco\NestedDiagnosticContext.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedTuple.h"/>
 				<File
-					RelativePath=".\include\Poco\Nullable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NestedDiagnosticContext.h"/>
 				<File
-					RelativePath=".\include\Poco\NumberFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Nullable.h"/>
 				<File
-					RelativePath=".\include\Poco\NumberParser.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NumberFormatter.h"/>
 				<File
-					RelativePath=".\include\Poco\NumericString.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NumberParser.h"/>
 				<File
-					RelativePath=".\include\Poco\ObjectPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NumericString.h"/>
 				<File
-					RelativePath=".\include\Poco\Optional.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ObjectPool.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Optional.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Platform_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Poco.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Platform_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\RefCountedObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Poco.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedPtr.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RefCountedObject.h"/>
 				<File
-					RelativePath=".\include\Poco\SingletonHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedPtr.h"/>
 				<File
-					RelativePath=".\include\Poco\SortedDirectoryIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SingletonHolder.h"/>
 				<File
-					RelativePath=".\include\Poco\String.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SortedDirectoryIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\StringTokenizer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\String.h"/>
 				<File
-					RelativePath=".\include\Poco\Tuple.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StringTokenizer.h"/>
 				<File
-					RelativePath=".\include\Poco\TypeList.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Tuple.h"/>
 				<File
-					RelativePath=".\include\Poco\Types.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TypeList.h"/>
 				<File
-					RelativePath=".\include\Poco\UnWindows.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Types.h"/>
 				<File
-					RelativePath=".\include\Poco\Version.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnWindows.h"/>
 				<File
-					RelativePath=".\include\Poco\Void.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Version.h"/>
+				<File
+					RelativePath=".\include\Poco\Void.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Streams"
-			>
+			Name="Streams">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Base32Decoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base32Decoder.cpp"/>
 				<File
-					RelativePath=".\src\Base32Encoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base32Encoder.cpp"/>
 				<File
-					RelativePath=".\src\Base64Decoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base64Decoder.cpp"/>
 				<File
-					RelativePath=".\src\Base64Encoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\Base64Encoder.cpp"/>
 				<File
-					RelativePath=".\src\BinaryReader.cpp"
-					>
-				</File>
+					RelativePath=".\src\BinaryReader.cpp"/>
 				<File
-					RelativePath=".\src\BinaryWriter.cpp"
-					>
-				</File>
+					RelativePath=".\src\BinaryWriter.cpp"/>
 				<File
-					RelativePath=".\src\CountingStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\CountingStream.cpp"/>
 				<File
-					RelativePath=".\src\DeflatingStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\DeflatingStream.cpp"/>
 				<File
-					RelativePath=".\src\FIFOBufferStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\FIFOBufferStream.cpp"/>
 				<File
-					RelativePath=".\src\FileStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\FileStream.cpp"/>
 				<File
-					RelativePath=".\src\FileStream_POSIX.cpp"
-					>
+					RelativePath=".\src\FileStream_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\FileStream_WIN32.cpp"
-					>
+					RelativePath=".\src\FileStream_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\HexBinaryDecoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\HexBinaryDecoder.cpp"/>
 				<File
-					RelativePath=".\src\HexBinaryEncoder.cpp"
-					>
-				</File>
+					RelativePath=".\src\HexBinaryEncoder.cpp"/>
 				<File
-					RelativePath=".\src\InflatingStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\InflatingStream.cpp"/>
 				<File
-					RelativePath=".\src\LineEndingConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\LineEndingConverter.cpp"/>
 				<File
-					RelativePath=".\src\MemoryStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\MemoryStream.cpp"/>
 				<File
-					RelativePath=".\src\NullStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\NullStream.cpp"/>
 				<File
-					RelativePath=".\src\StreamCopier.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamCopier.cpp"/>
 				<File
-					RelativePath=".\src\StreamTokenizer.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamTokenizer.cpp"/>
 				<File
-					RelativePath=".\src\TeeStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\TeeStream.cpp"/>
 				<File
-					RelativePath=".\src\Token.cpp"
-					>
-				</File>
+					RelativePath=".\src\Token.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Base32Decoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\include\Poco\Base32Encoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base32Decoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Base64Decoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base32Encoder.h"/>
 				<File
-					RelativePath=".\include\Poco\Base64Encoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base64Decoder.h"/>
 				<File
-					RelativePath=".\include\Poco\BinaryReader.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Base64Encoder.h"/>
 				<File
-					RelativePath=".\include\Poco\BinaryWriter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BinaryReader.h"/>
 				<File
-					RelativePath=".\include\Poco\BufferAllocator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BinaryWriter.h"/>
 				<File
-					RelativePath=".\include\Poco\BufferedBidirectionalStreamBuf.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferAllocator.h"/>
 				<File
-					RelativePath=".\include\Poco\BufferedStreamBuf.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferedBidirectionalStreamBuf.h"/>
 				<File
-					RelativePath=".\include\Poco\CountingStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BufferedStreamBuf.h"/>
 				<File
-					RelativePath=".\include\Poco\DeflatingStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\CountingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\FIFOBufferStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DeflatingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\FileStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream.h"/>
 				<File
-					RelativePath=".\include\Poco\FileStream_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\FileStream_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStream_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\HexBinaryDecoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HexBinaryDecoder.h"/>
 				<File
-					RelativePath=".\include\Poco\HexBinaryEncoder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HexBinaryEncoder.h"/>
 				<File
-					RelativePath=".\include\Poco\InflatingStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\InflatingStream.h"/>
 				<File
-					RelativePath=".\include\Poco\LineEndingConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LineEndingConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\MemoryStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MemoryStream.h"/>
 				<File
-					RelativePath=".\include\Poco\NullStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NullStream.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamCopier.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamCopier.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamTokenizer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamTokenizer.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamUtil.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamUtil.h"/>
 				<File
-					RelativePath=".\include\Poco\TeeStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TeeStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Token.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Token.h"/>
 				<File
-					RelativePath=".\include\Poco\UnbufferedStreamBuf.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnbufferedStreamBuf.h"/>
 			</Filter>
 			<Filter
-				Name="zlib"
-				>
+				Name="zlib">
 				<File
-					RelativePath=".\src\adler32.c"
-					>
-				</File>
+					RelativePath=".\src\adler32.c"/>
 				<File
-					RelativePath=".\src\compress.c"
-					>
-				</File>
+					RelativePath=".\src\compress.c"/>
 				<File
-					RelativePath=".\src\crc32.c"
-					>
-				</File>
+					RelativePath=".\src\crc32.c"/>
 				<File
-					RelativePath=".\src\crc32.h"
-					>
-				</File>
+					RelativePath=".\src\crc32.h"/>
 				<File
-					RelativePath=".\src\deflate.c"
-					>
-				</File>
+					RelativePath=".\src\deflate.c"/>
 				<File
-					RelativePath=".\src\deflate.h"
-					>
-				</File>
+					RelativePath=".\src\deflate.h"/>
 				<File
-					RelativePath=".\src\infback.c"
-					>
-				</File>
+					RelativePath=".\src\infback.c"/>
 				<File
-					RelativePath=".\src\inffast.c"
-					>
-				</File>
+					RelativePath=".\src\inffast.c"/>
 				<File
-					RelativePath=".\src\inffast.h"
-					>
-				</File>
+					RelativePath=".\src\inffast.h"/>
 				<File
-					RelativePath=".\src\inffixed.h"
-					>
-				</File>
+					RelativePath=".\src\inffixed.h"/>
 				<File
-					RelativePath=".\src\inflate.c"
-					>
-				</File>
+					RelativePath=".\src\inflate.c"/>
 				<File
-					RelativePath=".\src\inflate.h"
-					>
-				</File>
+					RelativePath=".\src\inflate.h"/>
 				<File
-					RelativePath=".\src\inftrees.c"
-					>
-				</File>
+					RelativePath=".\src\inftrees.c"/>
 				<File
-					RelativePath=".\src\inftrees.h"
-					>
-				</File>
+					RelativePath=".\src\inftrees.h"/>
 				<File
-					RelativePath=".\src\trees.c"
-					>
-				</File>
+					RelativePath=".\src\trees.c"/>
 				<File
-					RelativePath=".\src\trees.h"
-					>
-				</File>
+					RelativePath=".\src\trees.h"/>
 				<File
-					RelativePath=".\src\zconf.h"
-					>
-				</File>
+					RelativePath=".\src\zconf.h"/>
 				<File
-					RelativePath=".\src\zlib.h"
-					>
-				</File>
+					RelativePath=".\src\zlib.h"/>
 				<File
-					RelativePath=".\src\zutil.c"
-					>
-				</File>
+					RelativePath=".\src\zutil.c"/>
 				<File
-					RelativePath=".\src\zutil.h"
-					>
-				</File>
+					RelativePath=".\src\zutil.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Threading"
-			>
+			Name="Threading">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\ActiveDispatcher.cpp"
-					>
-				</File>
+					RelativePath=".\src\ActiveDispatcher.cpp"/>
 				<File
-					RelativePath=".\src\Condition.cpp"
-					>
-				</File>
+					RelativePath=".\src\Condition.cpp"/>
 				<File
-					RelativePath=".\src\ErrorHandler.cpp"
-					>
-				</File>
+					RelativePath=".\src\ErrorHandler.cpp"/>
 				<File
-					RelativePath=".\src\Event.cpp"
-					>
-				</File>
+					RelativePath=".\src\Event.cpp"/>
 				<File
-					RelativePath=".\src\Event_POSIX.cpp"
-					>
+					RelativePath=".\src\Event_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Event_WIN32.cpp"
-					>
+					RelativePath=".\src\Event_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Mutex.cpp"
-					>
-				</File>
+					RelativePath=".\src\Mutex.cpp"/>
 				<File
-					RelativePath=".\src\Mutex_POSIX.cpp"
-					>
+					RelativePath=".\src\Mutex_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Mutex_WIN32.cpp"
-					>
+					RelativePath=".\src\Mutex_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Runnable.cpp"
-					>
-				</File>
+					RelativePath=".\src\Runnable.cpp"/>
 				<File
-					RelativePath=".\src\RWLock.cpp"
-					>
-				</File>
+					RelativePath=".\src\RWLock.cpp"/>
 				<File
-					RelativePath=".\src\RWLock_POSIX.cpp"
-					>
+					RelativePath=".\src\RWLock_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\RWLock_WIN32.cpp"
-					>
+					RelativePath=".\src\RWLock_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Semaphore.cpp"
-					>
-				</File>
+					RelativePath=".\src\Semaphore.cpp"/>
 				<File
-					RelativePath=".\src\Semaphore_POSIX.cpp"
-					>
+					RelativePath=".\src\Semaphore_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Semaphore_WIN32.cpp"
-					>
+					RelativePath=".\src\Semaphore_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SignalHandler.cpp"
-					>
+					RelativePath=".\src\SignalHandler.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SynchronizedObject.cpp"
-					>
-				</File>
+					RelativePath=".\src\SynchronizedObject.cpp"/>
 				<File
-					RelativePath=".\src\Thread.cpp"
-					>
-				</File>
+					RelativePath=".\src\Thread.cpp"/>
 				<File
-					RelativePath=".\src\Thread_POSIX.cpp"
-					>
+					RelativePath=".\src\Thread_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Thread_WIN32.cpp"
-					>
+					RelativePath=".\src\Thread_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\ThreadLocal.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadLocal.cpp"/>
 				<File
-					RelativePath=".\src\ThreadPool.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadPool.cpp"/>
 				<File
-					RelativePath=".\src\ThreadTarget.cpp"
-					>
-				</File>
+					RelativePath=".\src\ThreadTarget.cpp"/>
 				<File
-					RelativePath=".\src\Timer.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timer.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ActiveDispatcher.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveDispatcher.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveMethod.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveMethod.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveResult.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveResult.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveRunnable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveRunnable.h"/>
 				<File
-					RelativePath=".\include\Poco\ActiveStarter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ActiveStarter.h"/>
 				<File
-					RelativePath=".\include\Poco\Activity.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Activity.h"/>
 				<File
-					RelativePath=".\include\Poco\Condition.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Condition.h"/>
 				<File
-					RelativePath=".\include\Poco\ErrorHandler.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ErrorHandler.h"/>
 				<File
-					RelativePath=".\include\Poco\Event.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event.h"/>
 				<File
-					RelativePath=".\include\Poco\Event_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Event_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Event_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Mutex_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Mutex_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Runnable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Runnable.h"/>
 				<File
-					RelativePath=".\include\Poco\RunnableAdapter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RunnableAdapter.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\RWLock_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RWLock_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\ScopedLock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ScopedLock.h"/>
 				<File
-					RelativePath=".\include\Poco\ScopedUnlock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ScopedUnlock.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Semaphore_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Semaphore_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\SignalHandler.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SignalHandler.h"/>
 				<File
-					RelativePath=".\include\Poco\SynchronizedObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SynchronizedObject.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Thread_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Thread_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\ThreadLocal.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ThreadLocal.h"/>
 				<File
-					RelativePath=".\include\Poco\ThreadPool.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ThreadPool.h"/>
 				<File
-					RelativePath=".\include\Poco\ThreadTarget.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ThreadTarget.h"/>
 				<File
-					RelativePath=".\include\Poco\Timer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timer.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Crypt"
-			>
+			Name="Crypt">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\DigestEngine.cpp"
-					>
-				</File>
+					RelativePath=".\src\DigestEngine.cpp"/>
 				<File
-					RelativePath=".\src\DigestStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\DigestStream.cpp"/>
 				<File
-					RelativePath=".\src\MD4Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\MD4Engine.cpp"/>
 				<File
-					RelativePath=".\src\MD5Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\MD5Engine.cpp"/>
 				<File
-					RelativePath=".\src\Random.cpp"
-					>
-				</File>
+					RelativePath=".\src\Random.cpp"/>
 				<File
-					RelativePath=".\src\RandomStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\RandomStream.cpp"/>
 				<File
-					RelativePath=".\src\SHA1Engine.cpp"
-					>
-				</File>
+					RelativePath=".\src\SHA1Engine.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\DigestEngine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DigestEngine.h"/>
 				<File
-					RelativePath=".\include\Poco\DigestStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DigestStream.h"/>
 				<File
-					RelativePath=".\include\Poco\HMACEngine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HMACEngine.h"/>
 				<File
-					RelativePath=".\include\Poco\MD4Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MD4Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\MD5Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MD5Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\PBKDF2Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PBKDF2Engine.h"/>
 				<File
-					RelativePath=".\include\Poco\Random.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Random.h"/>
 				<File
-					RelativePath=".\include\Poco\RandomStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RandomStream.h"/>
 				<File
-					RelativePath=".\include\Poco\SHA1Engine.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SHA1Engine.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="SharedLibrary"
-			>
+			Name="SharedLibrary">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Manifest.cpp"
-					>
-				</File>
+					RelativePath=".\src\Manifest.cpp"/>
 				<File
-					RelativePath=".\src\SharedLibrary.cpp"
-					>
-				</File>
+					RelativePath=".\src\SharedLibrary.cpp"/>
 				<File
-					RelativePath=".\src\SharedLibrary_HPUX.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_HPUX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_UNIX.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_VMS.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_WIN32.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedLibrary_WIN32U.cpp"
-					>
+					RelativePath=".\src\SharedLibrary_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ClassLibrary.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ClassLibrary.h"/>
 				<File
-					RelativePath=".\include\Poco\ClassLoader.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ClassLoader.h"/>
 				<File
-					RelativePath=".\include\Poco\Manifest.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Manifest.h"/>
 				<File
-					RelativePath=".\include\Poco\MetaObject.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\MetaObject.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_HPUX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_HPUX.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedLibrary_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedLibrary_WIN32U.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="RegularExpression"
-			>
+			Name="RegularExpression">
 			<Filter
-				Name="PCRE Header Files"
-				>
+				Name="PCRE Header Files">
 				<File
-					RelativePath=".\src\pcre.h"
-					>
-				</File>
+					RelativePath=".\src\pcre.h"/>
 				<File
-					RelativePath=".\src\pcre_config.h"
-					>
-				</File>
+					RelativePath=".\src\pcre_config.h"/>
 				<File
-					RelativePath=".\src\pcre_internal.h"
-					>
-				</File>
+					RelativePath=".\src\pcre_internal.h"/>
 				<File
-					RelativePath=".\src\ucp.h"
-					>
-				</File>
+					RelativePath=".\src\ucp.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\RegularExpression.cpp"
-					>
-				</File>
+					RelativePath=".\src\RegularExpression.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\RegularExpression.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RegularExpression.h"/>
 			</Filter>
 			<Filter
-				Name="PCRE Source Files"
-				>
+				Name="PCRE Source Files">
 				<File
-					RelativePath=".\src\pcre_byte_order.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_byte_order.c"/>
 				<File
-					RelativePath=".\src\pcre_chartables.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_chartables.c"/>
 				<File
-					RelativePath=".\src\pcre_compile.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_compile.c"/>
 				<File
-					RelativePath=".\src\pcre_config.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_config.c"/>
 				<File
-					RelativePath=".\src\pcre_dfa_exec.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_dfa_exec.c"/>
 				<File
-					RelativePath=".\src\pcre_exec.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_exec.c"/>
 				<File
-					RelativePath=".\src\pcre_fullinfo.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_fullinfo.c"/>
 				<File
-					RelativePath=".\src\pcre_get.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_get.c"/>
 				<File
-					RelativePath=".\src\pcre_globals.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_globals.c"/>
 				<File
-					RelativePath=".\src\pcre_jit_compile.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_jit_compile.c"/>
 				<File
-					RelativePath=".\src\pcre_maketables.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_maketables.c"/>
 				<File
-					RelativePath=".\src\pcre_newline.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_newline.c"/>
 				<File
-					RelativePath=".\src\pcre_ord2utf8.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_ord2utf8.c"/>
 				<File
-					RelativePath=".\src\pcre_refcount.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_refcount.c"/>
 				<File
-					RelativePath=".\src\pcre_string_utils.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_string_utils.c"/>
 				<File
-					RelativePath=".\src\pcre_study.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_study.c"/>
 				<File
-					RelativePath=".\src\pcre_tables.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_tables.c"/>
 				<File
-					RelativePath=".\src\pcre_ucd.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_ucd.c"/>
 				<File
-					RelativePath=".\src\pcre_valid_utf8.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_valid_utf8.c"/>
 				<File
-					RelativePath=".\src\pcre_version.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_version.c"/>
 				<File
-					RelativePath=".\src\pcre_xclass.c"
-					>
-				</File>
+					RelativePath=".\src\pcre_xclass.c"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Logging"
-			>
+			Name="Logging">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\ArchiveStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\ArchiveStrategy.cpp"/>
 				<File
-					RelativePath=".\src\AsyncChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\AsyncChannel.cpp"/>
 				<File
-					RelativePath=".\src\Channel.cpp"
-					>
-				</File>
+					RelativePath=".\src\Channel.cpp"/>
 				<File
-					RelativePath=".\src\Configurable.cpp"
-					>
-				</File>
+					RelativePath=".\src\Configurable.cpp"/>
 				<File
-					RelativePath=".\src\ConsoleChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\ConsoleChannel.cpp"/>
 				<File
-					RelativePath=".\src\EventLogChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\EventLogChannel.cpp"/>
 				<File
-					RelativePath=".\src\FileChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\FileChannel.cpp"/>
 				<File
-					RelativePath=".\src\Formatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\Formatter.cpp"/>
 				<File
-					RelativePath=".\src\FormattingChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\FormattingChannel.cpp"/>
 				<File
-					RelativePath=".\src\LogFile.cpp"
-					>
-				</File>
+					RelativePath=".\src\LogFile.cpp"/>
 				<File
-					RelativePath=".\src\LogFile_STD.cpp"
-					>
+					RelativePath=".\src\LogFile_STD.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_VMS.cpp"
-					>
+					RelativePath=".\src\LogFile_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_WIN32.cpp"
-					>
+					RelativePath=".\src\LogFile_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\LogFile_WIN32U.cpp"
-					>
+					RelativePath=".\src\LogFile_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Logger.cpp"
-					>
-				</File>
+					RelativePath=".\src\Logger.cpp"/>
 				<File
-					RelativePath=".\src\LoggingFactory.cpp"
-					>
-				</File>
+					RelativePath=".\src\LoggingFactory.cpp"/>
 				<File
-					RelativePath=".\src\LoggingRegistry.cpp"
-					>
-				</File>
+					RelativePath=".\src\LoggingRegistry.cpp"/>
 				<File
-					RelativePath=".\src\LogStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\LogStream.cpp"/>
 				<File
-					RelativePath=".\src\Message.cpp"
-					>
-				</File>
+					RelativePath=".\src\Message.cpp"/>
 				<File
-					RelativePath=".\src\NullChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\NullChannel.cpp"/>
 				<File
-					RelativePath=".\src\OpcomChannel.cpp"
-					>
+					RelativePath=".\src\OpcomChannel.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PatternFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\PatternFormatter.cpp"/>
 				<File
-					RelativePath=".\src\PurgeStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\PurgeStrategy.cpp"/>
 				<File
-					RelativePath=".\src\RotateStrategy.cpp"
-					>
-				</File>
+					RelativePath=".\src\RotateStrategy.cpp"/>
 				<File
-					RelativePath=".\src\SimpleFileChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\SimpleFileChannel.cpp"/>
 				<File
-					RelativePath=".\src\SplitterChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\SplitterChannel.cpp"/>
 				<File
-					RelativePath=".\src\StreamChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamChannel.cpp"/>
 				<File
-					RelativePath=".\src\SyslogChannel.cpp"
-					>
+					RelativePath=".\src\SyslogChannel.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\WindowsConsoleChannel.cpp"
-					>
-				</File>
+					RelativePath=".\src\WindowsConsoleChannel.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ArchiveStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ArchiveStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\AsyncChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AsyncChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\Channel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Channel.h"/>
 				<File
-					RelativePath=".\include\Poco\Configurable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Configurable.h"/>
 				<File
-					RelativePath=".\include\Poco\ConsoleChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ConsoleChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\EventLogChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\EventLogChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\FileChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\Formatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Formatter.h"/>
 				<File
-					RelativePath=".\include\Poco\FormattingChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FormattingChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_STD.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_STD.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\LogFile_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogFile_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Logger.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Logger.h"/>
 				<File
-					RelativePath=".\include\Poco\LoggingFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LoggingFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\LoggingRegistry.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LoggingRegistry.h"/>
 				<File
-					RelativePath=".\include\Poco\LogStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LogStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Message.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Message.h"/>
 				<File
-					RelativePath=".\include\Poco\NullChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NullChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\OpcomChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\OpcomChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\PatternFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PatternFormatter.h"/>
 				<File
-					RelativePath=".\src\pocomsg.h"
-					>
-				</File>
+					RelativePath=".\src\pocomsg.h"/>
 				<File
-					RelativePath=".\include\Poco\PurgeStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PurgeStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\RotateStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RotateStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\SimpleFileChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SimpleFileChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\SplitterChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SplitterChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\SyslogChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SyslogChannel.h"/>
 				<File
-					RelativePath=".\include\Poco\WindowsConsoleChannel.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\WindowsConsoleChannel.h"/>
 			</Filter>
 			<Filter
-				Name="Message Files"
-				>
+				Name="Message Files">
 				<File
-					RelativePath=".\src\pocomsg.mc"
-					>
+					RelativePath=".\src\pocomsg.mc">
 					<FileConfiguration
-						Name="debug_shared|x64"
-						>
+						Name="debug_shared|x64">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_shared|x64"
-						>
+						Name="release_shared|x64">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						>
+						Name="debug_static_mt|x64">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						>
+						Name="release_static_mt|x64">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						>
+						Name="debug_static_md|x64">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						>
+						Name="release_static_md|x64">
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#x0D;&#x0A;"
-							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
-						/>
+							CommandLine="mc -h &quot;$(InputDir).&quot; -r &quot;$(InputDir).&quot; &quot;$(InputPath)&#xD;&#xA;"
+							Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Resource Files"
-				>
+				Name="Resource Files">
 				<File
-					RelativePath=".\src\pocomsg.rc"
-					>
-				</File>
+					RelativePath=".\src\pocomsg.rc"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Notifications"
-			>
+			Name="Notifications">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\AbstractObserver.cpp"
-					>
-				</File>
+					RelativePath=".\src\AbstractObserver.cpp"/>
 				<File
-					RelativePath=".\src\Notification.cpp"
-					>
-				</File>
+					RelativePath=".\src\Notification.cpp"/>
 				<File
-					RelativePath=".\src\NotificationCenter.cpp"
-					>
-				</File>
+					RelativePath=".\src\NotificationCenter.cpp"/>
 				<File
-					RelativePath=".\src\NotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\NotificationQueue.cpp"/>
 				<File
-					RelativePath=".\src\PriorityNotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\PriorityNotificationQueue.cpp"/>
 				<File
-					RelativePath=".\src\TimedNotificationQueue.cpp"
-					>
-				</File>
+					RelativePath=".\src\TimedNotificationQueue.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\AbstractObserver.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractObserver.h"/>
 				<File
-					RelativePath=".\include\Poco\NObserver.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NObserver.h"/>
 				<File
-					RelativePath=".\include\Poco\Notification.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Notification.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationCenter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationCenter.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationQueue.h"/>
 				<File
-					RelativePath=".\include\Poco\Observer.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Observer.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityNotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityNotificationQueue.h"/>
 				<File
-					RelativePath=".\include\Poco\TimedNotificationQueue.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TimedNotificationQueue.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Filesystem"
-			>
+			Name="Filesystem">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\DirectoryIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryIterator.cpp"/>
 				<File
-					RelativePath=".\src\DirectoryIterator_UNIX.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_VMS.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_WIN32.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryIterator_WIN32U.cpp"
-					>
+					RelativePath=".\src\DirectoryIterator_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\DirectoryWatcher.cpp"
-					>
-				</File>
+					RelativePath=".\src\DirectoryWatcher.cpp"/>
 				<File
-					RelativePath=".\src\File.cpp"
-					>
-				</File>
+					RelativePath=".\src\File.cpp"/>
 				<File
-					RelativePath=".\src\File_UNIX.cpp"
-					>
+					RelativePath=".\src\File_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_VMS.cpp"
-					>
+					RelativePath=".\src\File_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_WIN32.cpp"
-					>
+					RelativePath=".\src\File_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\File_WIN32U.cpp"
-					>
+					RelativePath=".\src\File_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Glob.cpp"
-					>
-				</File>
+					RelativePath=".\src\Glob.cpp"/>
 				<File
-					RelativePath=".\src\Path.cpp"
-					>
-				</File>
+					RelativePath=".\src\Path.cpp"/>
 				<File
-					RelativePath=".\src\Path_UNIX.cpp"
-					>
+					RelativePath=".\src\Path_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_VMS.cpp"
-					>
+					RelativePath=".\src\Path_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_WIN32.cpp"
-					>
+					RelativePath=".\src\Path_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Path_WIN32U.cpp"
-					>
+					RelativePath=".\src\Path_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\TemporaryFile.cpp"
-					>
-				</File>
+					RelativePath=".\src\TemporaryFile.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIterator_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIterator_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryWatcher.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryWatcher.h"/>
 				<File
-					RelativePath=".\include\Poco\File.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File.h"/>
 				<File
-					RelativePath=".\include\Poco\File_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\File_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\File_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\File_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\File_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Glob.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Glob.h"/>
 				<File
-					RelativePath=".\include\Poco\Path.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Path_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Path_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\TemporaryFile.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TemporaryFile.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Processes"
-			>
+			Name="Processes">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\NamedEvent.cpp"
-					>
-				</File>
+					RelativePath=".\src\NamedEvent.cpp"/>
 				<File
-					RelativePath=".\src\NamedEvent_UNIX.cpp"
-					>
+					RelativePath=".\src\NamedEvent_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_VMS.cpp"
-					>
+					RelativePath=".\src\NamedEvent_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_WIN32.cpp"
-					>
+					RelativePath=".\src\NamedEvent_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedEvent_WIN32U.cpp"
-					>
+					RelativePath=".\src\NamedEvent_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex.cpp"
-					>
-				</File>
+					RelativePath=".\src\NamedMutex.cpp"/>
 				<File
-					RelativePath=".\src\NamedMutex_UNIX.cpp"
-					>
+					RelativePath=".\src\NamedMutex_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_VMS.cpp"
-					>
+					RelativePath=".\src\NamedMutex_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_WIN32.cpp"
-					>
+					RelativePath=".\src\NamedMutex_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\NamedMutex_WIN32U.cpp"
-					>
+					RelativePath=".\src\NamedMutex_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Pipe.cpp"
-					>
-				</File>
+					RelativePath=".\src\Pipe.cpp"/>
 				<File
-					RelativePath=".\src\PipeImpl.cpp"
-					>
-				</File>
+					RelativePath=".\src\PipeImpl.cpp"/>
 				<File
-					RelativePath=".\src\PipeImpl_DUMMY.cpp"
-					>
+					RelativePath=".\src\PipeImpl_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeImpl_POSIX.cpp"
-					>
+					RelativePath=".\src\PipeImpl_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeImpl_WIN32.cpp"
-					>
+					RelativePath=".\src\PipeImpl_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\PipeStream.cpp"
-					>
-				</File>
+					RelativePath=".\src\PipeStream.cpp"/>
 				<File
-					RelativePath=".\src\Process.cpp"
-					>
-				</File>
+					RelativePath=".\src\Process.cpp"/>
 				<File
-					RelativePath=".\src\Process_UNIX.cpp"
-					>
+					RelativePath=".\src\Process_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_VMS.cpp"
-					>
+					RelativePath=".\src\Process_VMS.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_WIN32.cpp"
-					>
+					RelativePath=".\src\Process_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Process_WIN32U.cpp"
-					>
+					RelativePath=".\src\Process_WIN32U.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory.cpp"
-					>
-				</File>
+					RelativePath=".\src\SharedMemory.cpp"/>
 				<File
-					RelativePath=".\src\SharedMemory_DUMMY.cpp"
-					>
+					RelativePath=".\src\SharedMemory_DUMMY.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory_POSIX.cpp"
-					>
+					RelativePath=".\src\SharedMemory_POSIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\SharedMemory_WIN32.cpp"
-					>
+					RelativePath=".\src\SharedMemory_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\NamedEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedEvent_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedEvent_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\NamedMutex_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NamedMutex_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\Pipe.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Pipe.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl_DUMMY.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl_DUMMY.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeImpl_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeImpl_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\PipeStream.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PipeStream.h"/>
 				<File
-					RelativePath=".\include\Poco\Process.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_UNIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_UNIX.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_VMS.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_VMS.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_WIN32.h"/>
 				<File
-					RelativePath=".\include\Poco\Process_WIN32U.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Process_WIN32U.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory_DUMMY.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory_DUMMY.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory_POSIX.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory_POSIX.h"/>
 				<File
-					RelativePath=".\include\Poco\SharedMemory_WIN32.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SharedMemory_WIN32.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="UUID"
-			>
+			Name="UUID">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\UUID.cpp"
-					>
-				</File>
+					RelativePath=".\src\UUID.cpp"/>
 				<File
-					RelativePath=".\src\UUIDGenerator.cpp"
-					>
-				</File>
+					RelativePath=".\src\UUIDGenerator.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\UUID.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UUID.h"/>
 				<File
-					RelativePath=".\include\Poco\UUIDGenerator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UUIDGenerator.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="DateTime"
-			>
+			Name="DateTime">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Clock.cpp"
-					>
-				</File>
+					RelativePath=".\src\Clock.cpp"/>
 				<File
-					RelativePath=".\src\DateTime.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTime.cpp"/>
 				<File
-					RelativePath=".\src\DateTimeFormat.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTimeFormat.cpp"/>
 				<File
-					RelativePath=".\src\DateTimeFormatter.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTimeFormatter.cpp"/>
 				<File
-					RelativePath=".\src\DateTimeParser.cpp"
-					>
-				</File>
+					RelativePath=".\src\DateTimeParser.cpp"/>
 				<File
-					RelativePath=".\src\LocalDateTime.cpp"
-					>
-				</File>
+					RelativePath=".\src\LocalDateTime.cpp"/>
 				<File
-					RelativePath=".\src\Stopwatch.cpp"
-					>
-				</File>
+					RelativePath=".\src\Stopwatch.cpp"/>
 				<File
-					RelativePath=".\src\Timespan.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timespan.cpp"/>
 				<File
-					RelativePath=".\src\Timestamp.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timestamp.cpp"/>
 				<File
-					RelativePath=".\src\Timezone.cpp"
-					>
-				</File>
+					RelativePath=".\src\Timezone.cpp"/>
 				<File
-					RelativePath=".\src\Timezone_UNIX.cpp"
-					>
+					RelativePath=".\src\Timezone_UNIX.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\Timezone_WIN32.cpp"
-					>
+					RelativePath=".\src\Timezone_WIN32.cpp">
 					<FileConfiguration
 						Name="debug_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="release_shared|x64"
-						ExcludedFromBuild="true"
-						>
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_md|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_mt|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="debug_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="debug_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="release_static_mt|x64"
-						ExcludedFromBuild="true"
-						>
+						Name="release_static_md|x64"
+						ExcludedFromBuild="true">
 						<Tool
-							Name="VCCLCompilerTool"
-						/>
+							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Clock.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Clock.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTime.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTime.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTimeFormat.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeFormat.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTimeFormatter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeFormatter.h"/>
 				<File
-					RelativePath=".\include\Poco\DateTimeParser.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DateTimeParser.h"/>
 				<File
-					RelativePath=".\include\Poco\LocalDateTime.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LocalDateTime.h"/>
 				<File
-					RelativePath=".\include\Poco\Stopwatch.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Stopwatch.h"/>
 				<File
-					RelativePath=".\include\Poco\Timespan.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timespan.h"/>
 				<File
-					RelativePath=".\include\Poco\Timestamp.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timestamp.h"/>
 				<File
-					RelativePath=".\include\Poco\Timezone.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Timezone.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Text"
-			>
+			Name="Text">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\ASCIIEncoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\ASCIIEncoding.cpp"/>
 				<File
-					RelativePath=".\src\Latin1Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Latin1Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Latin2Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Latin2Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Latin9Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Latin9Encoding.cpp"/>
 				<File
-					RelativePath=".\src\StreamConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\StreamConverter.cpp"/>
 				<File
-					RelativePath=".\src\TextBufferIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextBufferIterator.cpp"/>
 				<File
-					RelativePath=".\src\TextConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextConverter.cpp"/>
 				<File
-					RelativePath=".\src\TextEncoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextEncoding.cpp"/>
 				<File
-					RelativePath=".\src\TextIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\TextIterator.cpp"/>
 				<File
-					RelativePath=".\src\Unicode.cpp"
-					>
-				</File>
+					RelativePath=".\src\Unicode.cpp"/>
 				<File
-					RelativePath=".\src\UnicodeConverter.cpp"
-					>
-				</File>
+					RelativePath=".\src\UnicodeConverter.cpp"/>
 				<File
-					RelativePath=".\src\UTF16Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF16Encoding.cpp"/>
 				<File
-					RelativePath=".\src\UTF32Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF32Encoding.cpp"/>
 				<File
-					RelativePath=".\src\UTF8Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF8Encoding.cpp"/>
 				<File
-					RelativePath=".\src\UTF8String.cpp"
-					>
-				</File>
+					RelativePath=".\src\UTF8String.cpp"/>
 				<File
-					RelativePath=".\src\Windows1250Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Windows1250Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Windows1251Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Windows1251Encoding.cpp"/>
 				<File
-					RelativePath=".\src\Windows1252Encoding.cpp"
-					>
-				</File>
+					RelativePath=".\src\Windows1252Encoding.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\ASCIIEncoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ASCIIEncoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Latin1Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin1Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Latin2Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin2Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Latin9Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Latin9Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\ListMap.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ListMap.h"/>
 				<File
-					RelativePath=".\include\Poco\StreamConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StreamConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\TextBufferIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextBufferIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\TextConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\TextEncoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextEncoding.h"/>
 				<File
-					RelativePath=".\include\Poco\TextIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TextIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\Unicode.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Unicode.h"/>
 				<File
-					RelativePath=".\include\Poco\UnicodeConverter.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UnicodeConverter.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF16Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF16Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF32Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF32Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF8Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF8Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\UTF8String.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UTF8String.h"/>
 				<File
-					RelativePath=".\include\Poco\Windows1250Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1250Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Windows1251Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1251Encoding.h"/>
 				<File
-					RelativePath=".\include\Poco\Windows1252Encoding.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Windows1252Encoding.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="URI"
-			>
+			Name="URI">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\FileStreamFactory.cpp"
-					>
-				</File>
+					RelativePath=".\src\FileStreamFactory.cpp"/>
 				<File
-					RelativePath=".\src\URI.cpp"
-					>
-				</File>
+					RelativePath=".\src\URI.cpp"/>
 				<File
-					RelativePath=".\src\URIStreamFactory.cpp"
-					>
-				</File>
+					RelativePath=".\src\URIStreamFactory.cpp"/>
 				<File
-					RelativePath=".\src\URIStreamOpener.cpp"
-					>
-				</File>
+					RelativePath=".\src\URIStreamOpener.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\FileStreamFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FileStreamFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\URI.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URI.h"/>
 				<File
-					RelativePath=".\include\Poco\URIStreamFactory.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URIStreamFactory.h"/>
 				<File
-					RelativePath=".\include\Poco\URIStreamOpener.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\URIStreamOpener.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Tasks"
-			>
+			Name="Tasks">
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Task.cpp"
-					>
-				</File>
+					RelativePath=".\src\Task.cpp"/>
 				<File
-					RelativePath=".\src\TaskManager.cpp"
-					>
-				</File>
+					RelativePath=".\src\TaskManager.cpp"/>
 				<File
-					RelativePath=".\src\TaskNotification.cpp"
-					>
-				</File>
+					RelativePath=".\src\TaskNotification.cpp"/>
 			</Filter>
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Task.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Task.h"/>
 				<File
-					RelativePath=".\include\Poco\TaskManager.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TaskManager.h"/>
 				<File
-					RelativePath=".\include\Poco\TaskNotification.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\TaskNotification.h"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Events"
-			>
+			Name="Events">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\AbstractDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\AbstractEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\AbstractPriorityDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractPriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\BasicEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\BasicEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\DefaultStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DefaultStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\Delegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Delegate.h"/>
 				<File
-					RelativePath=".\include\Poco\DirectoryIteratorStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\DirectoryIteratorStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\EventArgs.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\EventArgs.h"/>
 				<File
-					RelativePath=".\include\Poco\Expire.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Expire.h"/>
 				<File
-					RelativePath=".\include\Poco\FIFOEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\FIFOStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FIFOStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\FunctionDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FunctionDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\FunctionPriorityDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\FunctionPriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\NotificationStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\NotificationStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityDelegate.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityDelegate.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityEvent.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityEvent.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityExpire.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityExpire.h"/>
 				<File
-					RelativePath=".\include\Poco\PriorityStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\PriorityStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\RecursiveDirectoryIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RecursiveDirectoryIterator.h"/>
 				<File
-					RelativePath=".\include\Poco\RecursiveDirectoryIteratorImpl.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\RecursiveDirectoryIteratorImpl.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\EventArgs.cpp"
-					>
-				</File>
+					RelativePath=".\src\EventArgs.cpp"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Cache"
-			>
+			Name="Cache">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\AbstractCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractCache.h"/>
 				<File
-					RelativePath=".\include\Poco\AbstractStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AbstractStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpirationDecorator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpirationDecorator.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\AccessExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\AccessExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpirationDecorator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpirationDecorator.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\ExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\KeyValueArgs.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\KeyValueArgs.h"/>
 				<File
-					RelativePath=".\include\Poco\LRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\LRUStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LRUStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\StrategyCollection.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\StrategyCollection.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueAccessExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueAccessExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueAccessExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueAccessExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueExpireCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueExpireCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueExpireLRUCache.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueExpireLRUCache.h"/>
 				<File
-					RelativePath=".\include\Poco\UniqueExpireStrategy.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\UniqueExpireStrategy.h"/>
 				<File
-					RelativePath=".\include\Poco\ValidArgs.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\ValidArgs.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
-			</Filter>
+				Name="Source Files"/>
 		</Filter>
 		<Filter
-			Name="Hashing"
-			>
+			Name="Hashing">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Hash.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Hash.h"/>
 				<File
-					RelativePath=".\include\Poco\HashFunction.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashFunction.h"/>
 				<File
-					RelativePath=".\include\Poco\HashMap.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashMap.h"/>
 				<File
-					RelativePath=".\include\Poco\HashSet.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashSet.h"/>
 				<File
-					RelativePath=".\include\Poco\HashStatistic.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashStatistic.h"/>
 				<File
-					RelativePath=".\include\Poco\HashTable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\HashTable.h"/>
 				<File
-					RelativePath=".\include\Poco\LinearHashTable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\LinearHashTable.h"/>
 				<File
-					RelativePath=".\include\Poco\SimpleHashTable.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\SimpleHashTable.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Hash.cpp"
-					>
-				</File>
+					RelativePath=".\src\Hash.cpp"/>
 				<File
-					RelativePath=".\src\HashStatistic.cpp"
-					>
-				</File>
+					RelativePath=".\src\HashStatistic.cpp"/>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Dynamic"
-			>
+			Name="Dynamic">
 			<Filter
-				Name="Header Files"
-				>
+				Name="Header Files">
 				<File
-					RelativePath=".\include\Poco\Dynamic\Pair.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\Pair.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\Struct.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\Struct.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\Var.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\Var.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\VarHolder.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\VarHolder.h"/>
 				<File
-					RelativePath=".\include\Poco\Dynamic\VarIterator.h"
-					>
-				</File>
+					RelativePath=".\include\Poco\Dynamic\VarIterator.h"/>
 			</Filter>
 			<Filter
-				Name="Source Files"
-				>
+				Name="Source Files">
 				<File
-					RelativePath=".\src\Var.cpp"
-					>
-				</File>
+					RelativePath=".\src\Var.cpp"/>
 				<File
-					RelativePath=".\src\VarHolder.cpp"
-					>
-				</File>
+					RelativePath=".\src\VarHolder.cpp"/>
 				<File
-					RelativePath=".\src\VarIterator.cpp"
-					>
-				</File>
+					RelativePath=".\src\VarIterator.cpp"/>
 			</Filter>
 		</Filter>
 		<File
-			RelativePath="..\DLLVersion.rc"
-			>
+			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="release_static_md|x64"
-				ExcludedFromBuild="true"
-				>
+				Name="debug_shared|x64"
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="debug_static_md|x64"
-				ExcludedFromBuild="true"
-				>
+				Name="release_shared|x64"
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_mt|x64"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_mt|x64"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="debug_static_md|x64"
+				ExcludedFromBuild="true">
+				<Tool
+					Name="VCResourceCompilerTool"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="release_static_md|x64"
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 		</File>
 	</Files>
-	<Globals>
-	</Globals>
+	<Globals/>
 </VisualStudioProject>
diff --git a/Foundation/include/Poco/Bugcheck.h b/Foundation/include/Poco/Bugcheck.h
index d34e87a3a1..7dab4998ea 100644
--- a/Foundation/include/Poco/Bugcheck.h
+++ b/Foundation/include/Poco/Bugcheck.h
@@ -148,9 +148,9 @@ class Foundation_API Bugcheck
 //
 
 
-#if defined(POCO_COMPILER_GCC) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) && !defined(POCO_ANDROID)
+#if defined(POCO_COMPILER_GCC) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 408) && !defined(POCO_ANDROID)
 	GCC_DIAG_OFF(unused-local-typedefs) // supress numerous gcc warnings
-#endif // POCO_COMPILER_GCC && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 406)
+#endif // POCO_COMPILER_GCC && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 408)
 
 
 template <bool x>
diff --git a/Foundation/include/Poco/Event.h b/Foundation/include/Poco/Event.h
index 0fa9318867..4a5f189950 100644
--- a/Foundation/include/Poco/Event.h
+++ b/Foundation/include/Poco/Event.h
@@ -49,7 +49,7 @@ class Foundation_API Event: private EventImpl
 	enum EventType
 	{
 		EVENT_MANUALRESET = EVENT_MANUALRESET_IMPL, /// Manual reset event
-		EVENT_AUTORESET = EVENT_AUTORESET_IMPL,     /// Auto-reset event
+		EVENT_AUTORESET = EVENT_AUTORESET_IMPL      /// Auto-reset event
 	};
 
 	explicit Event(EventType type = EVENT_AUTORESET);
diff --git a/Foundation/include/Poco/Event_POSIX.h b/Foundation/include/Poco/Event_POSIX.h
index 7c79140ae0..5110994bc6 100644
--- a/Foundation/include/Poco/Event_POSIX.h
+++ b/Foundation/include/Poco/Event_POSIX.h
@@ -35,7 +35,7 @@ class Foundation_API EventImpl
 	enum EventTypeImpl
 	{
 		EVENT_MANUALRESET_IMPL,
-		EVENT_AUTORESET_IMPL,
+		EVENT_AUTORESET_IMPL
 	};
 
 protected:
diff --git a/Foundation/include/Poco/FIFOBuffer.h b/Foundation/include/Poco/FIFOBuffer.h
index 58fd92ae9d..b760e7311d 100644
--- a/Foundation/include/Poco/FIFOBuffer.h
+++ b/Foundation/include/Poco/FIFOBuffer.h
@@ -237,14 +237,14 @@ class BasicFIFOBuffer
 		
 		if (_buffer.size() - (_begin + _used) < length)
 		{
-			std::memmove(_buffer.begin(), _buffer.begin() + _begin, _used * sizeof(T));
+			std::memmove(_buffer.begin(), begin(), _used * sizeof(T));
 			_begin = 0;
 		}
 
 		std::size_t usedBefore = _used;
 		std::size_t available =  _buffer.size() - _used - _begin;
 		std::size_t len = length > available ? available : length;
-		std::memcpy(_buffer.begin() + _begin + _used, pBuffer, len * sizeof(T));
+		std::memcpy(begin() + _used, pBuffer, len * sizeof(T));
 		_used += len;
 		poco_assert (_used <= _buffer.size());
 		if (_notify) notify(usedBefore);
@@ -284,7 +284,7 @@ class BasicFIFOBuffer
 	std::size_t available() const
 		/// Returns the size of the available portion of the buffer.
 	{
-		return _buffer.size() - _used;
+		return size() - _used;
 	}
 
 	void drain(std::size_t length = 0)
@@ -344,6 +344,12 @@ class BasicFIFOBuffer
 		if (!isWritable())
 			throw Poco::InvalidAccessException("Buffer not writable.");
 
+		if (_buffer.size() - (_begin + _used) < length)
+		{
+			std::memmove(_buffer.begin(), begin(), _used * sizeof(T));
+			_begin = 0;
+		}
+
 		std::size_t usedBefore = _used;
 		_used += length;
 		if (_notify) notify(usedBefore);
@@ -352,16 +358,23 @@ class BasicFIFOBuffer
 	T* begin()
 		/// Returns the pointer to the beginning of the buffer.
 	{
+		Mutex::ScopedLock lock(_mutex);
+		if (_begin != 0)
+		{
+			// Move the data to the start of the buffer so begin() and next()
+			// always return consistent pointers with each other and allow writing
+			// to the end of the buffer.
+			std::memmove(_buffer.begin(), _buffer.begin() + _begin, _used * sizeof(T));
+			_begin = 0;
+		}
 		return _buffer.begin();
 	}
 
 	T* next()
 		/// Returns the pointer to the next available position in the buffer.
 	{
-		if (available() == 0)
-			throw InvalidAccessException("Buffer is full.");
-
-		return _buffer.begin() + _used;
+		Mutex::ScopedLock lock(_mutex);
+		return begin() + _used;
 	}
 
 	T& operator [] (std::size_t index)
diff --git a/Foundation/include/Poco/Mutex.h b/Foundation/include/Poco/Mutex.h
index 86043aeef6..f00160cc15 100644
--- a/Foundation/include/Poco/Mutex.h
+++ b/Foundation/include/Poco/Mutex.h
@@ -52,8 +52,8 @@ class Foundation_API Mutex: private MutexImpl
 	enum MutexType
 		/// The type of a mutex.
 	{
-		MUTEX_RECURSIVE = MUTEX_RECURSIVE_IMPL,			/// A recursive mutex
-		MUTEX_NONRECURSIVE = MUTEX_NONRECURSIVE_IMPL,	/// A non-recursive mutex
+		MUTEX_RECURSIVE = MUTEX_RECURSIVE_IMPL,      /// A recursive mutex
+		MUTEX_NONRECURSIVE = MUTEX_NONRECURSIVE_IMPL /// A non-recursive mutex
 	};
 
 	typedef Poco::ScopedLock<Mutex> ScopedLock;
diff --git a/Foundation/include/Poco/Mutex_POSIX.h b/Foundation/include/Poco/Mutex_POSIX.h
index 5dfb839281..439832a930 100644
--- a/Foundation/include/Poco/Mutex_POSIX.h
+++ b/Foundation/include/Poco/Mutex_POSIX.h
@@ -35,7 +35,7 @@ class Foundation_API MutexImpl
 	enum MutexTypeImpl
 	{
 		MUTEX_RECURSIVE_IMPL,
-		MUTEX_NONRECURSIVE_IMPL,
+		MUTEX_NONRECURSIVE_IMPL
 	};
 
 protected:
diff --git a/Foundation/include/Poco/Path_WINCE.h b/Foundation/include/Poco/Path_WINCE.h
index 612c583bd5..cb7d2aacd0 100644
--- a/Foundation/include/Poco/Path_WINCE.h
+++ b/Foundation/include/Poco/Path_WINCE.h
@@ -30,14 +30,18 @@ namespace Poco {
 class Foundation_API PathImpl
 {
 public:
-	static std::string currentImpl();
-		// Returns the root directory
-	static std::string homeImpl();
-	static std::string tempImpl();
-	static std::string nullImpl();
-	static std::string systemImpl();
-	static std::string expandImpl(const std::string& path);
-	static void listRootsImpl(std::vector<std::string>& roots);
+  static std::string currentImpl();
+  static std::string homeImpl();
+  static std::string configHomeImpl();
+  static std::string dataHomeImpl();
+  static std::string cacheHomeImpl();
+  static std::string tempHomeImpl();
+  static std::string tempImpl();
+  static std::string configImpl();
+  static std::string nullImpl();
+  static std::string systemImpl();
+  static std::string expandImpl(const std::string& path);
+  static void listRootsImpl(std::vector<std::string>& roots);
 	
 	enum
 	{
diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
index 4890d7a5a5..937d55b6bf 100644
--- a/Foundation/include/Poco/Platform.h
+++ b/Foundation/include/Poco/Platform.h
@@ -39,6 +39,7 @@
 #define POCO_OS_QNX           0x000b
 #define POCO_OS_VXWORKS       0x000c
 #define POCO_OS_CYGWIN        0x000d
+#define POCO_OS_NACL	      0x000e
 #define POCO_OS_UNKNOWN_UNIX  0x00ff
 #define POCO_OS_WINDOWS_NT    0x1001
 #define POCO_OS_WINDOWS_CE    0x1011
@@ -58,6 +59,9 @@
 #elif defined(__digital__) || defined(__osf__)
 	#define POCO_OS_FAMILY_UNIX 1
 	#define POCO_OS POCO_OS_TRU64
+#elif defined(__NACL__)
+	#define POCO_OS_FAMILY_UNIX 1
+	#define POCO_OS POCO_OS_NACL
 #elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__TOS_LINUX__) || defined(EMSCRIPTEN)
 	#define POCO_OS_FAMILY_UNIX 1
 	#define POCO_OS POCO_OS_LINUX
diff --git a/Foundation/include/Poco/TaskManager.h b/Foundation/include/Poco/TaskManager.h
index 077371dcb3..c4c3aa8e7b 100644
--- a/Foundation/include/Poco/TaskManager.h
+++ b/Foundation/include/Poco/TaskManager.h
@@ -26,6 +26,7 @@
 #include "Poco/AutoPtr.h"
 #include "Poco/NotificationCenter.h"
 #include "Poco/Timestamp.h"
+#include "Poco/ThreadPool.h"
 #include <list>
 
 
@@ -33,7 +34,6 @@ namespace Poco {
 
 
 class Notification;
-class ThreadPool;
 class Exception;
 
 
@@ -52,7 +52,7 @@ class Foundation_API TaskManager
 	typedef AutoPtr<Task>      TaskPtr;
 	typedef std::list<TaskPtr> TaskList;
 
-	TaskManager();
+	TaskManager(ThreadPool::ThreadAffinityPolicy affinityPolicy = ThreadPool::TAP_DEFAULT);
 		/// Creates the TaskManager, using the
 		/// default ThreadPool.
 
@@ -63,10 +63,10 @@ class Foundation_API TaskManager
 	~TaskManager();
 		/// Destroys the TaskManager.
 
-	void start(Task* pTask);
+	void start(Task* pTask, int cpu = -1);
 		/// Starts the given task in a thread obtained
-		/// from the thread pool.
-		///
+		/// from the thread pool,
+		/// on specified cpu.
 		/// The TaskManager takes ownership of the Task object
 		/// and deletes it when it it finished.
 
diff --git a/Foundation/include/Poco/Thread.h b/Foundation/include/Poco/Thread.h
index cc4ae1ac21..b36c07adce 100644
--- a/Foundation/include/Poco/Thread.h
+++ b/Foundation/include/Poco/Thread.h
@@ -23,6 +23,7 @@
 #include "Poco/Foundation.h"
 #include "Poco/Event.h"
 #include "Poco/Mutex.h"
+#include "Poco/Environment.h"
 
 
 #if defined(POCO_OS_FAMILY_WINDOWS)
@@ -54,7 +55,7 @@ class Foundation_API Thread: private ThreadImpl
 	/// Furthermore, a thread can be assigned a name.
 	/// The name of a thread can be changed at any time.
 {
-public:	
+public:
 	typedef ThreadImpl::TIDImpl TID;
 
 	using ThreadImpl::Callable;
@@ -68,7 +69,7 @@ class Foundation_API Thread: private ThreadImpl
 		PRIO_HIGH    = PRIO_HIGH_IMPL,   /// A higher than normal thread priority.
 		PRIO_HIGHEST = PRIO_HIGHEST_IMPL /// The highest thread priority.
 	};
-	
+
 	enum Policy
 	{
 		POLICY_DEFAULT = POLICY_DEFAULT_IMPL
@@ -76,10 +77,10 @@ class Foundation_API Thread: private ThreadImpl
 
 	Thread();
 		/// Creates a thread. Call start() to start it.
-		
+
 	Thread(const std::string& name);
 		/// Creates a named thread. Call start() to start it.
-		
+
 	~Thread();
 		/// Destroys the thread.
 
@@ -114,17 +115,17 @@ class Foundation_API Thread: private ThreadImpl
 		/// a scheduling policy can be specified. The policy is currently
 		/// only used on POSIX platforms where the values SCHED_OTHER (default),
 		/// SCHED_FIFO and SCHED_RR are supported.
-		
+
 	int getOSPriority() const;
 		/// Returns the thread's priority, expressed as an operating system
 		/// specific priority value.
 		///
 		/// May return 0 if the priority has not been explicitly set.
-		
+
 	static int getMinOSPriority(int policy = POLICY_DEFAULT);
 		/// Returns the minimum operating system-specific priority value,
 		/// which can be passed to setOSPriority() for the given policy.
-		
+
 	static int getMaxOSPriority(int policy = POLICY_DEFAULT);
 		/// Returns the maximum operating system-specific priority value,
 		/// which can be passed to setOSPriority() for the given policy.
@@ -135,6 +136,17 @@ class Foundation_API Thread: private ThreadImpl
 		/// Typically, the real stack size is rounded up to the nearest
 		/// page size multiple.
 
+	void setAffinity(int cpu);
+		/// Binds the thread to run only on the CPU core with the 
+		/// given index.
+		/// 
+		/// Does nothing if the system does not support CPU affinity for
+		/// threads.
+
+	int getAffinity() const;
+		/// Returns the index of the CPU core this thread has been bound to,
+		/// or -1 if the thread has not been bound to a CPU.
+
 	int getStackSize() const;
 		/// Returns the thread's stack size in bytes.
 		/// If the default stack size is used, 0 is returned.
@@ -157,15 +169,15 @@ class Foundation_API Thread: private ThreadImpl
 	}
 
 	void join();
-		/// Waits until the thread completes execution.	
+		/// Waits until the thread completes execution.
 		/// If multiple threads try to join the same
 		/// thread, the result is undefined.
-		
+
 	void join(long milliseconds);
 		/// Waits for at most the given interval for the thread
 		/// to complete. Throws a TimeoutException if the thread
 		/// does not complete within the specified time interval.
-		
+
 	bool tryJoin(long milliseconds);
 		/// Waits for at most the given interval for the thread
 		/// to complete. Returns true if the thread has finished,
@@ -177,9 +189,9 @@ class Foundation_API Thread: private ThreadImpl
 	static bool trySleep(long milliseconds);
 		/// Starts an interruptible sleep. When trySleep() is called,
 		/// the thread will remain suspended until:
-		///   - the timeout expires or 
+		///   - the timeout expires or
 		///   - wakeUp() is called
-		/// 
+		///
 		/// Function returns true if sleep attempt was completed, false
 		/// if sleep was interrupted by a wakeUp() call.
 		/// A frequent scenario where trySleep()/wakeUp() pair of functions
@@ -187,13 +199,13 @@ class Foundation_API Thread: private ThreadImpl
 		/// with periodic activity between the idle times; trying to sleep
 		/// (as opposed to sleeping) allows immediate ending of idle thread
 		/// from the outside.
-		/// 
-		/// The trySleep() and wakeUp() calls should be used with 
-		/// understanding that the suspended state is not a true sleep, 
-		/// but rather a state of waiting for an event, with timeout 
-		/// expiration. This makes order of calls significant; calling 
-		/// wakeUp() before calling trySleep() will prevent the next  
-		/// trySleep() call to actually suspend the thread (which, in 
+		///
+		/// The trySleep() and wakeUp() calls should be used with
+		/// understanding that the suspended state is not a true sleep,
+		/// but rather a state of waiting for an event, with timeout
+		/// expiration. This makes order of calls significant; calling
+		/// wakeUp() before calling trySleep() will prevent the next
+		/// trySleep() call to actually suspend the thread (which, in
 		/// some scenarios, may be desirable behavior).
 
 	void wakeUp();
@@ -213,8 +225,8 @@ class Foundation_API Thread: private ThreadImpl
 		/// Returns the Thread object for the currently active thread.
 		/// If the current thread is the main thread, 0 is returned.
 
- 	static TID currentTid();
- 		/// Returns the native thread ID for the current thread.    
+	static TID currentTid();
+		/// Returns the native thread ID for the current thread.
 
 protected:
 	ThreadLocalStorage& tls();
@@ -225,7 +237,7 @@ class Foundation_API Thread: private ThreadImpl
 
 	std::string makeName();
 		/// Creates a unique name for a thread.
-		
+
 	static int uniqueId();
 		/// Creates and returns a unique id for a thread.
 
@@ -246,7 +258,7 @@ class Foundation_API Thread: private ThreadImpl
 		{
 			_functor();
 		}
-	
+
 	private:
 		Functor _functor;
 	};
@@ -284,7 +296,7 @@ inline int Thread::id() const
 inline std::string Thread::name() const
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	return _name;
 }
 
@@ -292,7 +304,7 @@ inline std::string Thread::name() const
 inline std::string Thread::getName() const
 {
 	FastMutex::ScopedLock lock(_mutex);
-	
+
 	return _name;
 }
 
@@ -323,22 +335,22 @@ inline Thread* Thread::current()
 
 inline void Thread::setOSPriority(int prio, int policy)
 {
-	setOSPriorityImpl(prio, policy);	
+	setOSPriorityImpl(prio, policy);
 }
 
-	
+
 inline int Thread::getOSPriority() const
 {
 	return getOSPriorityImpl();
 }
 
-	
+
 inline int Thread::getMinOSPriority(int policy)
 {
 	return ThreadImpl::getMinOSPriorityImpl(policy);
 }
 
-	
+
 inline int Thread::getMaxOSPriority(int policy)
 {
 	return ThreadImpl::getMaxOSPriorityImpl(policy);
@@ -351,6 +363,18 @@ inline void Thread::setStackSize(int size)
 }
 
 
+inline void Thread::setAffinity(int cpu)
+{
+	setAffinityImpl(cpu);
+}
+
+
+inline int Thread::getAffinity() const
+{
+	return getAffinityImpl();
+}
+
+
 inline int Thread::getStackSize() const
 {
 	return getStackSizeImpl();
diff --git a/Foundation/include/Poco/ThreadPool.h b/Foundation/include/Poco/ThreadPool.h
index 0058efa24e..a176d67cf9 100644
--- a/Foundation/include/Poco/ThreadPool.h
+++ b/Foundation/include/Poco/ThreadPool.h
@@ -32,7 +32,6 @@ namespace Poco {
 class Runnable;
 class PooledThread;
 
-
 class Foundation_API ThreadPool
 	/// A thread pool always keeps a number of threads running, ready
 	/// to accept work.
@@ -49,28 +48,39 @@ class Foundation_API ThreadPool
 	/// from the pool.
 {
 public:
+	enum ThreadAffinityPolicy
+	{
+		TAP_DEFAULT = 0,
+		TAP_UNIFORM_DISTRIBUTION,
+		TAP_CUSTOM
+	};
+	
 	ThreadPool(int minCapacity = 2,
 		int maxCapacity = 16,
 		int idleTime = 60,
-		int stackSize = POCO_THREAD_STACK_SIZE);
+		int stackSize = POCO_THREAD_STACK_SIZE,
+		ThreadAffinityPolicy affinityPolicy = TAP_DEFAULT);
 		/// Creates a thread pool with minCapacity threads.
 		/// If required, up to maxCapacity threads are created
 		/// a NoThreadAvailableException exception is thrown.
 		/// If a thread is running idle for more than idleTime seconds,
 		/// and more than minCapacity threads are running, the thread
 		/// is killed. Threads are created with given stack size.
+		/// Threads are created with given affinity policy.
 
 	ThreadPool(const std::string& name,
 		int minCapacity = 2,
 		int maxCapacity = 16,
 		int idleTime = 60,
-		int stackSize = POCO_THREAD_STACK_SIZE);
+		int stackSize = POCO_THREAD_STACK_SIZE,
+		ThreadAffinityPolicy affinityPolicy = TAP_DEFAULT);
 		/// Creates a thread pool with the given name and minCapacity threads.
 		/// If required, up to maxCapacity threads are created
 		/// a NoThreadAvailableException exception is thrown.
 		/// If a thread is running idle for more than idleTime seconds,
 		/// and more than minCapacity threads are running, the thread
 		/// is killed. Threads are created with given stack size.
+		/// Threads are created with given affinity policy.
 
 	~ThreadPool();
 		/// Currently running threads will remain active
@@ -90,6 +100,12 @@ class Foundation_API ThreadPool
 	int getStackSize() const;
 		/// Returns the stack size used to create new threads.
 
+	void setAffinityPolicy(ThreadAffinityPolicy affinityPolicy);
+		/// Sets the thread affinity policy for newly created threads.
+
+	ThreadAffinityPolicy getAffinityPolicy();
+		/// Returns the thread affinity policy used to create new threads.
+
 	int used() const;
 		/// Returns the number of currently used threads.
 
@@ -99,24 +115,24 @@ class Foundation_API ThreadPool
 	int available() const;
 		/// Returns the number available threads.
 
-	void start(Runnable& target);
-		/// Obtains a thread and starts the target.
+	void start(Runnable& target, int cpu = -1);
+		/// Obtains a thread and starts the target on specified cpu.
 		/// Throws a NoThreadAvailableException if no more
 		/// threads are available.
 
-	void start(Runnable& target, const std::string& name);
-		/// Obtains a thread and starts the target.
+	void start(Runnable& target, const std::string& name, int cpu = -1);
+		/// Obtains a thread and starts the target on specified cpu.
 		/// Assigns the given name to the thread.
 		/// Throws a NoThreadAvailableException if no more
 		/// threads are available.
 
-	void startWithPriority(Thread::Priority priority, Runnable& target);
-		/// Obtains a thread, adjusts the thread's priority, and starts the target.
+	void startWithPriority(Thread::Priority priority, Runnable& target, int cpu = -1);
+		/// Obtains a thread, adjusts the thread's priority, and starts the target on specified cpu.
 		/// Throws a NoThreadAvailableException if no more
 		/// threads are available.
 
-	void startWithPriority(Thread::Priority priority, Runnable& target, const std::string& name);
-		/// Obtains a thread, adjusts the thread's priority, and starts the target.
+	void startWithPriority(Thread::Priority priority, Runnable& target, const std::string& name, int cpu = -1);
+		/// Obtains a thread, adjusts the thread's priority, and starts the target on specified cpu.
 		/// Assigns the given name to the thread.
 		/// Throws a NoThreadAvailableException if no more
 		/// threads are available.
@@ -155,7 +171,7 @@ class Foundation_API ThreadPool
 		/// or an empty string if no name has been
 		/// specified in the constructor.
 
-	static ThreadPool& defaultPool();
+	static ThreadPool& defaultPool(ThreadAffinityPolicy affinityPolicy = TAP_DEFAULT);
 		/// Returns a reference to the default
 		/// thread pool.
 
@@ -164,6 +180,7 @@ class Foundation_API ThreadPool
 	PooledThread* createThread();
 
 	void housekeep();
+	int affinity(int cpu);
 
 private:
 	ThreadPool(const ThreadPool& pool);
@@ -180,6 +197,8 @@ class Foundation_API ThreadPool
 	int _stackSize;
 	ThreadVec _threads;
 	mutable FastMutex _mutex;
+	ThreadAffinityPolicy _affinityPolicy;
+	AtomicCounter _lastCpu;
 };
 
 
@@ -198,6 +217,18 @@ inline int ThreadPool::getStackSize() const
 }
 
 
+inline void ThreadPool::setAffinityPolicy(ThreadPool::ThreadAffinityPolicy affinityPolicy)
+{
+	_affinityPolicy = affinityPolicy;
+}
+
+
+inline ThreadPool::ThreadAffinityPolicy ThreadPool::getAffinityPolicy()
+{
+	return _affinityPolicy;
+}
+
+
 inline const std::string& ThreadPool::name() const
 {
 	return _name;
diff --git a/Foundation/include/Poco/Thread_POSIX.h b/Foundation/include/Poco/Thread_POSIX.h
index 7c2f1c55b4..025375053b 100644
--- a/Foundation/include/Poco/Thread_POSIX.h
+++ b/Foundation/include/Poco/Thread_POSIX.h
@@ -44,7 +44,7 @@ namespace Poco {
 
 class Foundation_API ThreadImpl
 {
-public:	
+public:
 	typedef pthread_t TIDImpl;
 	typedef void (*Callable)(void*);
 
@@ -56,12 +56,12 @@ class Foundation_API ThreadImpl
 		PRIO_HIGH_IMPL,
 		PRIO_HIGHEST_IMPL
 	};
-	
+
 	enum Policy
 	{
 		POLICY_DEFAULT_IMPL = SCHED_OTHER
 	};
-	
+
 	ThreadImpl();
 	~ThreadImpl();
 
@@ -74,6 +74,8 @@ class Foundation_API ThreadImpl
 	static int getMaxOSPriorityImpl(int policy);
 	void setStackSizeImpl(int size);
 	int getStackSizeImpl() const;
+	void setAffinityImpl(int cpu);
+	int getAffinityImpl() const;
 	void startImpl(SharedPtr<Runnable> pTarget);
 	void joinImpl();
 	bool joinImpl(long milliseconds);
@@ -109,7 +111,7 @@ class Foundation_API ThreadImpl
 		{
 			pthread_setspecific(_key, pThread);
 		}
-	
+
 	private:
 		pthread_key_t _key;
 	};
@@ -125,11 +127,11 @@ class Foundation_API ThreadImpl
 			started(false),
 			joined(false)
 		{
-		#if defined(POCO_VXWORKS)
+#if defined(POCO_VXWORKS)
 			// This workaround is for VxWorks 5.x where
 			// pthread_init() won't properly initialize the thread.
 			std::memset(&thread, 0, sizeof(thread));
-		#endif
+#endif
 		}
 
 		SharedPtr<Runnable> pRunnableTarget;
@@ -146,7 +148,7 @@ class Foundation_API ThreadImpl
 	AutoPtr<ThreadData> _pData;
 
 	static CurrentThreadHolder _currentThreadHolder;
-	
+
 #if defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_VXWORKS)
 	SignalHandler::JumpBufferVec _jumpBufferVec;
 	friend class SignalHandler;
diff --git a/Foundation/include/Poco/Thread_VX.h b/Foundation/include/Poco/Thread_VX.h
index 1f442c9359..eac3bd0aae 100644
--- a/Foundation/include/Poco/Thread_VX.h
+++ b/Foundation/include/Poco/Thread_VX.h
@@ -35,7 +35,7 @@ namespace Poco {
 
 class Foundation_API ThreadImpl
 {
-public:	
+public:
 	typedef int TIDImpl;
 	typedef void (*Callable)(void*);
 
@@ -65,7 +65,7 @@ class Foundation_API ThreadImpl
 		}
 
 		Callable  callback;
-		void*     pData; 
+		void*     pData;
 	};
 
 	ThreadImpl();
@@ -80,6 +80,9 @@ class Foundation_API ThreadImpl
 	static int getMaxOSPriorityImpl(int policy);
 	void setStackSizeImpl(int size);
 	int getStackSizeImpl() const;
+	void setAffinityImpl(int cpu);
+	int getAffinityImpl() const;
+
 	void startImpl(Runnable& target);
 	void startImpl(Callable target, void* pData = 0);
 
@@ -140,10 +143,22 @@ inline int ThreadImpl::getOSPriorityImpl() const
 }
 
 
+inline void ThreadImpl::setAffinityImpl(int)
+{
+	// not supported
+}
+
+
+inline int ThreadImpl::getAffinityImpl()
+{
+	return -1;
+}
+
+
 inline bool ThreadImpl::isRunningImpl() const
 {
 	return _pData->pRunnableTarget != 0 ||
-		(_pData->pCallbackTarget.get() != 0 && _pData->pCallbackTarget->callback != 0);
+	       (_pData->pCallbackTarget.get() != 0 && _pData->pCallbackTarget->callback != 0);
 }
 
 
diff --git a/Foundation/include/Poco/Thread_WIN32.h b/Foundation/include/Poco/Thread_WIN32.h
index 598db8e7ad..387e85c2cd 100644
--- a/Foundation/include/Poco/Thread_WIN32.h
+++ b/Foundation/include/Poco/Thread_WIN32.h
@@ -31,14 +31,14 @@ namespace Poco {
 
 class Foundation_API ThreadImpl
 {
-public:	
+public:
 	typedef DWORD TIDImpl;
 	typedef void (*Callable)(void*);
 
 #if defined(_DLL)
-	typedef DWORD (WINAPI *Entry)(LPVOID);
+	typedef DWORD (WINAPI* Entry)(LPVOID);
 #else
-	typedef unsigned (__stdcall *Entry)(void*);
+	typedef unsigned (__stdcall* Entry)(void*);
 #endif
 
 	enum Priority
@@ -55,7 +55,7 @@ class Foundation_API ThreadImpl
 		POLICY_DEFAULT_IMPL = 0
 	};
 
-	ThreadImpl();				
+	ThreadImpl();
 	~ThreadImpl();
 
 	TIDImpl tidImpl() const;
@@ -66,6 +66,8 @@ class Foundation_API ThreadImpl
 	static int getMinOSPriorityImpl(int policy);
 	static int getMaxOSPriorityImpl(int policy);
 	void setStackSizeImpl(int size);
+	void setAffinityImpl(int cpu);
+	int getAffinityImpl() const;
 	int getStackSizeImpl() const;
 	void startImpl(SharedPtr<Runnable> pTarget);
 	void joinImpl();
@@ -75,7 +77,7 @@ class Foundation_API ThreadImpl
 	static void yieldImpl();
 	static ThreadImpl* currentImpl();
 	static TIDImpl currentTidImpl();
-    
+
 protected:
 #if defined(_DLL)
 	static DWORD WINAPI runnableEntry(LPVOID pThread);
@@ -107,7 +109,7 @@ class Foundation_API ThreadImpl
 		{
 			TlsSetValue(_slot, pThread);
 		}
-	
+
 	private:
 		DWORD _slot;
 	};
@@ -117,6 +119,7 @@ class Foundation_API ThreadImpl
 	DWORD _threadId;
 	int _prio;
 	int _stackSize;
+	int _cpu;
 
 	static CurrentThreadHolder _currentThreadHolder;
 };
diff --git a/Foundation/include/Poco/Thread_WINCE.h b/Foundation/include/Poco/Thread_WINCE.h
index 9e40f15ab5..95ce1ea2e8 100644
--- a/Foundation/include/Poco/Thread_WINCE.h
+++ b/Foundation/include/Poco/Thread_WINCE.h
@@ -36,10 +36,10 @@ namespace Poco {
 
 class Foundation_API ThreadImpl
 {
-public:	
-    typedef DWORD TIDImpl;
+public:
+	typedef DWORD TIDImpl;
 	typedef void (*Callable)(void*);
-	typedef DWORD (WINAPI *Entry)(LPVOID);
+	typedef DWORD (WINAPI* Entry)(LPVOID);
 
 	enum Priority
 	{
@@ -55,7 +55,7 @@ class Foundation_API ThreadImpl
 		POLICY_DEFAULT_IMPL = 0
 	};
 
-	ThreadImpl();				
+	ThreadImpl();
 	~ThreadImpl();
 
 	TIDImpl tidImpl() const;
@@ -67,6 +67,8 @@ class Foundation_API ThreadImpl
 	static int getMaxOSPriorityImpl(int policy);
 	void setStackSizeImpl(int size);
 	int getStackSizeImpl() const;
+	void setAffinityImpl(int cpu);
+	int getAffinityImpl() const;
 	void startImpl(SharedPtr<Runnable> pTarget);
 	void joinImpl();
 	bool joinImpl(long milliseconds);
@@ -103,7 +105,7 @@ class Foundation_API ThreadImpl
 		{
 			TlsSetValue(_slot, pThread);
 		}
-	
+
 	private:
 		DWORD _slot;
 	};
@@ -145,6 +147,18 @@ inline int ThreadImpl::getMaxOSPriorityImpl(int /* policy */)
 }
 
 
+inline void ThreadImpl::setAffinityImpl(int)
+{
+	// not supported
+}
+
+
+inline int ThreadImpl::getAffinityImpl() const
+{
+	return -1;
+}
+
+
 inline void ThreadImpl::sleepImpl(long milliseconds)
 {
 	Sleep(DWORD(milliseconds));
diff --git a/Foundation/include/Poco/Timestamp.h b/Foundation/include/Poco/Timestamp.h
index bc41ce874f..e0d33059c4 100644
--- a/Foundation/include/Poco/Timestamp.h
+++ b/Foundation/include/Poco/Timestamp.h
@@ -26,6 +26,7 @@
 
 namespace Poco {
 
+
 class Timespan;
 
 
diff --git a/Foundation/src/NamedEvent_UNIX.cpp b/Foundation/src/NamedEvent_UNIX.cpp
index 5d78401bba..64fb55bac9 100644
--- a/Foundation/src/NamedEvent_UNIX.cpp
+++ b/Foundation/src/NamedEvent_UNIX.cpp
@@ -33,7 +33,7 @@
 namespace Poco {
 
 
-#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD)
+#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD) || (POCO_OS == POCO_OS_NACL)
 	union semun
 	{
 		int                 val;
diff --git a/Foundation/src/NamedMutex_UNIX.cpp b/Foundation/src/NamedMutex_UNIX.cpp
index 13677569fa..04a6f463f9 100644
--- a/Foundation/src/NamedMutex_UNIX.cpp
+++ b/Foundation/src/NamedMutex_UNIX.cpp
@@ -33,7 +33,7 @@
 namespace Poco {
 
 
-#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD)
+#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD) || (POCO_OS == POCO_OS_NACL)
 	union semun
 	{
 		int                 val;
diff --git a/Foundation/src/Path_UNIX.cpp b/Foundation/src/Path_UNIX.cpp
index a5b0c27826..50d7cda430 100644
--- a/Foundation/src/Path_UNIX.cpp
+++ b/Foundation/src/Path_UNIX.cpp
@@ -67,7 +67,8 @@ std::string PathImpl::homeImpl()
 		if (pwd)
 			path = pwd->pw_dir;
 		else
-			path = EnvironmentImpl::getImpl("HOME");
+			if (EnvironmentImpl::hasImpl("HOME"))
+				path = EnvironmentImpl::getImpl("HOME");
 	}
 	std::string::size_type n = path.size();
 	if (n > 0 && path[n - 1] != '/') path.append("/");
diff --git a/Foundation/src/Path_WINCE.cpp b/Foundation/src/Path_WINCE.cpp
index 87dda31c58..96b7c67fbd 100644
--- a/Foundation/src/Path_WINCE.cpp
+++ b/Foundation/src/Path_WINCE.cpp
@@ -31,12 +31,35 @@ std::string PathImpl::currentImpl()
 	return("\\");
 }
 
-
 std::string PathImpl::homeImpl()
 {
 	return("\\");
 }
 
+std::string PathImpl::configHomeImpl()
+{
+  return homeImpl();
+}
+
+std::string PathImpl::dataHomeImpl()
+{
+  return homeImpl();
+}
+
+std::string PathImpl::cacheHomeImpl()
+{
+  return homeImpl();
+}
+
+std::string PathImpl::tempHomeImpl()
+{
+  return tempImpl();
+}
+
+std::string PathImpl::configImpl()
+{
+  return("\\");
+}
 
 std::string PathImpl::systemImpl()
 {
diff --git a/Foundation/src/Process_UNIX.cpp b/Foundation/src/Process_UNIX.cpp
index f496e7b97c..53866adb3a 100644
--- a/Foundation/src/Process_UNIX.cpp
+++ b/Foundation/src/Process_UNIX.cpp
@@ -200,7 +200,7 @@ ProcessHandleImpl* ProcessImpl::launchByForkExecImpl(const std::string& command,
 		if (outPipe) outPipe->close(Pipe::CLOSE_BOTH);
 		if (errPipe) errPipe->close(Pipe::CLOSE_BOTH);
 		// close all open file descriptors other than stdin, stdout, stderr
-		for (int i = 3; i < getdtablesize(); ++i)
+		for (int i = 3; i < sysconf(_SC_OPEN_MAX); ++i)
 		{
 			close(i);
 		}
diff --git a/Foundation/src/TaskManager.cpp b/Foundation/src/TaskManager.cpp
index 3fdf011b13..1e2e6bc9a1 100644
--- a/Foundation/src/TaskManager.cpp
+++ b/Foundation/src/TaskManager.cpp
@@ -16,7 +16,6 @@
 
 #include "Poco/TaskManager.h"
 #include "Poco/TaskNotification.h"
-#include "Poco/ThreadPool.h"
 
 
 namespace Poco {
@@ -25,8 +24,8 @@ namespace Poco {
 const int TaskManager::MIN_PROGRESS_NOTIFICATION_INTERVAL = 100000; // 100 milliseconds
 
 
-TaskManager::TaskManager():
-	_threadPool(ThreadPool::defaultPool())
+TaskManager::TaskManager(ThreadPool::ThreadAffinityPolicy affinityPolicy):
+	_threadPool(ThreadPool::defaultPool(affinityPolicy))
 {
 }
 
@@ -42,7 +41,7 @@ TaskManager::~TaskManager()
 }
 
 
-void TaskManager::start(Task* pTask)
+void TaskManager::start(Task* pTask, int cpu)
 {
 	TaskPtr pAutoTask(pTask); // take ownership immediately
 	FastMutex::ScopedLock lock(_mutex);
@@ -52,7 +51,7 @@ void TaskManager::start(Task* pTask)
 	_taskList.push_back(pAutoTask);
 	try
 	{
-		_threadPool.start(*pAutoTask, pAutoTask->name());
+		_threadPool.start(*pAutoTask, pAutoTask->name(), cpu);
 	}
 	catch (...)
 	{
diff --git a/Foundation/src/ThreadPool.cpp b/Foundation/src/ThreadPool.cpp
index e8df55c9d9..3d898d281f 100644
--- a/Foundation/src/ThreadPool.cpp
+++ b/Foundation/src/ThreadPool.cpp
@@ -36,9 +36,9 @@ class PooledThread: public Runnable
 	PooledThread(const std::string& name, int stackSize = POCO_THREAD_STACK_SIZE);
 	~PooledThread();
 
-	void start();
-	void start(Thread::Priority priority, Runnable& target);
-	void start(Thread::Priority priority, Runnable& target, const std::string& name);
+	void start(int cpu = -1);
+	void start(Thread::Priority priority, Runnable& target, int cpu = -1);
+	void start(Thread::Priority priority, Runnable& target, const std::string& name, int cpu = -1);
 	bool idle();
 	int idleTime();
 	void join();
@@ -85,14 +85,18 @@ PooledThread::~PooledThread()
 }
 
 
-void PooledThread::start()
+void PooledThread::start(int cpu)
 {
 	_thread.start(*this);
 	_started.wait();
+	if (cpu >= 0) 
+	{
+		_thread.setAffinity(static_cast<unsigned>(cpu));
+	}
 }
 
 
-void PooledThread::start(Thread::Priority priority, Runnable& target)
+void PooledThread::start(Thread::Priority priority, Runnable& target, int cpu)
 {
 	FastMutex::ScopedLock lock(_mutex);
 	
@@ -101,10 +105,14 @@ void PooledThread::start(Thread::Priority priority, Runnable& target)
 	_pTarget = &target;
 	_thread.setPriority(priority);
 	_targetReady.set();
+	if (cpu >= 0) 
+	{
+		_thread.setAffinity(static_cast<unsigned>(cpu));
+	}
 }
 
 
-void PooledThread::start(Thread::Priority priority, Runnable& target, const std::string& name)
+void PooledThread::start(Thread::Priority priority, Runnable& target, const std::string& name, int cpu)
 {
 	FastMutex::ScopedLock lock(_mutex);
 
@@ -126,6 +134,10 @@ void PooledThread::start(Thread::Priority priority, Runnable& target, const std:
 
 	_pTarget = &target;
 	_targetReady.set();
+	if (cpu >= 0) 
+	{
+		_thread.setAffinity(static_cast<unsigned>(cpu));
+	}
 }
 
 
@@ -197,10 +209,11 @@ void PooledThread::run()
 		_mutex.lock();
 		if (_pTarget) // a NULL target means kill yourself
 		{
+			Runnable* pTarget = _pTarget;
 			_mutex.unlock();
 			try
 			{
-				_pTarget->run();
+				pTarget->run();
 			}
 			catch (Exception& exc)
 			{
@@ -239,21 +252,32 @@ void PooledThread::run()
 ThreadPool::ThreadPool(int minCapacity,
 	int maxCapacity,
 	int idleTime,
-	int stackSize): 
+	int stackSize,
+	ThreadAffinityPolicy affinityPolicy):
 	_minCapacity(minCapacity), 
 	_maxCapacity(maxCapacity), 
 	_idleTime(idleTime),
 	_serial(0),
 	_age(0),
-	_stackSize(stackSize)
+	_stackSize(stackSize),
+	_affinityPolicy(affinityPolicy),
+	_lastCpu(0)
 {
 	poco_assert (minCapacity >= 1 && maxCapacity >= minCapacity && idleTime > 0);
 
+	int cpu = -1;
+	int cpuCount = Poco::Environment::processorCount();
+	
 	for (int i = 0; i < _minCapacity; i++)
 	{
+		if (_affinityPolicy == TAP_UNIFORM_DISTRIBUTION) 
+		{
+			cpu = _lastCpu.value() % cpuCount;
+			_lastCpu++;
+		}
 		PooledThread* pThread = createThread();
 		_threads.push_back(pThread);
-		pThread->start();
+		pThread->start(cpu);
 	}
 }
 
@@ -262,22 +286,32 @@ ThreadPool::ThreadPool(const std::string& name,
 	int minCapacity,
 	int maxCapacity,
 	int idleTime,
-	int stackSize):
+	int stackSize,
+	ThreadAffinityPolicy affinityPolicy):
 	_name(name),
 	_minCapacity(minCapacity), 
 	_maxCapacity(maxCapacity), 
 	_idleTime(idleTime),
 	_serial(0),
 	_age(0),
-	_stackSize(stackSize)
+	_stackSize(stackSize),
+	_affinityPolicy(affinityPolicy),
+	_lastCpu(0)
 {
 	poco_assert (minCapacity >= 1 && maxCapacity >= minCapacity && idleTime > 0);
 
+	int cpu = -1;
+	int cpuCount = Poco::Environment::processorCount();
 	for (int i = 0; i < _minCapacity; i++)
 	{
+		if (_affinityPolicy == TAP_UNIFORM_DISTRIBUTION) 
+		{
+			cpu = _lastCpu.value() % cpuCount;
+			_lastCpu++;
+		}
 		PooledThread* pThread = createThread();
 		_threads.push_back(pThread);
-		pThread->start();
+		pThread->start(cpu);
 	}
 }
 
@@ -346,27 +380,55 @@ int ThreadPool::allocated() const
 }
 
 
-void ThreadPool::start(Runnable& target)
+int ThreadPool::affinity(int cpu)
 {
-	getThread()->start(Thread::PRIO_NORMAL, target);
+	switch (static_cast<int>(_affinityPolicy)) 
+	{
+		case TAP_UNIFORM_DISTRIBUTION:
+		{
+			cpu = _lastCpu.value() % Environment::processorCount();
+			_lastCpu++;
+		}
+		break;
+		case TAP_DEFAULT:
+		{
+			cpu = -1;
+		}
+		break;
+		case TAP_CUSTOM:
+		{
+			if ((cpu < -1) || (cpu >= Environment::processorCount())) 
+			{
+				throw InvalidArgumentException("cpu argument is invalid");
+			}
+		}
+		break;
+	}
+	return cpu;
+}
+
+
+void ThreadPool::start(Runnable& target, int cpu)
+{
+	getThread()->start(Thread::PRIO_NORMAL, target, affinity(cpu));
 }
 
 
-void ThreadPool::start(Runnable& target, const std::string& name)
+void ThreadPool::start(Runnable& target, const std::string& name, int cpu)
 {
-	getThread()->start(Thread::PRIO_NORMAL, target, name);
+	getThread()->start(Thread::PRIO_NORMAL, target, name, affinity(cpu));
 }
 
 
-void ThreadPool::startWithPriority(Thread::Priority priority, Runnable& target)
+void ThreadPool::startWithPriority(Thread::Priority priority, Runnable& target, int cpu)
 {
-	getThread()->start(priority, target);
+	getThread()->start(priority, target, affinity(cpu));
 }
 
 
-void ThreadPool::startWithPriority(Thread::Priority priority, Runnable& target, const std::string& name)
+void ThreadPool::startWithPriority(Thread::Priority priority, Runnable& target, const std::string& name, int cpu)
 {
-	getThread()->start(priority, target, name);
+	getThread()->start(priority, target, name, affinity(cpu));
 }
 
 
@@ -464,14 +526,14 @@ PooledThread* ThreadPool::getThread()
 			{
 				pThread->start();
 				_threads.push_back(pThread);
-			} catch (...)
+			} 
+			catch (...)
 			{
 				delete pThread;
 				throw;
 			}
 		}
-		else
-			throw NoThreadAvailableException();
+		else throw NoThreadAvailableException();
 	}
 	pThread->activate();
 	return pThread;
@@ -493,17 +555,20 @@ class ThreadPoolSingletonHolder
 	{
 		_pPool = 0;
 	}
+
 	~ThreadPoolSingletonHolder()
 	{
 		delete _pPool;
 	}
-	ThreadPool* pool()
+
+	ThreadPool* pool(ThreadPool::ThreadAffinityPolicy affinityPolicy = ThreadPool::TAP_DEFAULT)
 	{
 		FastMutex::ScopedLock lock(_mutex);
 		
 		if (!_pPool)
 		{
 			_pPool = new ThreadPool("default");
+			_pPool->setAffinityPolicy(affinityPolicy);
 			if (POCO_THREAD_STACK_SIZE > 0)
 				_pPool->setStackSize(POCO_THREAD_STACK_SIZE);
 		}
@@ -522,9 +587,9 @@ namespace
 }
 
 
-ThreadPool& ThreadPool::defaultPool()
+ThreadPool& ThreadPool::defaultPool(ThreadAffinityPolicy affinityPolicy)
 {
-	return *sh.pool();
+	return *sh.pool(affinityPolicy);
 }
 
 
diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp
index b31532699d..97813fbcaa 100644
--- a/Foundation/src/Thread_POSIX.cpp
+++ b/Foundation/src/Thread_POSIX.cpp
@@ -28,30 +28,37 @@
 #endif
 #if POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_MAC_OS_X || POCO_OS == POCO_OS_QNX
 #	include <time.h>
+# include <unistd.h>
 #endif
+#if POCO_OS == POCO_OS_MAC_OS_X
+#   include <mach/mach.h>
+#   include <mach/task.h>
+#   include <mach/thread_policy.h>
+#endif
+
 
 //
 // Block SIGPIPE in main thread.
 //
 #if defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_VXWORKS)
-namespace
+namespace {
+class SignalBlocker
 {
-	class SignalBlocker
+public:
+	SignalBlocker()
 	{
-	public:
-		SignalBlocker()
-		{
-			sigset_t sset;
-			sigemptyset(&sset);
-			sigaddset(&sset, SIGPIPE); 
-			pthread_sigmask(SIG_BLOCK, &sset, 0);
-		}
-		~SignalBlocker()
-		{
-		}
-	};
+		sigset_t sset;
+		sigemptyset(&sset);
+		sigaddset(&sset, SIGPIPE);
+		pthread_sigmask(SIG_BLOCK, &sset, 0);
+	}
+	~SignalBlocker()
+	{
+	}
+};
+
 
-	static SignalBlocker signalBlocker;
+static SignalBlocker signalBlocker;
 }
 #endif
 
@@ -59,16 +66,15 @@ namespace
 #if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
 
 
-namespace
+namespace {
+void setThreadName(pthread_t thread, const char* threadName)
 {
-    void setThreadName(pthread_t thread, const char* threadName)
-    {
 #   if (POCO_OS == POCO_OS_MAC_OS_X)
-        pthread_setname_np(threadName); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2)
+	pthread_setname_np(threadName); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2)
 #   else
-        pthread_setname_np(thread, threadName);
+	pthread_setname_np(thread, threadName);
 #   endif
-    }
+}
 }
 
 
@@ -104,7 +110,8 @@ void ThreadImpl::setPriorityImpl(int prio)
 		_pData->policy = SCHED_OTHER;
 		if (isRunningImpl())
 		{
-			struct sched_param par; struct MyStruct
+			struct sched_param par;
+			struct MyStruct
 			{
 
 			};
@@ -168,15 +175,99 @@ void ThreadImpl::setStackSizeImpl(int size)
 #if defined(POCO_OS_FAMILY_BSD)
 		// we must round up to a multiple of the memory page size
 		const int STACK_PAGE_SIZE = 4096;
-		size = ((size + STACK_PAGE_SIZE - 1)/STACK_PAGE_SIZE)*STACK_PAGE_SIZE;
+		size = ((size + STACK_PAGE_SIZE - 1) / STACK_PAGE_SIZE) * STACK_PAGE_SIZE;
 #endif
 #if !defined(POCO_ANDROID)
- 		if (size < PTHREAD_STACK_MIN)
- 			size = PTHREAD_STACK_MIN;
+		if (size < PTHREAD_STACK_MIN)
+			size = PTHREAD_STACK_MIN;
+#endif
+	}
+	_pData->stackSize = size;
+#endif
+}
+
+
+void ThreadImpl::setAffinityImpl(int cpu)
+{
+#if defined (POCO_OS_FAMILY_UNIX) && POCO_OS != POCO_OS_MAC_OS_X
+#ifdef HAVE_PTHREAD_SETAFFINITY_NP
+	cpu_set_t cpuset;
+	CPU_ZERO(&cpuset);
+	CPU_SET(cpu, &cpuset);
+#ifdef HAVE_THREE_PARAM_SCHED_SETAFFINITY
+	if (pthread_setaffinity_np(_pData->thread, sizeof(cpuset), &cpuset) != 0)
+		throw SystemException("Failed to set affinity");
+#else
+	if (pthread_setaffinity_np(_pData->thread, &cpuset) != 0)
+		throw SystemException("Failed to set affinity");
+#endif
 #endif
+#endif // defined unix & !defined mac os x
+
+#if POCO_OS == POCO_OS_MAC_OS_X
+	kern_return_t ret;
+	thread_affinity_policy policy;
+	policy.affinity_tag = cpu;
+
+	ret = thread_policy_set(pthread_mach_thread_np(_pData->thread),
+				THREAD_AFFINITY_POLICY,
+				(thread_policy_t) &policy,
+				THREAD_AFFINITY_POLICY_COUNT);
+	if (ret != KERN_SUCCESS)
+	{
+		throw SystemException("Failed to set affinity");
 	}
- 	_pData->stackSize = size;
 #endif
+	yieldImpl();
+}
+
+
+int ThreadImpl::getAffinityImpl() const
+{
+	int cpuSet = -1;
+	int cpuCount = Environment::processorCount();
+#if defined (POCO_OS_FAMILY_UNIX) && POCO_OS != POCO_OS_MAC_OS_X
+#ifdef HAVE_PTHREAD_SETAFFINITY_NP
+	cpu_set_t cpuset;
+	CPU_ZERO(&cpuset);
+#ifdef HAVE_THREE_PARAM_SCHED_SETAFFINITY
+	if (pthread_getaffinity_np(_pData->thread, sizeof(cpuset), &cpuset) != 0)
+		throw SystemException("Failed to get affinity", errno);
+#else
+	if (pthread_getaffinity_np(_pData->thread, &cpuset) != 0)
+		throw SystemException("Failed to get affinity", errno);
+#endif
+	for (int i = 0; i < cpuCount; i++)
+	{
+		if (CPU_ISSET(i, &cpuset))
+		{
+			cpuSet = i;
+			break;
+		}
+	}
+#endif
+#endif // defined unix & !defined mac os x
+
+#if POCO_OS == POCO_OS_MAC_OS_X
+	kern_return_t ret;
+	thread_affinity_policy policy;
+	mach_msg_type_number_t count = THREAD_AFFINITY_POLICY_COUNT;
+	boolean_t get_default = false;
+	ret = thread_policy_get(pthread_mach_thread_np(_pData->thread),
+				THREAD_AFFINITY_POLICY,
+				(thread_policy_t)&policy,
+				&count,
+				&get_default);
+	if (ret != KERN_SUCCESS)
+	{
+		throw SystemException("Failed to get affinity", errno);
+	}
+	cpuSet = policy.affinity_tag;
+	if (cpuSet >= cpuCount)
+		cpuSet = -1;
+
+#endif
+	return cpuSet;
 }
 
 
@@ -268,19 +359,19 @@ ThreadImpl::TIDImpl ThreadImpl::currentTidImpl()
 void ThreadImpl::sleepImpl(long milliseconds)
 {
 #if defined(__VMS) || defined(__digital__)
-		// This is specific to DECThreads
-		struct timespec interval;
-		interval.tv_sec  = milliseconds / 1000;
-		interval.tv_nsec = (milliseconds % 1000)*1000000; 
-		pthread_delay_np(&interval);
+	// This is specific to DECThreads
+	struct timespec interval;
+	interval.tv_sec  = milliseconds / 1000;
+	interval.tv_nsec = (milliseconds % 1000) * 1000000;
+	pthread_delay_np(&interval);
 #elif POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_MAC_OS_X || POCO_OS == POCO_OS_QNX || POCO_OS == POCO_OS_VXWORKS
-	Poco::Timespan remainingTime(1000*Poco::Timespan::TimeDiff(milliseconds));
+	Poco::Timespan remainingTime(1000 * Poco::Timespan::TimeDiff(milliseconds));
 	int rc;
 	do
 	{
 		struct timespec ts;
 		ts.tv_sec  = (long) remainingTime.totalSeconds();
-		ts.tv_nsec = (long) remainingTime.useconds()*1000;
+		ts.tv_nsec = (long) remainingTime.useconds() * 1000;
 		Poco::Timestamp start;
 		rc = ::nanosleep(&ts, 0);
 		if (rc < 0 && errno == EINTR)
@@ -295,8 +386,8 @@ void ThreadImpl::sleepImpl(long milliseconds)
 	}
 	while (remainingTime > 0 && rc < 0 && errno == EINTR);
 	if (rc < 0 && remainingTime > 0) throw Poco::SystemException("Thread::sleep(): nanosleep() failed");
-#else 
-	Poco::Timespan remainingTime(1000*Poco::Timespan::TimeDiff(milliseconds));
+#else
+	Poco::Timespan remainingTime(1000 * Poco::Timespan::TimeDiff(milliseconds));
 	int rc;
 	do
 	{
@@ -330,7 +421,7 @@ void* ThreadImpl::runnableEntry(void* pThread)
 	sigemptyset(&sset);
 	sigaddset(&sset, SIGQUIT);
 	sigaddset(&sset, SIGTERM);
-	sigaddset(&sset, SIGPIPE); 
+	sigaddset(&sset, SIGPIPE);
 	pthread_sigmask(SIG_BLOCK, &sset, 0);
 #endif
 
@@ -372,11 +463,11 @@ int ThreadImpl::mapPrio(int prio, int policy)
 	case PRIO_LOWEST_IMPL:
 		return pmin;
 	case PRIO_LOW_IMPL:
-		return pmin + (pmax - pmin)/4;
+		return pmin + (pmax - pmin) / 4;
 	case PRIO_NORMAL_IMPL:
-		return pmin + (pmax - pmin)/2;
+		return pmin + (pmax - pmin) / 2;
 	case PRIO_HIGH_IMPL:
-		return pmin + 3*(pmax - pmin)/4;
+		return pmin + 3 * (pmax - pmin) / 4;
 	case PRIO_HIGHEST_IMPL:
 		return pmax;
 	default:
@@ -392,7 +483,7 @@ int ThreadImpl::reverseMapPrio(int prio, int policy)
 	{
 		int pmin = getMinOSPriorityImpl(policy);
 		int pmax = getMaxOSPriorityImpl(policy);
-		int normal = pmin + (pmax - pmin)/2;
+		int normal = pmin + (pmax - pmin) / 2;
 		if (prio == pmax)
 			return PRIO_HIGHEST_IMPL;
 		if (prio > normal)
diff --git a/Foundation/src/Thread_VX.cpp b/Foundation/src/Thread_VX.cpp
index a8be66d049..b79b6c3a04 100644
--- a/Foundation/src/Thread_VX.cpp
+++ b/Foundation/src/Thread_VX.cpp
@@ -33,7 +33,7 @@ ThreadImpl::ThreadImpl():
 {
 }
 
-			
+
 ThreadImpl::~ThreadImpl()
 {
 }
@@ -93,7 +93,7 @@ void ThreadImpl::startImpl(Runnable& target)
 		throw SystemException("thread already running");
 
 	_pData->pRunnableTarget = &target;
-	
+
 	int stackSize = _pData->stackSize == 0 ? DEFAULT_THREAD_STACK_SIZE : _pData->stackSize;
 	int id = taskSpawn(NULL, _pData->osPrio, VX_FP_TASK, stackSize, reinterpret_cast<FUNCPTR>(runnableEntry), reinterpret_cast<int>(this), 0, 0, 0, 0, 0, 0, 0, 0, 0);
 	if (id == ERROR)
@@ -143,7 +143,7 @@ ThreadImpl* ThreadImpl::currentImpl()
 
 ThreadImpl::TIDImpl ThreadImpl::currentTidImpl()
 {
-    return taskIdSelf();
+	return taskIdSelf();
 }
 
 
diff --git a/Foundation/src/Thread_WIN32.cpp b/Foundation/src/Thread_WIN32.cpp
index 0eb2c4c4fc..b4b79b55c9 100644
--- a/Foundation/src/Thread_WIN32.cpp
+++ b/Foundation/src/Thread_WIN32.cpp
@@ -23,41 +23,40 @@
 #if defined(POCO_WIN32_DEBUGGER_THREAD_NAMES)
 
 
-namespace
+namespace {
+/// See <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx>
+/// and <http://blogs.msdn.com/b/stevejs/archive/2005/12/19/505815.aspx> for
+/// more information on the code below.
+
+const DWORD MS_VC_EXCEPTION = 0x406D1388;
+
+#pragma pack(push,8)
+typedef struct tagTHREADNAME_INFO
 {
-	/// See <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx> 
-	/// and <http://blogs.msdn.com/b/stevejs/archive/2005/12/19/505815.aspx> for
-	/// more information on the code below.
+	DWORD dwType;     // Must be 0x1000.
+	LPCSTR szName;    // Pointer to name (in user addr space).
+	DWORD dwThreadID; // Thread ID (-1=caller thread).
+	DWORD dwFlags;    // Reserved for future use, must be zero.
+} THREADNAME_INFO;
+#pragma pack(pop)
+
+void setThreadName(DWORD dwThreadID, const char* threadName)
+{
+	THREADNAME_INFO info;
+	info.dwType     = 0x1000;
+	info.szName     = threadName;
+	info.dwThreadID = dwThreadID;
+	info.dwFlags    = 0;
 
-	const DWORD MS_VC_EXCEPTION = 0x406D1388;
-	
-	#pragma pack(push,8)
-	typedef struct tagTHREADNAME_INFO
+	__try
 	{
-		DWORD dwType;     // Must be 0x1000.
-		LPCSTR szName;    // Pointer to name (in user addr space).
-		DWORD dwThreadID; // Thread ID (-1=caller thread).
-		DWORD dwFlags;    // Reserved for future use, must be zero.
-	} THREADNAME_INFO;
-	#pragma pack(pop)
-	
-	void setThreadName(DWORD dwThreadID, const char* threadName)
+		RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
+	}
+	__except (EXCEPTION_CONTINUE_EXECUTION)
 	{
-        THREADNAME_INFO info;
-        info.dwType     = 0x1000;
-        info.szName     = threadName;
-        info.dwThreadID = dwThreadID;
-        info.dwFlags    = 0;
-    
-        __try
-        {
-            RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
-        }
-        __except (EXCEPTION_CONTINUE_EXECUTION)
-        {
-        }
 	}
 }
+}
 
 
 #endif
@@ -73,7 +72,8 @@ ThreadImpl::ThreadImpl():
 	_thread(0),
 	_threadId(0),
 	_prio(PRIO_NORMAL_IMPL),
-	_stackSize(POCO_THREAD_STACK_SIZE)
+	_stackSize(POCO_THREAD_STACK_SIZE),
+	_cpu(-1)
 {
 }
 
@@ -104,6 +104,24 @@ void ThreadImpl::setOSPriorityImpl(int prio, int /* policy */)
 }
 
 
+void ThreadImpl::setAffinityImpl(int cpu)
+{
+	DWORD mask = 1;
+	mask <<= cpu;
+	if (SetThreadAffinityMask(_thread, mask) == 0)
+	{
+		throw SystemException("Failed to set affinity");
+	}
+	_cpu = cpu;
+}
+
+
+int ThreadImpl::getAffinityImpl() const
+{
+	return _cpu;
+}
+
+
 void ThreadImpl::startImpl(SharedPtr<Runnable> pTarget)
 {
 	if (isRunningImpl())
diff --git a/Foundation/src/Thread_WINCE.cpp b/Foundation/src/Thread_WINCE.cpp
index ea8b3de4ea..f7c1d2d6dd 100644
--- a/Foundation/src/Thread_WINCE.cpp
+++ b/Foundation/src/Thread_WINCE.cpp
@@ -34,7 +34,7 @@ ThreadImpl::ThreadImpl():
 {
 }
 
-			
+
 ThreadImpl::~ThreadImpl()
 {
 	if (_thread) CloseHandle(_thread);
@@ -141,7 +141,7 @@ ThreadImpl* ThreadImpl::currentImpl()
 
 ThreadImpl::TIDImpl ThreadImpl::currentTidImpl()
 {
-    return GetCurrentThreadId();
+	return GetCurrentThreadId();
 }
 
 
diff --git a/Foundation/src/Timestamp.cpp b/Foundation/src/Timestamp.cpp
index 7b92371354..e386ad309e 100644
--- a/Foundation/src/Timestamp.cpp
+++ b/Foundation/src/Timestamp.cpp
@@ -38,7 +38,7 @@
 #endif
 
 
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && defined(POCO_WINCE_TIMESTAMP_HACK)
 
 
 //
@@ -138,7 +138,7 @@ void GetSystemTimeAsFileTimeWithMillisecondResolution(FILETIME* pFT)
 } // namespace
 
 
-#endif // defined(_WIN32_WCE)
+#endif // defined(_WIN32_WCE) && defined(POCO_WINCE_TIMESTAMP_HACK)
 
 
 namespace Poco {
@@ -210,7 +210,7 @@ void Timestamp::update()
 #if defined(POCO_OS_FAMILY_WINDOWS)
 
 	FILETIME ft;
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && defined(POCO_WINCE_TIMESTAMP_HACK)
 	GetSystemTimeAsFileTimeWithMillisecondResolution(&ft);
 #else
 	GetSystemTimeAsFileTime(&ft);
diff --git a/Foundation/src/Unicode.cpp b/Foundation/src/Unicode.cpp
index 1d74eaf497..aab8a8a207 100644
--- a/Foundation/src/Unicode.cpp
+++ b/Foundation/src/Unicode.cpp
@@ -17,12 +17,43 @@
 #include "Poco/Unicode.h"
 
 
-extern "C"
-{
-#include "pcre_config.h"
-GCC_DIAG_OFF(unused-function) // pcre_memmove unused function warning
-#include "pcre_internal.h"
-}
+//
+// PCRE Unicode character database (UCD)
+// Taken from pcre_internal.h
+//
+
+
+typedef Poco::UInt8 pcre_uint8;
+typedef Poco::UInt16 pcre_uint16;
+typedef Poco::Int32 pcre_int32;
+typedef Poco::UInt32 pcre_uint32;
+
+typedef struct {
+  pcre_uint8 script;     /* ucp_Arabic, etc. */
+  pcre_uint8 chartype;   /* ucp_Cc, etc. (general categories) */
+  pcre_uint8 gbprop;     /* ucp_gbControl, etc. (grapheme break property) */
+  pcre_uint8 caseset;    /* offset to multichar other cases or zero */
+  pcre_int32 other_case; /* offset to other case, or zero if none */
+} ucd_record;
+
+extern "C" const pcre_uint32 _pcre_ucd_caseless_sets[];
+extern "C" const ucd_record  _pcre_ucd_records[];
+extern "C" const pcre_uint8  _pcre_ucd_stage1[];
+extern "C" const pcre_uint16 _pcre_ucd_stage2[];
+extern "C" const pcre_uint32 _pcre_ucp_gentype[];
+extern "C" const pcre_uint32 _pcre_ucp_gbtable[];
+
+#define UCD_BLOCK_SIZE 128
+#define GET_UCD(ch) (_pcre_ucd_records + \
+        _pcre_ucd_stage2[_pcre_ucd_stage1[(int)(ch) / UCD_BLOCK_SIZE] * \
+        UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
+
+#define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
+#define UCD_SCRIPT(ch)      GET_UCD(ch)->script
+#define UCD_CATEGORY(ch)    _pcre_ucp_gentype[UCD_CHARTYPE(ch)]
+#define UCD_GRAPHBREAK(ch)  GET_UCD(ch)->gbprop
+#define UCD_CASESET(ch)     GET_UCD(ch)->caseset
+#define UCD_OTHERCASE(ch)   ((pcre_uint32)((int)ch + (int)(GET_UCD(ch)->other_case)))
 
 
 namespace Poco {
diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver
index e8c63c2f2b..2d7cd36e6a 100644
--- a/Foundation/testsuite/Makefile-Driver
+++ b/Foundation/testsuite/Makefile-Driver
@@ -39,7 +39,8 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
 	HashSetTest HashMapTest SharedMemoryTest \
 	UniqueExpireCacheTest UniqueExpireLRUCacheTest UnicodeConverterTest \
 	TuplesTest NamedTuplesTest TypeListTest VarTest DynamicTestSuite FileStreamTest \
-	MemoryStreamTest ObjectPoolTest DirectoryWatcherTest DirectoryIteratorsTest
+	MemoryStreamTest ObjectPoolTest DirectoryWatcherTest \
+	DirectoryIteratorsTest FIFOBufferTestSuite FIFOBufferTest
 
 target         = testrunner
 target_version = 1
diff --git a/Foundation/testsuite/TestSuite.progen b/Foundation/testsuite/TestSuite.progen
new file mode 100644
index 0000000000..5ebaaa89d7
--- /dev/null
+++ b/Foundation/testsuite/TestSuite.progen
@@ -0,0 +1,12 @@
+vc.project.guid = C812E0B9-69A9-4FA1-A1D4-161CF677BD10
+vc.project.name = TestSuite
+vc.project.target = TestSuite
+vc.project.type = testsuite
+vc.project.pocobase = ..\\..
+vc.project.platforms = Win32, x64, WinCE
+vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
+vc.project.prototype = TestSuite_vs90.vcproj
+vc.project.compiler.include = ..\\..\\Foundation\\include
+vc.project.linker.dependencies.Win32 = iphlpapi.lib
+vc.project.linker.dependencies.x64 = iphlpapi.lib
+vc.project.linker.dependencies.WinCE = iphlpapi.lib
diff --git a/Foundation/testsuite/TestSuite_CE_vs90.vcproj b/Foundation/testsuite/TestSuite_CE_vs90.vcproj
index 133be0ef70..2b02aebb73 100644
--- a/Foundation/testsuite/TestSuite_CE_vs90.vcproj
+++ b/Foundation/testsuite/TestSuite_CE_vs90.vcproj
@@ -602,6 +602,14 @@
 					RelativePath=".\src\AutoReleasePoolTest.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTestSuite.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\ByteOrderTest.cpp"
 					>
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj
index 2317d2d0b4..fe8ae868b7 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj
@@ -1,113 +1,161 @@
-<?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|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>debug_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_md|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>debug_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_mt|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>debug_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_shared|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>release_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_md|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>release_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_mt|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>release_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\WinCEDriver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <EnableRedirectPlatform>true</EnableRedirectPlatform>
     <RedirectPlatformValue>SDK_AM335X_SK_WEC2013_V300</RedirectPlatformValue>
     <PlatformToolset>CE800</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">bin\$(Platform)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">bin\$(Platform)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">bin\$(Platform)\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">bin\$(Platform)\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">bin\$(Platform)\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">bin\$(Platform)\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">false</LinkIncremental>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">TestSuited</TargetName>
@@ -115,448 +163,148 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">TestSuite</TargetName>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationd.lib;CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\$(TargetName).pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundation.lib;CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmd.lib;CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmdd.lib;CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_md\$(TargetName).pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmtd.lib;CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_mt\$(TargetName).pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmt.lib;CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\WinCEDriver.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
-  </ItemGroup>
+  <ItemDefinitionGroup/>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
index d6753d31a7..fe6413b058 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{a59b5185-a828-49a5-af23-d86b47d2c19c}</UniqueIdentifier>
+      <UniqueIdentifier>{ad3fa692-aa08-49df-aa12-4a46a3489f2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{1e6128ad-7c36-4a4d-ad5c-c604171281c1}</UniqueIdentifier>
+      <UniqueIdentifier>{8e280af8-468a-436d-8b1d-61f01209971d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{7abaf643-e5e3-4023-bbe8-8b8febe849dd}</UniqueIdentifier>
+      <UniqueIdentifier>{558daa29-4c98-4850-a20e-0e35998fda2b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{87d01d31-9117-4d34-9d22-7babfd7b7bff}</UniqueIdentifier>
+      <UniqueIdentifier>{3b898d46-269b-4b3e-a944-d83308474322}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{f6aad27f-31ed-496c-97ce-9c7d153d166d}</UniqueIdentifier>
+      <UniqueIdentifier>{f60abb18-6670-4ad8-ac53-af60d4922e98}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c}</UniqueIdentifier>
+      <UniqueIdentifier>{cb196216-ac67-4166-8370-9fafb1afafd8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{0ed8b0f5-8c2f-4c45-b211-e0144659fcb6}</UniqueIdentifier>
+      <UniqueIdentifier>{2e88ca0b-24ef-4f77-8243-587f9dbf6f33}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{81f46737-5924-42f1-96dd-e809506231bd}</UniqueIdentifier>
+      <UniqueIdentifier>{e7869ed3-cfca-4f76-8fcf-70157512e3f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{a0215363-3aef-44fa-b1a5-153f868079dc}</UniqueIdentifier>
+      <UniqueIdentifier>{ea547ba3-0bb2-43fb-8aca-09d7cda5015b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{6ed14268-7950-426b-a6c8-b05a86890ab1}</UniqueIdentifier>
+      <UniqueIdentifier>{e118d9b3-2963-465c-91f9-4e29ae2d65fd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f64b14-f65d-4d7a-809a-29c3792f46b7}</UniqueIdentifier>
+      <UniqueIdentifier>{6787a8ac-3f45-461a-a875-78357abe612e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ffbc93f2-916d-43ca-9416-06c87734a668}</UniqueIdentifier>
+      <UniqueIdentifier>{02519f68-8872-4fd1-aec5-ea0062e5b076}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{32ee8bb2-1b7b-4826-b50d-66e7f90fbe34}</UniqueIdentifier>
+      <UniqueIdentifier>{7b935510-a78d-446d-9d61-fe5bdea316e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{a8482038-01a5-4790-bd4a-1d857be47fec}</UniqueIdentifier>
+      <UniqueIdentifier>{8b0452dc-6335-4d8b-b65d-444583bd1310}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d}</UniqueIdentifier>
+      <UniqueIdentifier>{50f5d4f2-b5ca-4fe0-9c06-0734a0d608b4}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{db211c8f-878a-41b0-9e48-53a7bd45b2cd}</UniqueIdentifier>
+      <UniqueIdentifier>{7fd4f336-ae9c-4287-ad87-5e6368e6cc53}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0}</UniqueIdentifier>
+      <UniqueIdentifier>{757ab29d-5ae9-4afa-8f43-9779a4389dfd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{ef5ce424-fc18-4a60-8093-9f1ea328d52d}</UniqueIdentifier>
+      <UniqueIdentifier>{0619415d-48e9-4024-8231-1ecac9205c53}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{e9794e29-e01f-476a-b5b0-ee65be0c2132}</UniqueIdentifier>
+      <UniqueIdentifier>{49989c6a-d634-4eed-9982-1049937bb905}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{59047d4e-bd68-42a9-9309-7e624c42a9b0}</UniqueIdentifier>
+      <UniqueIdentifier>{69596f83-3610-4342-8bd8-fc19dd9c44ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{110b921c-f4d4-4f37-bdf3-01a7a2538693}</UniqueIdentifier>
+      <UniqueIdentifier>{5841de48-b4a5-4201-abcb-5b60a3fab990}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{665bb14f-e709-4b3b-8ac3-3bf3a94b686f}</UniqueIdentifier>
+      <UniqueIdentifier>{2dd1fcfa-ce03-468c-a1c6-6e5d8359c1c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9}</UniqueIdentifier>
+      <UniqueIdentifier>{2cce132b-d44b-47e0-a795-02717889af52}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{71886495-7c6c-42c4-8a3e-4d0a93def203}</UniqueIdentifier>
+      <UniqueIdentifier>{837521ff-c655-4c62-aa4b-7d09390f7c17}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{515441cb-c92a-4003-80ae-9cce02ed4c09}</UniqueIdentifier>
+      <UniqueIdentifier>{d9d5a6de-223e-4ecc-ace8-465e17e38184}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{59f2f054-075b-4f91-8434-b9bc6d02f8a9}</UniqueIdentifier>
+      <UniqueIdentifier>{ebea41c6-89fc-4e8d-a2d2-2b01fe4dcc3a}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{1ad60877-d2c7-4061-8cb9-fd5f220bbc20}</UniqueIdentifier>
+      <UniqueIdentifier>{d3a149e3-f80e-4dda-8307-81cc452c5c18}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{d29fdc4f-a128-4f49-ae88-61ae7f63ffb2}</UniqueIdentifier>
+      <UniqueIdentifier>{4c3e74c9-2e4f-4fb0-bd14-a51b1015bb4b}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{907687c4-8f5f-4cf3-ae43-6ee1a22571de}</UniqueIdentifier>
+      <UniqueIdentifier>{ef1cc576-a6d8-48d7-98bc-2c51b1f928c3}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{5d57a631-556c-4b0c-a417-de68ea3f1aeb}</UniqueIdentifier>
+      <UniqueIdentifier>{1aa9253c-0fac-48b5-a72c-796fa2377f20}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9}</UniqueIdentifier>
+      <UniqueIdentifier>{b0cd7115-52c5-466e-9a49-eff35769c915}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{ea02acda-0ec0-41b8-8e85-19fbf1b71687}</UniqueIdentifier>
+      <UniqueIdentifier>{7cb1dce8-6078-4fb6-b65e-8f238255ec6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{f0c7bb59-bb71-42fc-8275-aaed17decfb0}</UniqueIdentifier>
+      <UniqueIdentifier>{a8297161-4054-4685-b7f4-7458d1efe93c}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{60844487-77c9-46e6-b54e-39d7c7139ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{af4a27e2-4e4b-4e67-9832-e998a1132ea3}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{28b544d5-54dd-449c-b2c6-62f92ee68f94}</UniqueIdentifier>
+      <UniqueIdentifier>{33aed133-318b-43f0-9541-3f767e9f2311}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{6f757782-30a7-47bb-b9c1-9197250c52d3}</UniqueIdentifier>
+      <UniqueIdentifier>{e3ec148b-78f7-4fd1-9737-29eaa538290d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{40a76071-eda0-455b-a482-b5a37ffd0b9a}</UniqueIdentifier>
+      <UniqueIdentifier>{c46a9c1a-8bec-440d-89dc-10cac661b654}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a38b8ef3-6882-4a35-850c-9380db4b7d8b}</UniqueIdentifier>
+      <UniqueIdentifier>{4033db98-c3cc-4522-8bf1-5c005c96d693}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42}</UniqueIdentifier>
+      <UniqueIdentifier>{d5b9d054-aa37-493c-b143-97c3b09adb97}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{128755f3-1063-45aa-b4ad-6f796da5b60c}</UniqueIdentifier>
+      <UniqueIdentifier>{b00b127e-2dd9-481f-a618-bf9a5cb124d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{52dde893-fa0a-4f27-8c92-e758a206d626}</UniqueIdentifier>
+      <UniqueIdentifier>{6d5708ea-3a03-47f0-a516-3469c28c0188}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{fee75e70-8621-4511-a6a0-50a32ca0b45b}</UniqueIdentifier>
+      <UniqueIdentifier>{a65ce1a0-aef4-4556-9b33-5015bb9ce54e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{f89473da-f4fc-4aae-9fa4-2f8c361c06f1}</UniqueIdentifier>
+      <UniqueIdentifier>{dcc43100-d286-40d5-ba3e-8d243fad9c39}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{19f29f26-70d7-41d6-a8aa-3bcd7fd7448a}</UniqueIdentifier>
+      <UniqueIdentifier>{f36187d8-4767-4399-bda4-a36436e17689}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{e5121ac0-03cc-416a-a403-1040fdbd6559}</UniqueIdentifier>
+      <UniqueIdentifier>{2163f24c-97a7-4e4a-883b-1ce58794e115}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f}</UniqueIdentifier>
+      <UniqueIdentifier>{c97618b5-6b0e-4353-b998-34583fb5cb35}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{7a7cb161-16b5-4b1c-97c3-7cdbf33a4013}</UniqueIdentifier>
+      <UniqueIdentifier>{a0eb4b2c-b5a0-4962-aaba-816b9a6cfb05}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{9378befb-ab93-48c0-9be3-df72edda5370}</UniqueIdentifier>
+      <UniqueIdentifier>{99f3bda6-64f6-49c5-a1b6-a2fb23d2aeda}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{9af092ac-23f9-4829-aaf8-7409e3196a33}</UniqueIdentifier>
+      <UniqueIdentifier>{08189ba1-b245-4475-baa4-a64761675163}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{06f76446-a7b0-457b-8e4b-341d222f57ac}</UniqueIdentifier>
+      <UniqueIdentifier>{1afa29e9-7bbb-45b0-9a14-3054fa1bfc08}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{03e890a9-85f6-4148-bc85-d29640ba1250}</UniqueIdentifier>
+      <UniqueIdentifier>{98aa512c-edcc-4c0b-9b08-5ed2c343d237}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{b16bd65c-3280-498f-b7a0-b51525a49971}</UniqueIdentifier>
+      <UniqueIdentifier>{f9f5432b-7de3-4236-a9ce-da4e5a7d82a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9}</UniqueIdentifier>
+      <UniqueIdentifier>{04110352-c74e-4c30-87ac-c5c217fd7d6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{14d22125-f7e7-47b8-9334-da6486ee9182}</UniqueIdentifier>
+      <UniqueIdentifier>{08a88e75-d03d-449d-b8a3-fc976a3f2338}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{570d80b8-a7cf-4092-9bdd-f74ff73ec221}</UniqueIdentifier>
+      <UniqueIdentifier>{c107a40e-99cd-4c1b-8ce7-5f0e9fff95c5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{9793912a-a80c-4122-8d10-1edb0ea86a09}</UniqueIdentifier>
+      <UniqueIdentifier>{e6762433-4c66-460c-bf49-39999288447d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{b7d7eace-f782-44ad-874d-754aaf8bcd0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{2f17bf3b-a264-4c07-a053-633bbe4112b1}</UniqueIdentifier>
+      <UniqueIdentifier>{98938304-7d9c-4d63-b725-ddb2ada57d99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{2d764bf9-ddee-4319-b946-66b87e3e2328}</UniqueIdentifier>
+      <UniqueIdentifier>{c79ab636-4733-4c32-b42c-67fc9ab93ba9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Dynamic\Header Files">
+      <UniqueIdentifier>{8790a2d9-495b-4493-bb96-4a5cc05c6b50}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -198,9 +201,18 @@
     <ClCompile Include="src\CoreTestSuite.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -225,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -255,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -300,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -405,10 +426,10 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FilesystemTestSuite.cpp">
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+    <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\FileTest.cpp">
@@ -495,6 +516,9 @@
     <ClCompile Include="src\FoundationTestSuite.cpp">
       <Filter>_Suite\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WinCEDriver.cpp">
+      <Filter>_Driver\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NamedEventTest.cpp">
       <Filter>Processes\Source Files</Filter>
     </ClCompile>
@@ -570,32 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\WinCEDriver.cpp">
-      <Filter>_Driver\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -611,9 +620,21 @@
     <ClInclude Include="src\CoreTestSuite.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryIteratorsTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DynamicAnyTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -638,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -668,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -713,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -818,10 +848,10 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FilesystemTestSuite.h">
+    <ClInclude Include="src\DirectoryWatcherTest.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\DirectoryIteratorsTest.h">
+    <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\FileTest.h">
@@ -983,23 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj
index 6c71878586..95fe494a60 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj
@@ -1,113 +1,161 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="UTF-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug_shared|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>debug_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_md|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>debug_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_mt|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>debug_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_shared|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>release_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_md|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>release_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_mt|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>release_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\WinCEDriver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <EnableRedirectPlatform>true</EnableRedirectPlatform>
     <RedirectPlatformValue>SDK_AM335X_SK_WEC2013_V310</RedirectPlatformValue>
     <PlatformToolset>CE800</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">bin\$(Platform)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">bin\$(Platform)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">bin\$(Platform)\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">bin\$(Platform)\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">bin\$(Platform)\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">bin\$(Platform)\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">false</LinkIncremental>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">TestSuited</TargetName>
@@ -115,451 +163,148 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">TestSuite</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">
-    <RemoteDirectory>Storage_Card\</RemoteDirectory>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationd.lib;CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\$(TargetName).pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundation.lib;CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmd.lib;CppUnitmd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmdd.lib;CppUnitmdd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_md\$(TargetName).pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmtd.lib;CppUnitmtd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_mt\$(TargetName).pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>PocoFoundationmt.lib;CppUnitmt.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\$(TargetName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\WinCEDriver.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
-  </ItemGroup>
+  <ItemDefinitionGroup/>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
index d6753d31a7..cba552d6b7 100644
--- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{a59b5185-a828-49a5-af23-d86b47d2c19c}</UniqueIdentifier>
+      <UniqueIdentifier>{6a64ab69-1020-4cb0-ad6d-6833ccad0f7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{1e6128ad-7c36-4a4d-ad5c-c604171281c1}</UniqueIdentifier>
+      <UniqueIdentifier>{089027dd-1886-4e6c-acc6-07d8c1a4bae3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{7abaf643-e5e3-4023-bbe8-8b8febe849dd}</UniqueIdentifier>
+      <UniqueIdentifier>{75a356d5-5333-4450-8db2-8cd59fd630c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{87d01d31-9117-4d34-9d22-7babfd7b7bff}</UniqueIdentifier>
+      <UniqueIdentifier>{e60c4fc2-58dc-4dfc-b2de-b59b9277c095}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{f6aad27f-31ed-496c-97ce-9c7d153d166d}</UniqueIdentifier>
+      <UniqueIdentifier>{ba47d8f9-edce-493e-8f98-f8550db204ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c}</UniqueIdentifier>
+      <UniqueIdentifier>{d460ae5d-9205-4596-bbce-eb47f1c82d37}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{0ed8b0f5-8c2f-4c45-b211-e0144659fcb6}</UniqueIdentifier>
+      <UniqueIdentifier>{cf750907-3d20-4e5e-8951-70c08964cbf1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{81f46737-5924-42f1-96dd-e809506231bd}</UniqueIdentifier>
+      <UniqueIdentifier>{4e50fcc3-ff39-40a0-9b16-9ed5d548c727}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{a0215363-3aef-44fa-b1a5-153f868079dc}</UniqueIdentifier>
+      <UniqueIdentifier>{3d384c8c-5398-4cf5-b972-4dd1d1fa46d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{6ed14268-7950-426b-a6c8-b05a86890ab1}</UniqueIdentifier>
+      <UniqueIdentifier>{8e3c00ab-fe87-4c44-ae91-8d1da0508117}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f64b14-f65d-4d7a-809a-29c3792f46b7}</UniqueIdentifier>
+      <UniqueIdentifier>{13fd5a69-a8c3-47fb-bbb3-07be018eb0e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ffbc93f2-916d-43ca-9416-06c87734a668}</UniqueIdentifier>
+      <UniqueIdentifier>{be4082af-c2a0-41b4-afd4-3b8492bf7104}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{32ee8bb2-1b7b-4826-b50d-66e7f90fbe34}</UniqueIdentifier>
+      <UniqueIdentifier>{d0eccd7b-b005-4d58-b02e-f83e5872246c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{a8482038-01a5-4790-bd4a-1d857be47fec}</UniqueIdentifier>
+      <UniqueIdentifier>{d32111db-7076-43ea-9731-13f74283969d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d}</UniqueIdentifier>
+      <UniqueIdentifier>{e6541009-7aa5-432b-a279-2ea22797d3ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{db211c8f-878a-41b0-9e48-53a7bd45b2cd}</UniqueIdentifier>
+      <UniqueIdentifier>{19ecf7de-7438-4eb6-9b30-80d864408d87}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0}</UniqueIdentifier>
+      <UniqueIdentifier>{57d155e7-3ae4-4bd5-8627-86caa409d35a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{ef5ce424-fc18-4a60-8093-9f1ea328d52d}</UniqueIdentifier>
+      <UniqueIdentifier>{57db46af-7859-40c3-8b04-118c5a4e997b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{e9794e29-e01f-476a-b5b0-ee65be0c2132}</UniqueIdentifier>
+      <UniqueIdentifier>{17037897-b729-4020-bc47-828ab6f1b426}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{59047d4e-bd68-42a9-9309-7e624c42a9b0}</UniqueIdentifier>
+      <UniqueIdentifier>{d679fbdf-5e85-4d8b-8954-aa73e9de0f8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{110b921c-f4d4-4f37-bdf3-01a7a2538693}</UniqueIdentifier>
+      <UniqueIdentifier>{3db0f9bc-15eb-4027-b2aa-7b4c3fcc2046}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{665bb14f-e709-4b3b-8ac3-3bf3a94b686f}</UniqueIdentifier>
+      <UniqueIdentifier>{456be418-cce3-4cd1-9f59-38e4232f8f3b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9}</UniqueIdentifier>
+      <UniqueIdentifier>{bdb2b793-89d0-474c-ba3b-484c9b50a52f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{71886495-7c6c-42c4-8a3e-4d0a93def203}</UniqueIdentifier>
+      <UniqueIdentifier>{15943c33-0109-44a6-a241-71e98b0413cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{515441cb-c92a-4003-80ae-9cce02ed4c09}</UniqueIdentifier>
+      <UniqueIdentifier>{2f5b68d3-c2f9-4275-ae8c-cffc2b1acb88}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{59f2f054-075b-4f91-8434-b9bc6d02f8a9}</UniqueIdentifier>
+      <UniqueIdentifier>{259eade8-fd85-4d9d-be27-6aee8aa660b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{1ad60877-d2c7-4061-8cb9-fd5f220bbc20}</UniqueIdentifier>
+      <UniqueIdentifier>{a9bfb092-b2b3-4dea-9c33-08e53d09ce2a}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{d29fdc4f-a128-4f49-ae88-61ae7f63ffb2}</UniqueIdentifier>
+      <UniqueIdentifier>{17e685df-5ae3-41b4-9309-c88c314e727e}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{907687c4-8f5f-4cf3-ae43-6ee1a22571de}</UniqueIdentifier>
+      <UniqueIdentifier>{251c8bc7-72d0-4ee0-a3af-b879b496fb3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{5d57a631-556c-4b0c-a417-de68ea3f1aeb}</UniqueIdentifier>
+      <UniqueIdentifier>{6c441101-30fa-40a4-aca5-7ec25de69ca2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9}</UniqueIdentifier>
+      <UniqueIdentifier>{a447f3cb-51a1-44b6-b79a-c07103b10549}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{ea02acda-0ec0-41b8-8e85-19fbf1b71687}</UniqueIdentifier>
+      <UniqueIdentifier>{408d8f0d-646b-423b-a1fb-0005618d868b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{f0c7bb59-bb71-42fc-8275-aaed17decfb0}</UniqueIdentifier>
+      <UniqueIdentifier>{3cf10492-faa7-4d08-9462-5d73b944277f}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{60844487-77c9-46e6-b54e-39d7c7139ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{01644098-e376-4f03-8733-e9a911c3371e}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{28b544d5-54dd-449c-b2c6-62f92ee68f94}</UniqueIdentifier>
+      <UniqueIdentifier>{0afa7602-c5ce-4546-9620-3d8857ae041a}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{6f757782-30a7-47bb-b9c1-9197250c52d3}</UniqueIdentifier>
+      <UniqueIdentifier>{dc5a10cc-4119-4a2a-9250-4f2f4891a3b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{40a76071-eda0-455b-a482-b5a37ffd0b9a}</UniqueIdentifier>
+      <UniqueIdentifier>{5192bf29-1698-435d-b62f-77a87436804a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a38b8ef3-6882-4a35-850c-9380db4b7d8b}</UniqueIdentifier>
+      <UniqueIdentifier>{31df517a-4a5c-4716-a786-06b7f74842e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42}</UniqueIdentifier>
+      <UniqueIdentifier>{b0a9869a-c6f8-46b3-9577-030e5c52286f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{128755f3-1063-45aa-b4ad-6f796da5b60c}</UniqueIdentifier>
+      <UniqueIdentifier>{ca54ceaf-2bd2-4d71-9a1a-4b7ed7e78af4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{52dde893-fa0a-4f27-8c92-e758a206d626}</UniqueIdentifier>
+      <UniqueIdentifier>{8d500257-a065-4b1f-b6c8-af49eab0aabe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{fee75e70-8621-4511-a6a0-50a32ca0b45b}</UniqueIdentifier>
+      <UniqueIdentifier>{d0a8f449-a1e1-420f-83ca-05cbd2e30108}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{f89473da-f4fc-4aae-9fa4-2f8c361c06f1}</UniqueIdentifier>
+      <UniqueIdentifier>{b4c6e4d1-ec4a-4b51-b27f-23520f526a37}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{19f29f26-70d7-41d6-a8aa-3bcd7fd7448a}</UniqueIdentifier>
+      <UniqueIdentifier>{7d761efc-6ffe-44b0-98ec-7cc6eddb41a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{e5121ac0-03cc-416a-a403-1040fdbd6559}</UniqueIdentifier>
+      <UniqueIdentifier>{f9c95e83-daa1-4185-aa52-a24d6db2d78f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f}</UniqueIdentifier>
+      <UniqueIdentifier>{ffcf718a-218a-489e-a866-bc8a4e879a6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{7a7cb161-16b5-4b1c-97c3-7cdbf33a4013}</UniqueIdentifier>
+      <UniqueIdentifier>{82a77e51-ebbd-4d47-bc91-489e08e498cb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{9378befb-ab93-48c0-9be3-df72edda5370}</UniqueIdentifier>
+      <UniqueIdentifier>{47a9fc0f-0fc8-4bbc-be48-68a710d32d40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{9af092ac-23f9-4829-aaf8-7409e3196a33}</UniqueIdentifier>
+      <UniqueIdentifier>{00cff79b-c501-4104-8249-5ce10c97e41b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{06f76446-a7b0-457b-8e4b-341d222f57ac}</UniqueIdentifier>
+      <UniqueIdentifier>{7e65a6df-de2b-458d-bb2f-0767fe62976f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{03e890a9-85f6-4148-bc85-d29640ba1250}</UniqueIdentifier>
+      <UniqueIdentifier>{372dc43f-0f40-4803-b0e1-0503ab0584a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{b16bd65c-3280-498f-b7a0-b51525a49971}</UniqueIdentifier>
+      <UniqueIdentifier>{7ed96d10-3934-45b9-9211-b3b040d9a1b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9}</UniqueIdentifier>
+      <UniqueIdentifier>{4fdd94af-ed69-4c74-9991-f29517086d51}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{14d22125-f7e7-47b8-9334-da6486ee9182}</UniqueIdentifier>
+      <UniqueIdentifier>{53c52b74-bc22-49e6-b139-f3869e4024ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{570d80b8-a7cf-4092-9bdd-f74ff73ec221}</UniqueIdentifier>
+      <UniqueIdentifier>{ba898181-5c19-45fc-9d51-832f31e642db}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{9793912a-a80c-4122-8d10-1edb0ea86a09}</UniqueIdentifier>
+      <UniqueIdentifier>{925c63ff-cdcd-44fb-a94f-9e3be9e5e4cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{b7d7eace-f782-44ad-874d-754aaf8bcd0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{2f17bf3b-a264-4c07-a053-633bbe4112b1}</UniqueIdentifier>
+      <UniqueIdentifier>{1b7da4c6-05f0-493a-ba3b-b1504861ae90}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{2d764bf9-ddee-4319-b946-66b87e3e2328}</UniqueIdentifier>
+      <UniqueIdentifier>{148a3b8d-4707-4a51-985b-24fa7910aa49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Dynamic\Header Files">
+      <UniqueIdentifier>{e9b1d626-3232-436f-873e-22b1aadb7529}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -198,9 +201,18 @@
     <ClCompile Include="src\CoreTestSuite.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -225,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -255,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -300,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -405,10 +426,10 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FilesystemTestSuite.cpp">
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+    <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\FileTest.cpp">
@@ -495,6 +516,9 @@
     <ClCompile Include="src\FoundationTestSuite.cpp">
       <Filter>_Suite\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WinCEDriver.cpp">
+      <Filter>_Driver\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NamedEventTest.cpp">
       <Filter>Processes\Source Files</Filter>
     </ClCompile>
@@ -570,32 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\WinCEDriver.cpp">
-      <Filter>_Driver\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -611,9 +620,21 @@
     <ClInclude Include="src\CoreTestSuite.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryIteratorsTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DynamicAnyTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -638,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -668,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -713,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -818,10 +848,10 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FilesystemTestSuite.h">
+    <ClInclude Include="src\DirectoryWatcherTest.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\DirectoryIteratorsTest.h">
+    <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\FileTest.h">
@@ -983,23 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj
index c2bebc387a..fbca104a04 100644
--- a/Foundation/testsuite/TestSuite_vs100.vcxproj
+++ b/Foundation/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">
@@ -28,28 +28,29 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
+    <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
@@ -62,28 +63,27 @@
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <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"/>
+  </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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
@@ -92,18 +92,18 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\TestSuite\$(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\TestSuite\$(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\TestSuite\$(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\TestSuite\$(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>
@@ -114,8 +114,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -123,20 +124,23 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <FloatingPointModel>Precise</FloatingPointModel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
@@ -146,7 +150,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,65 +158,99 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -220,364 +258,341 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\WinDriver.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\WinDriver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
index 448b4375a3..4fd1a926bf 100644
--- a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{a59b5185-a828-49a5-af23-d86b47d2c19c}</UniqueIdentifier>
+      <UniqueIdentifier>{2e7b5c2c-a621-4c3f-8665-d018433a47be}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{1e6128ad-7c36-4a4d-ad5c-c604171281c1}</UniqueIdentifier>
+      <UniqueIdentifier>{aa2a4c51-3250-474c-9fd7-b4c02d627c23}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{7abaf643-e5e3-4023-bbe8-8b8febe849dd}</UniqueIdentifier>
+      <UniqueIdentifier>{e3000b27-8e98-43b9-8676-0e2bc552ed96}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{87d01d31-9117-4d34-9d22-7babfd7b7bff}</UniqueIdentifier>
+      <UniqueIdentifier>{9b02fdf4-330d-4ea1-9b50-756ea1e9cbad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{f6aad27f-31ed-496c-97ce-9c7d153d166d}</UniqueIdentifier>
+      <UniqueIdentifier>{e01a48ab-4deb-461c-ac9b-da93d753bce6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c}</UniqueIdentifier>
+      <UniqueIdentifier>{783f30ef-30f9-4653-ae14-b5e174b7f78b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{0ed8b0f5-8c2f-4c45-b211-e0144659fcb6}</UniqueIdentifier>
+      <UniqueIdentifier>{a42da995-bcd7-4537-8252-d5e53d0f1d0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{81f46737-5924-42f1-96dd-e809506231bd}</UniqueIdentifier>
+      <UniqueIdentifier>{adbec94e-84f6-4a73-b8ad-56460f915735}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{a0215363-3aef-44fa-b1a5-153f868079dc}</UniqueIdentifier>
+      <UniqueIdentifier>{d68eb360-09da-436b-ba93-930e42eb3765}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{6ed14268-7950-426b-a6c8-b05a86890ab1}</UniqueIdentifier>
+      <UniqueIdentifier>{9a8db21b-da0d-4166-87df-cb3b5fdad9cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f64b14-f65d-4d7a-809a-29c3792f46b7}</UniqueIdentifier>
+      <UniqueIdentifier>{db95736d-423e-477f-9b96-b69270d92db3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ffbc93f2-916d-43ca-9416-06c87734a668}</UniqueIdentifier>
+      <UniqueIdentifier>{30ff01a7-c8de-488d-8825-18ecea307edb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{32ee8bb2-1b7b-4826-b50d-66e7f90fbe34}</UniqueIdentifier>
+      <UniqueIdentifier>{53539527-99a1-4611-973f-eafbc885d7fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{a8482038-01a5-4790-bd4a-1d857be47fec}</UniqueIdentifier>
+      <UniqueIdentifier>{8670cfea-46c1-4f9c-b627-7394a23afc23}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d}</UniqueIdentifier>
+      <UniqueIdentifier>{3444554f-0e39-4caa-938a-6eb00f5bd6a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{db211c8f-878a-41b0-9e48-53a7bd45b2cd}</UniqueIdentifier>
+      <UniqueIdentifier>{c4c27564-f218-40d0-8e56-e8e3ed2d7f19}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0}</UniqueIdentifier>
+      <UniqueIdentifier>{cd2a3ab0-fb71-43e4-ace0-bb0e9d7a8af8}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{ef5ce424-fc18-4a60-8093-9f1ea328d52d}</UniqueIdentifier>
+      <UniqueIdentifier>{e35bb723-46b3-46e3-8cbf-d28df355ea53}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{e9794e29-e01f-476a-b5b0-ee65be0c2132}</UniqueIdentifier>
+      <UniqueIdentifier>{ab9eff64-9534-4e0c-a933-ee6de3a209a9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{59047d4e-bd68-42a9-9309-7e624c42a9b0}</UniqueIdentifier>
+      <UniqueIdentifier>{ac884684-43da-4dd8-a44e-24802a812393}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{110b921c-f4d4-4f37-bdf3-01a7a2538693}</UniqueIdentifier>
+      <UniqueIdentifier>{68c296ac-f7e0-425a-bd33-360f5698a8de}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{665bb14f-e709-4b3b-8ac3-3bf3a94b686f}</UniqueIdentifier>
+      <UniqueIdentifier>{6a4b4b6e-4809-4b7f-8833-2fc2994ce1f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9}</UniqueIdentifier>
+      <UniqueIdentifier>{e3509278-8ef5-408f-9542-c91dcdd28760}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{71886495-7c6c-42c4-8a3e-4d0a93def203}</UniqueIdentifier>
+      <UniqueIdentifier>{ae7e489e-8a98-42b8-a5d2-480524ea5760}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{515441cb-c92a-4003-80ae-9cce02ed4c09}</UniqueIdentifier>
+      <UniqueIdentifier>{032a30c0-9065-4eb4-9a32-a91ba8f27ffa}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{59f2f054-075b-4f91-8434-b9bc6d02f8a9}</UniqueIdentifier>
+      <UniqueIdentifier>{38db7f11-625e-4e2d-a419-13bb4df3ecff}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{1ad60877-d2c7-4061-8cb9-fd5f220bbc20}</UniqueIdentifier>
+      <UniqueIdentifier>{6f42cc0b-94c6-4f02-8db5-3e5856631d36}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{d29fdc4f-a128-4f49-ae88-61ae7f63ffb2}</UniqueIdentifier>
+      <UniqueIdentifier>{190d3222-f479-4dce-822a-144d2940f669}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{907687c4-8f5f-4cf3-ae43-6ee1a22571de}</UniqueIdentifier>
+      <UniqueIdentifier>{2948a228-c54d-4488-bdb3-793e2822c6fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{5d57a631-556c-4b0c-a417-de68ea3f1aeb}</UniqueIdentifier>
+      <UniqueIdentifier>{864eba35-a78b-46cb-9452-8dd975e12c55}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9}</UniqueIdentifier>
+      <UniqueIdentifier>{bdfbe601-57c5-4d93-8535-c95905f85e82}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{ea02acda-0ec0-41b8-8e85-19fbf1b71687}</UniqueIdentifier>
+      <UniqueIdentifier>{73238f2c-5261-4833-bad2-9eb2eea57641}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{f0c7bb59-bb71-42fc-8275-aaed17decfb0}</UniqueIdentifier>
+      <UniqueIdentifier>{0acd48c0-20ad-4d45-8809-7c674bf9c736}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{60844487-77c9-46e6-b54e-39d7c7139ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{b5548d39-c978-479d-af41-fe2bf341c3a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{28b544d5-54dd-449c-b2c6-62f92ee68f94}</UniqueIdentifier>
+      <UniqueIdentifier>{5638c842-e362-43b8-841d-8acf34046360}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{6f757782-30a7-47bb-b9c1-9197250c52d3}</UniqueIdentifier>
+      <UniqueIdentifier>{e0a682c7-b8dd-431b-8724-8744937ea56a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{40a76071-eda0-455b-a482-b5a37ffd0b9a}</UniqueIdentifier>
+      <UniqueIdentifier>{f9caf92a-e9c5-4811-b922-2c5918a5a145}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a38b8ef3-6882-4a35-850c-9380db4b7d8b}</UniqueIdentifier>
+      <UniqueIdentifier>{f94b9cc9-0c68-4faf-becb-f7c814a38bcb}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42}</UniqueIdentifier>
+      <UniqueIdentifier>{b38b3c7e-c36c-41fd-8eeb-935f0954feea}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{128755f3-1063-45aa-b4ad-6f796da5b60c}</UniqueIdentifier>
+      <UniqueIdentifier>{22b55fe2-d459-40df-9aa8-421c48d4e3f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{52dde893-fa0a-4f27-8c92-e758a206d626}</UniqueIdentifier>
+      <UniqueIdentifier>{67cfbc8e-be95-4328-9961-84aea3161f0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{fee75e70-8621-4511-a6a0-50a32ca0b45b}</UniqueIdentifier>
+      <UniqueIdentifier>{57b90d56-ee70-4bc9-88f0-f61ac9124546}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{f89473da-f4fc-4aae-9fa4-2f8c361c06f1}</UniqueIdentifier>
+      <UniqueIdentifier>{04e74a33-b66b-4d43-935c-ef209d0394d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{19f29f26-70d7-41d6-a8aa-3bcd7fd7448a}</UniqueIdentifier>
+      <UniqueIdentifier>{d2ff90bb-27ff-4fb9-b4e5-02d14a525cd0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{e5121ac0-03cc-416a-a403-1040fdbd6559}</UniqueIdentifier>
+      <UniqueIdentifier>{2d9b1448-bd2e-4468-9117-dac1836d52d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f}</UniqueIdentifier>
+      <UniqueIdentifier>{acc352d9-b343-42a0-bfe6-c3aa959cfe75}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{7a7cb161-16b5-4b1c-97c3-7cdbf33a4013}</UniqueIdentifier>
+      <UniqueIdentifier>{4b815550-33a7-452e-b510-d3e26a879f2f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{9378befb-ab93-48c0-9be3-df72edda5370}</UniqueIdentifier>
+      <UniqueIdentifier>{d64eb426-d57b-4e5d-952a-d671064ac367}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{9af092ac-23f9-4829-aaf8-7409e3196a33}</UniqueIdentifier>
+      <UniqueIdentifier>{fecbd0f0-c4d9-4ee7-be5b-0bc3464e7d7f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{06f76446-a7b0-457b-8e4b-341d222f57ac}</UniqueIdentifier>
+      <UniqueIdentifier>{8996c7c5-1d8b-4182-9e9f-5a924b80a92a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{03e890a9-85f6-4148-bc85-d29640ba1250}</UniqueIdentifier>
+      <UniqueIdentifier>{d60e8f1c-5e41-42ce-88e7-170a1382e0b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{b16bd65c-3280-498f-b7a0-b51525a49971}</UniqueIdentifier>
+      <UniqueIdentifier>{f183c589-cf68-42c3-8d3b-f8e3ee2d67b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9}</UniqueIdentifier>
+      <UniqueIdentifier>{1a8b37ee-b017-4814-a4f8-ef319ba74652}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{14d22125-f7e7-47b8-9334-da6486ee9182}</UniqueIdentifier>
+      <UniqueIdentifier>{7295aed4-2f1e-4ded-96ad-fa5671e2dd64}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{570d80b8-a7cf-4092-9bdd-f74ff73ec221}</UniqueIdentifier>
+      <UniqueIdentifier>{085ff2ee-d571-442e-bf7c-dc4eb5ac15ac}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{9793912a-a80c-4122-8d10-1edb0ea86a09}</UniqueIdentifier>
+      <UniqueIdentifier>{938c575d-a642-448c-aa32-083eec204572}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{b7d7eace-f782-44ad-874d-754aaf8bcd0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{2f17bf3b-a264-4c07-a053-633bbe4112b1}</UniqueIdentifier>
+      <UniqueIdentifier>{0027b55b-96f2-463d-a33a-5b059aada030}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{2d764bf9-ddee-4319-b946-66b87e3e2328}</UniqueIdentifier>
+      <UniqueIdentifier>{f9e85b6e-3b17-499c-b7a1-3bedcebd4a74}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Dynamic\Header Files">
+      <UniqueIdentifier>{f69c020d-4aac-4862-b2ba-b14c91d39546}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -198,15 +201,27 @@
     <ClCompile Include="src\CoreTestSuite.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\FPETest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ListMapTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\MemoryPoolTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -222,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -240,6 +258,9 @@
     <ClCompile Include="src\TypeListTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Base32Test.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Base64Test.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -249,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -294,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -399,6 +426,9 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
@@ -564,38 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Base32Test.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ListMapTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -611,15 +620,30 @@
     <ClInclude Include="src\CoreTestSuite.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryIteratorsTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DynamicAnyTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\FPETest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ListMapTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\MemoryPoolTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -635,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -653,6 +680,9 @@
     <ClInclude Include="src\TypeListTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\Base32Test.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\Base64Test.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -662,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -707,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -812,6 +848,9 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryWatcherTest.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
@@ -974,32 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Base32Test.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ListMapTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryIteratorsTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj b/Foundation/testsuite/TestSuite_vs110.vcxproj
index 65f7490d9d..30ab81808b 100644
--- a/Foundation/testsuite/TestSuite_vs110.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs110.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">
@@ -28,31 +28,32 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
+    <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
@@ -68,48 +69,29 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <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"/>
+  </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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\TestSuite\$(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\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\TestSuite\$(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\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <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>
@@ -117,11 +99,42 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
+    <OutDir>bin\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
+    <OutDir>bin\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <OutDir>bin\static_mt\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+    <OutDir>bin\static_mt\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+    <OutDir>bin\static_md\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+    <OutDir>bin\static_md\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -129,15 +142,16 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -151,7 +165,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -159,54 +173,78 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -216,8 +254,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -225,364 +264,335 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\WinDriver.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\WinDriver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters
index da77db8bd5..4ea12e091e 100644
--- a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{a59b5185-a828-49a5-af23-d86b47d2c19c}</UniqueIdentifier>
+      <UniqueIdentifier>{d297e34c-2985-47e1-aaa8-1c29fece30e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{1e6128ad-7c36-4a4d-ad5c-c604171281c1}</UniqueIdentifier>
+      <UniqueIdentifier>{01f4c751-d7bf-4af3-bab7-d88cdeefda7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{7abaf643-e5e3-4023-bbe8-8b8febe849dd}</UniqueIdentifier>
+      <UniqueIdentifier>{e09bb43f-fb04-4ae3-a75c-ca9ffa7b2736}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{87d01d31-9117-4d34-9d22-7babfd7b7bff}</UniqueIdentifier>
+      <UniqueIdentifier>{f5aedd92-08e7-405f-8f77-708e7304e73e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{f6aad27f-31ed-496c-97ce-9c7d153d166d}</UniqueIdentifier>
+      <UniqueIdentifier>{bcee2561-5484-44d1-b4be-0935a48a73b3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c}</UniqueIdentifier>
+      <UniqueIdentifier>{3ec33223-f3c6-4fac-b5e6-5080f6bf4097}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{0ed8b0f5-8c2f-4c45-b211-e0144659fcb6}</UniqueIdentifier>
+      <UniqueIdentifier>{03192d75-cabe-4eaf-97e9-8175dfea2f8f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{81f46737-5924-42f1-96dd-e809506231bd}</UniqueIdentifier>
+      <UniqueIdentifier>{84cdee18-aa8d-4bb2-b3ff-67498256dcb5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{a0215363-3aef-44fa-b1a5-153f868079dc}</UniqueIdentifier>
+      <UniqueIdentifier>{6259e2b1-5f9b-478b-aed2-f003a94a0899}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{6ed14268-7950-426b-a6c8-b05a86890ab1}</UniqueIdentifier>
+      <UniqueIdentifier>{566b4bdc-13f1-4a68-8257-480245ec92f6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f64b14-f65d-4d7a-809a-29c3792f46b7}</UniqueIdentifier>
+      <UniqueIdentifier>{850bfc6a-fa17-434c-baad-e7ca2ca16bf3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ffbc93f2-916d-43ca-9416-06c87734a668}</UniqueIdentifier>
+      <UniqueIdentifier>{ea7df419-5d19-4a4f-bf36-df333777378c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{32ee8bb2-1b7b-4826-b50d-66e7f90fbe34}</UniqueIdentifier>
+      <UniqueIdentifier>{a4eda950-abda-4bd5-b410-a8a118451cea}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{a8482038-01a5-4790-bd4a-1d857be47fec}</UniqueIdentifier>
+      <UniqueIdentifier>{f52cea45-5653-4ee3-b6d7-7f1f34182ee1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d}</UniqueIdentifier>
+      <UniqueIdentifier>{721382b6-4f4b-4f33-a707-2bd40896989e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{db211c8f-878a-41b0-9e48-53a7bd45b2cd}</UniqueIdentifier>
+      <UniqueIdentifier>{4fe886ec-e680-4b30-9ed1-965bc7a7b03e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0}</UniqueIdentifier>
+      <UniqueIdentifier>{9e86a919-b844-47b9-bfb3-474b4f4d2e89}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{ef5ce424-fc18-4a60-8093-9f1ea328d52d}</UniqueIdentifier>
+      <UniqueIdentifier>{952c3f74-8ee2-4fca-a2d4-79e4bf266e5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{e9794e29-e01f-476a-b5b0-ee65be0c2132}</UniqueIdentifier>
+      <UniqueIdentifier>{d673a8e0-53bc-4354-bad9-b6f6a73b1943}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{59047d4e-bd68-42a9-9309-7e624c42a9b0}</UniqueIdentifier>
+      <UniqueIdentifier>{ff4ac443-599e-4c42-b6ed-089bfca49c3f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{110b921c-f4d4-4f37-bdf3-01a7a2538693}</UniqueIdentifier>
+      <UniqueIdentifier>{5f1c7746-01b0-4571-8257-ac11ca835be7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{665bb14f-e709-4b3b-8ac3-3bf3a94b686f}</UniqueIdentifier>
+      <UniqueIdentifier>{ea0a837c-e888-48d5-903d-980117475c91}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9}</UniqueIdentifier>
+      <UniqueIdentifier>{7ee8c50d-8ee8-4bae-9238-7d584acb4335}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{71886495-7c6c-42c4-8a3e-4d0a93def203}</UniqueIdentifier>
+      <UniqueIdentifier>{8cbfcc1b-586e-424c-a79a-fd75518ebaf7}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{515441cb-c92a-4003-80ae-9cce02ed4c09}</UniqueIdentifier>
+      <UniqueIdentifier>{dc93c68e-2229-4734-9961-9e42b8381add}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{59f2f054-075b-4f91-8434-b9bc6d02f8a9}</UniqueIdentifier>
+      <UniqueIdentifier>{cc56e9bf-60d6-4657-9833-690a349b5553}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{1ad60877-d2c7-4061-8cb9-fd5f220bbc20}</UniqueIdentifier>
+      <UniqueIdentifier>{fa4a167b-b462-43f6-9f24-9b7e44f02633}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{d29fdc4f-a128-4f49-ae88-61ae7f63ffb2}</UniqueIdentifier>
+      <UniqueIdentifier>{855f67c6-419c-4c66-bc07-0adc6f38eb86}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{907687c4-8f5f-4cf3-ae43-6ee1a22571de}</UniqueIdentifier>
+      <UniqueIdentifier>{cb1a778a-c650-4cd8-8bd6-e1a0599a42de}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{5d57a631-556c-4b0c-a417-de68ea3f1aeb}</UniqueIdentifier>
+      <UniqueIdentifier>{7c349214-0088-4b17-91e3-a298fe67d64d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9}</UniqueIdentifier>
+      <UniqueIdentifier>{0d06253c-7104-42d8-a054-7eee84ec5b74}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{ea02acda-0ec0-41b8-8e85-19fbf1b71687}</UniqueIdentifier>
+      <UniqueIdentifier>{213e3747-7417-462c-85f9-f98e3ceee171}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{f0c7bb59-bb71-42fc-8275-aaed17decfb0}</UniqueIdentifier>
+      <UniqueIdentifier>{1e144b32-55e7-4b6d-84bb-bfd16ce29106}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{60844487-77c9-46e6-b54e-39d7c7139ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{671d323f-a97c-400e-b2fa-a7cae0f042a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{28b544d5-54dd-449c-b2c6-62f92ee68f94}</UniqueIdentifier>
+      <UniqueIdentifier>{67527e86-272c-4a16-8a34-c935200fed3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{6f757782-30a7-47bb-b9c1-9197250c52d3}</UniqueIdentifier>
+      <UniqueIdentifier>{925d13c9-9eef-4075-a8d3-bcc07d4eefb4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{40a76071-eda0-455b-a482-b5a37ffd0b9a}</UniqueIdentifier>
+      <UniqueIdentifier>{4dda2086-201c-4116-858f-fce2e1e96b18}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a38b8ef3-6882-4a35-850c-9380db4b7d8b}</UniqueIdentifier>
+      <UniqueIdentifier>{9d524bfc-dee0-4b33-96b5-fc7a94e5f4a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42}</UniqueIdentifier>
+      <UniqueIdentifier>{56fb7df4-da70-43ed-bb72-7df97d884ab1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{128755f3-1063-45aa-b4ad-6f796da5b60c}</UniqueIdentifier>
+      <UniqueIdentifier>{b4806b34-ebfc-4c45-8dd7-71a088af8ca4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{52dde893-fa0a-4f27-8c92-e758a206d626}</UniqueIdentifier>
+      <UniqueIdentifier>{9446adea-83d8-41b0-a071-c0181881d5d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{fee75e70-8621-4511-a6a0-50a32ca0b45b}</UniqueIdentifier>
+      <UniqueIdentifier>{4e0de2f7-eaf9-4382-8ab5-5155c2a9890d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{f89473da-f4fc-4aae-9fa4-2f8c361c06f1}</UniqueIdentifier>
+      <UniqueIdentifier>{1d517128-7e63-40de-ad8a-0114df32858d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{19f29f26-70d7-41d6-a8aa-3bcd7fd7448a}</UniqueIdentifier>
+      <UniqueIdentifier>{4760a4ef-7850-467a-870d-6da7b1d9e12a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{e5121ac0-03cc-416a-a403-1040fdbd6559}</UniqueIdentifier>
+      <UniqueIdentifier>{0e76fb2d-4080-488b-bd9d-7e81550be636}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f}</UniqueIdentifier>
+      <UniqueIdentifier>{2c006f9b-0bdc-4593-9f1a-2c456069ea09}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{7a7cb161-16b5-4b1c-97c3-7cdbf33a4013}</UniqueIdentifier>
+      <UniqueIdentifier>{c3f0bdfe-b7d2-4919-ad74-ff948c959538}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{9378befb-ab93-48c0-9be3-df72edda5370}</UniqueIdentifier>
+      <UniqueIdentifier>{8aea9a60-70cc-4282-a5a8-32f510c80425}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{9af092ac-23f9-4829-aaf8-7409e3196a33}</UniqueIdentifier>
+      <UniqueIdentifier>{06a81f6e-caa3-4aca-9000-0827fd088cdd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{06f76446-a7b0-457b-8e4b-341d222f57ac}</UniqueIdentifier>
+      <UniqueIdentifier>{0856bf31-6eb2-43de-892e-011753e595f2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{03e890a9-85f6-4148-bc85-d29640ba1250}</UniqueIdentifier>
+      <UniqueIdentifier>{6ea1b891-6ae2-4ec5-a079-2e4016e0cc84}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{b16bd65c-3280-498f-b7a0-b51525a49971}</UniqueIdentifier>
+      <UniqueIdentifier>{68dd59f4-afaa-44a5-bcb4-8064e6563bfd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9}</UniqueIdentifier>
+      <UniqueIdentifier>{e8039fba-0978-4867-904b-54967f1ad843}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{14d22125-f7e7-47b8-9334-da6486ee9182}</UniqueIdentifier>
+      <UniqueIdentifier>{ba4cb939-d3ac-4dbc-b7db-a5df8b38c1bd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{570d80b8-a7cf-4092-9bdd-f74ff73ec221}</UniqueIdentifier>
+      <UniqueIdentifier>{810518c2-4d33-4a9b-832a-93247f9bc4a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{9793912a-a80c-4122-8d10-1edb0ea86a09}</UniqueIdentifier>
+      <UniqueIdentifier>{99c2c167-251d-487b-ac29-a902d75a4a25}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{b7d7eace-f782-44ad-874d-754aaf8bcd0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{2f17bf3b-a264-4c07-a053-633bbe4112b1}</UniqueIdentifier>
+      <UniqueIdentifier>{3caff064-062e-4da7-9005-3114ebc4dd46}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{2d764bf9-ddee-4319-b946-66b87e3e2328}</UniqueIdentifier>
+      <UniqueIdentifier>{4f77ebd6-e6c3-44eb-ad1f-fd936eb3a9fe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Dynamic\Header Files">
+      <UniqueIdentifier>{56d77113-7d30-4778-a250-4251375f4ec9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -198,9 +201,18 @@
     <ClCompile Include="src\CoreTestSuite.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -225,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -255,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -300,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -405,10 +426,10 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FilesystemTestSuite.cpp">
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+    <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\FileTest.cpp">
@@ -573,29 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -611,9 +620,21 @@
     <ClInclude Include="src\CoreTestSuite.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryIteratorsTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DynamicAnyTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -638,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -668,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -713,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -818,10 +848,10 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FilesystemTestSuite.h">
+    <ClInclude Include="src\DirectoryWatcherTest.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\DirectoryIteratorsTest.h">
+    <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\FileTest.h">
@@ -983,23 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj
index ff3ed95ba7..b9e08df839 100644
--- a/Foundation/testsuite/TestSuite_vs120.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs120.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -28,88 +28,64 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
+    <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <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"/>
+  </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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\TestSuite\$(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\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\TestSuite\$(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\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <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>
@@ -118,14 +94,41 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
+    <OutDir>bin\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
+    <OutDir>bin\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <OutDir>bin\static_mt\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+    <OutDir>bin\static_mt\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+    <OutDir>bin\static_md\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+    <OutDir>bin\static_md\</OutDir>
+    <IntDir>obj\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -133,22 +136,20 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
@@ -158,7 +159,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -166,71 +167,88 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;PocoFoundationmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -238,373 +256,335 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;PocoFoundationmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;PocoFoundationmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;PocoFoundationmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\Driver.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\Driver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters
index e69b669c57..789031b431 100644
--- a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{a59b5185-a828-49a5-af23-d86b47d2c19c}</UniqueIdentifier>
+      <UniqueIdentifier>{85000ad2-279a-48b2-adbe-9ee7ecb9c460}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{1e6128ad-7c36-4a4d-ad5c-c604171281c1}</UniqueIdentifier>
+      <UniqueIdentifier>{c88c387d-6e4c-44c7-b1f1-f94a29e73e7a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{7abaf643-e5e3-4023-bbe8-8b8febe849dd}</UniqueIdentifier>
+      <UniqueIdentifier>{eb612b41-bd3c-4f9c-8546-42295c25a3e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{87d01d31-9117-4d34-9d22-7babfd7b7bff}</UniqueIdentifier>
+      <UniqueIdentifier>{06a96c64-5df5-40a0-92a4-113fe2c55ad1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{f6aad27f-31ed-496c-97ce-9c7d153d166d}</UniqueIdentifier>
+      <UniqueIdentifier>{57346538-fa49-43b5-961b-b5912bd70506}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c}</UniqueIdentifier>
+      <UniqueIdentifier>{799e8e82-fa89-4960-a600-a8c34cdc5d62}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{0ed8b0f5-8c2f-4c45-b211-e0144659fcb6}</UniqueIdentifier>
+      <UniqueIdentifier>{1c5ff335-eadc-4e99-b845-6488da756516}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{81f46737-5924-42f1-96dd-e809506231bd}</UniqueIdentifier>
+      <UniqueIdentifier>{2e16fd63-7429-4566-a0af-9557ab2a3ba0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{a0215363-3aef-44fa-b1a5-153f868079dc}</UniqueIdentifier>
+      <UniqueIdentifier>{f5d0a863-3f91-47aa-b93c-4629e9b72e88}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{6ed14268-7950-426b-a6c8-b05a86890ab1}</UniqueIdentifier>
+      <UniqueIdentifier>{46abc804-1dd2-4356-88a1-12796a9dd05b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f64b14-f65d-4d7a-809a-29c3792f46b7}</UniqueIdentifier>
+      <UniqueIdentifier>{502b1f5d-d4c7-4f44-b68a-d2ed6f63fa68}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ffbc93f2-916d-43ca-9416-06c87734a668}</UniqueIdentifier>
+      <UniqueIdentifier>{3e3b5463-313c-43e1-abf9-6f73bee102de}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{32ee8bb2-1b7b-4826-b50d-66e7f90fbe34}</UniqueIdentifier>
+      <UniqueIdentifier>{a6f11014-f0c2-401b-a181-be64ac1fbe09}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{a8482038-01a5-4790-bd4a-1d857be47fec}</UniqueIdentifier>
+      <UniqueIdentifier>{eff5511b-8c79-4651-b0da-a58fdf308c91}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d}</UniqueIdentifier>
+      <UniqueIdentifier>{44db368f-ab85-4172-a3e7-b555116f3fe1}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{db211c8f-878a-41b0-9e48-53a7bd45b2cd}</UniqueIdentifier>
+      <UniqueIdentifier>{c58da7b4-4b29-421b-8a7c-9bdfeeb0899f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0}</UniqueIdentifier>
+      <UniqueIdentifier>{4efb56dc-e543-44d5-a78e-e41dd69fef45}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{ef5ce424-fc18-4a60-8093-9f1ea328d52d}</UniqueIdentifier>
+      <UniqueIdentifier>{c0b3a9eb-1bf6-46b5-ab82-248b9812bc3a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{e9794e29-e01f-476a-b5b0-ee65be0c2132}</UniqueIdentifier>
+      <UniqueIdentifier>{0071d41a-dc08-4850-a362-eec80137c913}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{59047d4e-bd68-42a9-9309-7e624c42a9b0}</UniqueIdentifier>
+      <UniqueIdentifier>{6e1d3a14-42a2-4bb0-9e46-d42023915796}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{110b921c-f4d4-4f37-bdf3-01a7a2538693}</UniqueIdentifier>
+      <UniqueIdentifier>{14afe118-dcfe-443f-abe7-e941e94bf01b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{665bb14f-e709-4b3b-8ac3-3bf3a94b686f}</UniqueIdentifier>
+      <UniqueIdentifier>{f29dfd51-53a6-48d6-9d21-6b2c057f56ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9}</UniqueIdentifier>
+      <UniqueIdentifier>{e88efcfa-04bc-4d6d-854e-32d0c74d11e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{71886495-7c6c-42c4-8a3e-4d0a93def203}</UniqueIdentifier>
+      <UniqueIdentifier>{594d6d92-0612-4775-8fb0-f0f633dc0a15}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{515441cb-c92a-4003-80ae-9cce02ed4c09}</UniqueIdentifier>
+      <UniqueIdentifier>{d7fa8712-bfbd-402b-90a8-a0dce78477ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{59f2f054-075b-4f91-8434-b9bc6d02f8a9}</UniqueIdentifier>
+      <UniqueIdentifier>{e75accbd-181d-45bf-b604-5d1fea94441f}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{1ad60877-d2c7-4061-8cb9-fd5f220bbc20}</UniqueIdentifier>
+      <UniqueIdentifier>{52c71d79-9636-4e9c-979a-3c47d315431c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{d29fdc4f-a128-4f49-ae88-61ae7f63ffb2}</UniqueIdentifier>
+      <UniqueIdentifier>{da4030a1-ae92-4c23-9fdc-3ae6d7437844}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{907687c4-8f5f-4cf3-ae43-6ee1a22571de}</UniqueIdentifier>
+      <UniqueIdentifier>{6ea95469-61d4-466d-ba62-c349b37c8455}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{5d57a631-556c-4b0c-a417-de68ea3f1aeb}</UniqueIdentifier>
+      <UniqueIdentifier>{a41dcd0f-c972-4cdc-8591-999c04cea72b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9}</UniqueIdentifier>
+      <UniqueIdentifier>{417e21bc-eb4d-480d-b28c-123426a15ba6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{ea02acda-0ec0-41b8-8e85-19fbf1b71687}</UniqueIdentifier>
+      <UniqueIdentifier>{e8e3d2ce-642f-4d58-89af-5492d47e6074}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{f0c7bb59-bb71-42fc-8275-aaed17decfb0}</UniqueIdentifier>
+      <UniqueIdentifier>{6a2d4106-2705-46e2-92a3-901457e09797}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{60844487-77c9-46e6-b54e-39d7c7139ec3}</UniqueIdentifier>
+      <UniqueIdentifier>{1d1d4d66-8586-4b4e-966f-431783f73ac8}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{28b544d5-54dd-449c-b2c6-62f92ee68f94}</UniqueIdentifier>
+      <UniqueIdentifier>{f93bbb17-ebce-43e7-a370-99d052f7dc5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{6f757782-30a7-47bb-b9c1-9197250c52d3}</UniqueIdentifier>
+      <UniqueIdentifier>{eb079304-e834-482d-8e47-dc574a9c5190}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{40a76071-eda0-455b-a482-b5a37ffd0b9a}</UniqueIdentifier>
+      <UniqueIdentifier>{d2db1ee1-d19d-4a38-96a3-0f0b0ddaaf4d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a38b8ef3-6882-4a35-850c-9380db4b7d8b}</UniqueIdentifier>
+      <UniqueIdentifier>{7ffac473-3923-4b7b-b735-4bede954ce7f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42}</UniqueIdentifier>
+      <UniqueIdentifier>{8f56117c-19cd-463e-84ef-dcecf62bbbe0}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{128755f3-1063-45aa-b4ad-6f796da5b60c}</UniqueIdentifier>
+      <UniqueIdentifier>{a96cd528-3372-437d-bebc-14c3ee67f1eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{52dde893-fa0a-4f27-8c92-e758a206d626}</UniqueIdentifier>
+      <UniqueIdentifier>{cca2740a-df03-40b8-a98f-da7dbac89ac6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{fee75e70-8621-4511-a6a0-50a32ca0b45b}</UniqueIdentifier>
+      <UniqueIdentifier>{475e533d-7bb8-43f2-9652-3a9813330f66}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{f89473da-f4fc-4aae-9fa4-2f8c361c06f1}</UniqueIdentifier>
+      <UniqueIdentifier>{732a8fdc-3c05-4a68-9441-89bcf4ab1693}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{19f29f26-70d7-41d6-a8aa-3bcd7fd7448a}</UniqueIdentifier>
+      <UniqueIdentifier>{72759a7b-a0a9-4cd2-9bf4-973ac2178ab1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{e5121ac0-03cc-416a-a403-1040fdbd6559}</UniqueIdentifier>
+      <UniqueIdentifier>{7d79c1e2-1c5e-49ba-8432-286a6f09aed0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f}</UniqueIdentifier>
+      <UniqueIdentifier>{5516c81c-3822-4f9a-a64e-0a845b6ee693}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{7a7cb161-16b5-4b1c-97c3-7cdbf33a4013}</UniqueIdentifier>
+      <UniqueIdentifier>{99149ab0-d450-4281-9969-23e777770cda}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{9378befb-ab93-48c0-9be3-df72edda5370}</UniqueIdentifier>
+      <UniqueIdentifier>{db0f635c-7569-4913-b6d0-c0d34195c574}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{9af092ac-23f9-4829-aaf8-7409e3196a33}</UniqueIdentifier>
+      <UniqueIdentifier>{fd306bc3-78de-48f2-a605-5d22217afdb9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{06f76446-a7b0-457b-8e4b-341d222f57ac}</UniqueIdentifier>
+      <UniqueIdentifier>{4f157861-9345-4f75-abeb-6c25175f6e3b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{03e890a9-85f6-4148-bc85-d29640ba1250}</UniqueIdentifier>
+      <UniqueIdentifier>{77072a9e-eb3e-436f-8458-8f904bd0bb2e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{b16bd65c-3280-498f-b7a0-b51525a49971}</UniqueIdentifier>
+      <UniqueIdentifier>{bb7483b2-1e34-4a5b-8173-35d25f0d086f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9}</UniqueIdentifier>
+      <UniqueIdentifier>{f7825b15-d767-4977-a5be-eb9186e691b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{14d22125-f7e7-47b8-9334-da6486ee9182}</UniqueIdentifier>
+      <UniqueIdentifier>{9dc6a5e7-3bb4-40cc-b417-0438b1a5e681}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{570d80b8-a7cf-4092-9bdd-f74ff73ec221}</UniqueIdentifier>
+      <UniqueIdentifier>{26ca8a82-a4d3-4c66-bb69-258497b10ca2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{9793912a-a80c-4122-8d10-1edb0ea86a09}</UniqueIdentifier>
+      <UniqueIdentifier>{890b96ed-4921-460a-ab09-ec42f511a51d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{b7d7eace-f782-44ad-874d-754aaf8bcd0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{2f17bf3b-a264-4c07-a053-633bbe4112b1}</UniqueIdentifier>
+      <UniqueIdentifier>{d8f65461-08f8-46bf-a5fd-e4488d965b26}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{2d764bf9-ddee-4319-b946-66b87e3e2328}</UniqueIdentifier>
+      <UniqueIdentifier>{51b7fbd1-e881-4302-b132-8edcb1985055}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Dynamic\Header Files">
+      <UniqueIdentifier>{7574ea6a-81ae-4cd8-ae6d-74f890c8b11d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -198,9 +201,18 @@
     <ClCompile Include="src\CoreTestSuite.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -225,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -255,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -300,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -405,10 +426,10 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FilesystemTestSuite.cpp">
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+    <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\FileTest.cpp">
@@ -495,6 +516,9 @@
     <ClCompile Include="src\FoundationTestSuite.cpp">
       <Filter>_Suite\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Driver.cpp">
+      <Filter>_Driver\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NamedEventTest.cpp">
       <Filter>Processes\Source Files</Filter>
     </ClCompile>
@@ -570,32 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Driver.cpp">
-      <Filter>_Driver\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -611,9 +620,21 @@
     <ClInclude Include="src\CoreTestSuite.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryIteratorsTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DynamicAnyTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -638,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -668,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -713,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -818,10 +848,10 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FilesystemTestSuite.h">
+    <ClInclude Include="src\DirectoryWatcherTest.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\DirectoryIteratorsTest.h">
+    <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\FileTest.h">
@@ -983,23 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_vs90.vcproj b/Foundation/testsuite/TestSuite_vs90.vcproj
index 9a3bae84c4..05e5ec3716 100644
--- a/Foundation/testsuite/TestSuite_vs90.vcproj
+++ b/Foundation/testsuite/TestSuite_vs90.vcproj
@@ -573,6 +573,14 @@
 					RelativePath=".\src\DynamicFactoryTest.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTestSuite.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\FormatTest.cpp"
 					>
@@ -677,6 +685,14 @@
 					RelativePath=".\src\DynamicFactoryTest.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTest.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTestSuite.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\FormatTest.h"
 					>
diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj
index f6ea4593e3..5f7c680686 100644
--- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_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|x64">
@@ -28,28 +28,29 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
+    <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
@@ -62,28 +63,27 @@
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">bin64\</OutDir>
@@ -92,18 +92,18 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">bin64\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">bin64\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">bin64\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">bin64\static_mt\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">bin64\static_mt\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">bin64\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">bin64\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -114,8 +114,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -123,19 +124,23 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
@@ -145,73 +150,107 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -219,365 +258,341 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\WinDriver.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\WinDriver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicAnyTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
index 95fa60b222..a77566568c 100644
--- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{61761bcd-174d-44c0-a1da-09a3c0fbf3b9}</UniqueIdentifier>
+      <UniqueIdentifier>{96ee468e-e90d-4f90-9076-fec9b36e5188}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{a4ffaebf-880e-42a1-926a-a34c1d8cfcd7}</UniqueIdentifier>
+      <UniqueIdentifier>{1a2c285c-71de-48bc-b047-5f491ba7fa95}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{5a4f6520-cf4d-4251-b13a-3a686198ae50}</UniqueIdentifier>
+      <UniqueIdentifier>{420d7b22-cfbe-467f-8a6e-7dbc385d86b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{dbcab07d-4ac6-4770-a2b7-e30117e9026a}</UniqueIdentifier>
+      <UniqueIdentifier>{c30ac33c-d4fb-4c31-8a22-9eaa9a4c0ee0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{d341facd-6c2b-4406-8952-84cee2ff921c}</UniqueIdentifier>
+      <UniqueIdentifier>{11d41afd-2c03-4efc-973c-1f558e9843e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{cbdd7506-5701-4cd7-aafa-6239e9338154}</UniqueIdentifier>
+      <UniqueIdentifier>{027573c4-61a9-4019-b9da-cd0fe240eaf0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{7c1fea8f-9e19-4775-ad45-52514212eaa5}</UniqueIdentifier>
+      <UniqueIdentifier>{9b3e4373-0b2c-4c10-afd9-a34cc9141309}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{45ddfc2d-41dd-4ec3-b1fe-68badc9dc053}</UniqueIdentifier>
+      <UniqueIdentifier>{64eaf820-1fa3-4342-982d-0adebca55f87}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{41f6221c-287f-4095-8d68-bf7d43d57986}</UniqueIdentifier>
+      <UniqueIdentifier>{0e65e402-be03-4917-9df5-8bfacdbf6931}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{5206216b-93f1-4d4b-9bd3-2e569fd14c35}</UniqueIdentifier>
+      <UniqueIdentifier>{68912887-e76d-42da-9fca-561ac7c8204f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f8ec3a-9632-49c0-a73f-8d64bbbe554a}</UniqueIdentifier>
+      <UniqueIdentifier>{04666571-61c8-42fa-99ec-8f0fd0f1afb5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{3658231d-8f2d-40ec-982f-a819f16e14ef}</UniqueIdentifier>
+      <UniqueIdentifier>{50069107-7a36-4197-9b4d-a69d77f9bf55}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{66b741e5-c5d7-4918-b5d9-f7e123541fcc}</UniqueIdentifier>
+      <UniqueIdentifier>{88217353-3d2b-4a58-ab10-5692d026d5e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{90b4814d-e820-4e7e-9478-e3b1a8b29425}</UniqueIdentifier>
+      <UniqueIdentifier>{d4a9304d-2d1d-47e3-9c19-aa64bea39afd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{db7fa0c6-ead3-4c4f-a183-c35ced9c94e2}</UniqueIdentifier>
+      <UniqueIdentifier>{5efa62f9-bbd7-4ff3-a7cc-39b274e4bf09}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{3e366905-3992-407b-8490-26bf9683b753}</UniqueIdentifier>
+      <UniqueIdentifier>{253a932a-dcd1-4006-939b-babe5ed3d794}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{8230d159-b383-46e6-9343-c5994eeb0023}</UniqueIdentifier>
+      <UniqueIdentifier>{a10d7680-8308-48fa-ae19-a1be74d57ac1}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{98980fff-4121-45a6-abbe-44f9decca606}</UniqueIdentifier>
+      <UniqueIdentifier>{031b0dc8-1f8a-4a9f-ba4b-96b51563d428}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{b1055477-4a46-4f4d-9bd9-dc62158af7eb}</UniqueIdentifier>
+      <UniqueIdentifier>{a38f35a8-c64b-4612-af53-e12932272fdb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{3740e219-0bf8-488c-8a6a-e41f0c7f7084}</UniqueIdentifier>
+      <UniqueIdentifier>{817f0f04-60da-4430-bcf8-b0f14a96c1d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{b60a9646-1ae9-4f3a-9f56-5fdf2966be4a}</UniqueIdentifier>
+      <UniqueIdentifier>{799d41c9-75c1-4bea-ab1d-264c5ac6fa06}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{20c8773e-2f4a-4ae8-82b8-e43b2af181b2}</UniqueIdentifier>
+      <UniqueIdentifier>{05a9662e-b48f-421a-ae5b-04e21aefa512}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{120e0d1a-fd1f-4676-a6a4-60bd0a092353}</UniqueIdentifier>
+      <UniqueIdentifier>{5cea484d-10e7-4f27-821a-a190fd5ab775}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{6c7e9ef2-8efb-4fd9-b8c9-426816ae09dc}</UniqueIdentifier>
+      <UniqueIdentifier>{abf15315-1f0e-4487-824c-f38dad0cfcc2}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{57dd2c28-dc2c-4d4a-8ac3-06d6cc28f628}</UniqueIdentifier>
+      <UniqueIdentifier>{6f9cd567-8bb4-4622-ad04-2dc0de448897}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{ff262ea5-7e9b-46a9-a78c-71cd456df4de}</UniqueIdentifier>
+      <UniqueIdentifier>{08c30f8c-aaa8-4e65-aaf3-30789f6af14d}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{5c8f9e34-d180-4044-8426-9a9a80ab9c16}</UniqueIdentifier>
+      <UniqueIdentifier>{8fa166a6-d916-46ec-b9f9-56ca297b02e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{a14ac415-611f-406d-975a-587107bd148e}</UniqueIdentifier>
+      <UniqueIdentifier>{afb62a6c-0454-444a-ab92-47b9f1dcbefe}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{5444d0b1-31a5-45f6-91fb-b10fa497f9d7}</UniqueIdentifier>
+      <UniqueIdentifier>{28eef33b-67fd-461e-b36e-5deeaa270f8f}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{b0970c59-85a1-493e-8bd7-a8d4b3d73479}</UniqueIdentifier>
+      <UniqueIdentifier>{ead1d993-c071-434d-a2f4-614d7bf5b3b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{c09a0d17-1c4c-41bf-bb88-1affba28cc9f}</UniqueIdentifier>
+      <UniqueIdentifier>{d19cb28d-e977-4d29-bcd7-6356755cad70}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{a313536b-447f-411b-8812-d317b6ccbed7}</UniqueIdentifier>
+      <UniqueIdentifier>{5ead5f15-f3f2-454d-8e90-2b921ed2c38b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{4b333bdb-c5b6-4a74-8802-17eb7ebe96ae}</UniqueIdentifier>
+      <UniqueIdentifier>{58f81e2d-cd4f-4569-9536-c33240143e1a}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{b93abf82-5fe8-4f89-afd0-d509104a3c15}</UniqueIdentifier>
+      <UniqueIdentifier>{7086ba4e-245d-47d9-8d55-3588bdca1547}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{1998a2d4-8c6b-45f9-a986-43361e74c95f}</UniqueIdentifier>
+      <UniqueIdentifier>{d5169f76-8433-49b1-804c-b2a14dea06cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{23262db9-954d-4d00-89ad-e83fa36ce0f5}</UniqueIdentifier>
+      <UniqueIdentifier>{82ff8d8e-963f-424c-8120-514294ee5f5d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{e7b43808-e473-41f5-ab75-74fe4e94c064}</UniqueIdentifier>
+      <UniqueIdentifier>{d4572597-8b72-4d42-a657-978540a9e671}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{f0c7e064-edba-4de8-a3f4-81bf3bc63440}</UniqueIdentifier>
+      <UniqueIdentifier>{41bbfd19-58d5-4532-a5f1-f8552ceea5e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{276cd6b2-6fcb-48d5-ab6a-e5d26586e77b}</UniqueIdentifier>
+      <UniqueIdentifier>{98a31cdd-4f38-4c0b-b698-59932fd265cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{8d108b96-f5ff-48e0-bd6a-68d8bbc709d8}</UniqueIdentifier>
+      <UniqueIdentifier>{ff8cb779-ca64-4299-9a7a-9bc1e7dd3f75}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{c0434fd2-8b90-415d-9ee0-f8b0d8f798bf}</UniqueIdentifier>
+      <UniqueIdentifier>{a821cc9e-41b5-442b-9d3d-4b5e67aa9042}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{4fae28d6-ef01-4587-b717-bf048c803d93}</UniqueIdentifier>
+      <UniqueIdentifier>{df5b7804-d8ec-4e53-b80d-a23f58c193b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{7c1f0e20-c68e-41d0-86a1-3f34951f3e1f}</UniqueIdentifier>
+      <UniqueIdentifier>{784f3c45-f479-47dc-839e-0ea265593e60}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{e6357d2f-1c39-4c9e-b3c4-5118be69ad0f}</UniqueIdentifier>
+      <UniqueIdentifier>{c40edf10-544f-4009-8014-2af1728c2d5a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{aaf605d7-11e6-4aab-bc57-ddd5e65ad44c}</UniqueIdentifier>
+      <UniqueIdentifier>{fcefbadc-afdb-4df7-bf4b-750ed9376008}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{559701bf-59bd-46f9-ad12-ba7aec09600f}</UniqueIdentifier>
+      <UniqueIdentifier>{2d743c21-d77c-4bce-a9a2-97cb50d297db}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{f0ed8757-4994-4627-b76b-4c3367476137}</UniqueIdentifier>
+      <UniqueIdentifier>{818b1d43-27f4-44b5-985b-b4e985855871}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{93d2c47c-068b-4866-a654-7309b68ccc38}</UniqueIdentifier>
+      <UniqueIdentifier>{7a5d6ed9-ff10-41e7-9379-aa5431d7cfdd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{57405867-eeac-4bf4-8bdf-9b614f02b562}</UniqueIdentifier>
+      <UniqueIdentifier>{4a60752e-22a1-443d-ba6f-328635bf5bc2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{4bd2879b-4e23-446c-95c9-1a1628774c45}</UniqueIdentifier>
+      <UniqueIdentifier>{ae846312-7b17-4f90-ab7a-9a13febf5dd6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{08de05ff-958a-4146-bafe-8c38c6ee1a76}</UniqueIdentifier>
+      <UniqueIdentifier>{47f59d76-5f95-4732-893a-aa59513a5e3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{fad494e5-26da-4b47-8f4e-81aa0c19e0f7}</UniqueIdentifier>
+      <UniqueIdentifier>{eb64606a-0968-40cb-b83d-4c9991cba468}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{cf174669-73a2-4f48-8bbb-ec5ea1c09f4b}</UniqueIdentifier>
+      <UniqueIdentifier>{b46bb62d-d91d-4a89-9c39-950e43f14186}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{4c661a1b-1281-42e9-bfd8-f86d3e7d4daf}</UniqueIdentifier>
+      <UniqueIdentifier>{b99d1bc4-0f25-4267-aa37-615253870109}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{a1adc868-69d4-4d26-a361-238b35a6cf93}</UniqueIdentifier>
+      <UniqueIdentifier>{7cd977fe-e5f3-4a20-bbbd-a837886993ea}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{009defb4-dc35-4ac4-88aa-5b9cd342110b}</UniqueIdentifier>
+      <UniqueIdentifier>{ef9601b2-59c5-48b7-8d68-7bbc6d1ce519}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{2d58ce37-9daa-4359-a602-06de87c1d4eb}</UniqueIdentifier>
+      <UniqueIdentifier>{b4740f6b-58b6-464f-9e05-d9caa2b3c8c3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{896a3ce9-b004-4ea8-aa48-ab1b4db9d863}</UniqueIdentifier>
+      <UniqueIdentifier>{2b86ca52-8f96-44e3-a4c1-f9af554535cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{a38a83b0-a188-4e99-b3a9-37453c6a9559}</UniqueIdentifier>
+      <UniqueIdentifier>{96cdae87-a733-4574-85d9-9c30611748ba}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -204,6 +207,12 @@
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -228,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -258,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -303,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -408,6 +426,9 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
@@ -573,29 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -620,6 +629,12 @@
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -644,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -674,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -719,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -824,6 +848,9 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryWatcherTest.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
@@ -986,23 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj
index 8180406477..5675b25693 100644
--- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_vs110.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|x64">
@@ -28,31 +28,32 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
+    <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
@@ -68,48 +69,29 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">bin64\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">bin64\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">bin64\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">bin64\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">false</LinkIncremental>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -117,11 +99,42 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
+    <OutDir>bin64\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
+    <OutDir>bin64\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+    <OutDir>bin64\static_mt\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+    <OutDir>bin64\static_mt\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
+    <OutDir>bin64\static_md\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+    <OutDir>bin64\static_md\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -129,15 +142,16 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -151,7 +165,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -159,54 +173,78 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -216,8 +254,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -225,365 +264,335 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\WinDriver.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\WinDriver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicAnyTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
index e93991ff35..de36f1c8c6 100644
--- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{61761bcd-174d-44c0-a1da-09a3c0fbf3b9}</UniqueIdentifier>
+      <UniqueIdentifier>{cecb56fa-511f-41ac-9973-59cf2c3f39d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{a4ffaebf-880e-42a1-926a-a34c1d8cfcd7}</UniqueIdentifier>
+      <UniqueIdentifier>{05617e0d-0336-4230-8de4-c9662986bb8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{5a4f6520-cf4d-4251-b13a-3a686198ae50}</UniqueIdentifier>
+      <UniqueIdentifier>{ae229fe4-d3a3-4b2a-903d-e687b020fb9a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{dbcab07d-4ac6-4770-a2b7-e30117e9026a}</UniqueIdentifier>
+      <UniqueIdentifier>{94f72017-f41f-4eea-94c9-98badef09362}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{d341facd-6c2b-4406-8952-84cee2ff921c}</UniqueIdentifier>
+      <UniqueIdentifier>{4064bd2c-4e61-420a-90d6-922f49ed7897}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{cbdd7506-5701-4cd7-aafa-6239e9338154}</UniqueIdentifier>
+      <UniqueIdentifier>{300e564c-c43f-4c2d-a3f5-30189245807d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{7c1fea8f-9e19-4775-ad45-52514212eaa5}</UniqueIdentifier>
+      <UniqueIdentifier>{776d6913-ace6-4d88-adc3-6881d3642dbb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{45ddfc2d-41dd-4ec3-b1fe-68badc9dc053}</UniqueIdentifier>
+      <UniqueIdentifier>{e1d88438-c4c8-4443-a4f1-4f9302f285c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{41f6221c-287f-4095-8d68-bf7d43d57986}</UniqueIdentifier>
+      <UniqueIdentifier>{5e4444ff-e300-464f-bef2-ebcc349521fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{5206216b-93f1-4d4b-9bd3-2e569fd14c35}</UniqueIdentifier>
+      <UniqueIdentifier>{e0166080-a714-4b59-b99e-c5ce58227626}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f8ec3a-9632-49c0-a73f-8d64bbbe554a}</UniqueIdentifier>
+      <UniqueIdentifier>{0f7377a2-9be5-45ad-918a-397247bb2d5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{3658231d-8f2d-40ec-982f-a819f16e14ef}</UniqueIdentifier>
+      <UniqueIdentifier>{76af6edb-56e1-48d1-a41c-d2e9a3304016}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{66b741e5-c5d7-4918-b5d9-f7e123541fcc}</UniqueIdentifier>
+      <UniqueIdentifier>{d5e174c3-8c4d-4086-b42c-9bc918ee05b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{90b4814d-e820-4e7e-9478-e3b1a8b29425}</UniqueIdentifier>
+      <UniqueIdentifier>{17dbba6f-52e2-41e5-86fb-b6643ae37575}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{db7fa0c6-ead3-4c4f-a183-c35ced9c94e2}</UniqueIdentifier>
+      <UniqueIdentifier>{1e999464-22d5-48fb-a2a2-321da2d5a703}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{3e366905-3992-407b-8490-26bf9683b753}</UniqueIdentifier>
+      <UniqueIdentifier>{19d9c7f6-519a-46dd-833f-c668df810771}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{8230d159-b383-46e6-9343-c5994eeb0023}</UniqueIdentifier>
+      <UniqueIdentifier>{340959f5-6cc7-4fa5-9ed6-91e0a5ce07f6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{98980fff-4121-45a6-abbe-44f9decca606}</UniqueIdentifier>
+      <UniqueIdentifier>{e436b959-b95a-4428-8511-bdbd61bc58ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{b1055477-4a46-4f4d-9bd9-dc62158af7eb}</UniqueIdentifier>
+      <UniqueIdentifier>{4f462777-f7bd-4226-b56a-42009b7c71dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{3740e219-0bf8-488c-8a6a-e41f0c7f7084}</UniqueIdentifier>
+      <UniqueIdentifier>{0da8f594-4d59-4888-a642-6793861490b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{b60a9646-1ae9-4f3a-9f56-5fdf2966be4a}</UniqueIdentifier>
+      <UniqueIdentifier>{b798347b-ac47-4d96-9dca-903641e08d03}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{20c8773e-2f4a-4ae8-82b8-e43b2af181b2}</UniqueIdentifier>
+      <UniqueIdentifier>{edf85b66-a551-4a94-becf-6f3ef970ffc9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{120e0d1a-fd1f-4676-a6a4-60bd0a092353}</UniqueIdentifier>
+      <UniqueIdentifier>{023c5f2b-f0e3-482f-b898-2ba02e25c04e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{6c7e9ef2-8efb-4fd9-b8c9-426816ae09dc}</UniqueIdentifier>
+      <UniqueIdentifier>{ad7d24ad-7be6-4f2e-a470-b98abd24a447}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{57dd2c28-dc2c-4d4a-8ac3-06d6cc28f628}</UniqueIdentifier>
+      <UniqueIdentifier>{ad60da9e-eca4-4f73-97c1-27daf9a4301d}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{ff262ea5-7e9b-46a9-a78c-71cd456df4de}</UniqueIdentifier>
+      <UniqueIdentifier>{e0906163-64a5-4cc4-b57d-4e0b6ffe810c}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{5c8f9e34-d180-4044-8426-9a9a80ab9c16}</UniqueIdentifier>
+      <UniqueIdentifier>{9057773b-1623-4748-93d0-a8598e731c35}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{a14ac415-611f-406d-975a-587107bd148e}</UniqueIdentifier>
+      <UniqueIdentifier>{ab518b40-6d9a-420e-91bf-d8173ca6ee6d}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{5444d0b1-31a5-45f6-91fb-b10fa497f9d7}</UniqueIdentifier>
+      <UniqueIdentifier>{4d9d2d19-a655-4345-9349-8d57f3f81269}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{b0970c59-85a1-493e-8bd7-a8d4b3d73479}</UniqueIdentifier>
+      <UniqueIdentifier>{7e7e9073-758c-42a9-beb1-e5bafce5013b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{c09a0d17-1c4c-41bf-bb88-1affba28cc9f}</UniqueIdentifier>
+      <UniqueIdentifier>{8bb6b30d-bf58-4307-b9ff-508534ec706c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{a313536b-447f-411b-8812-d317b6ccbed7}</UniqueIdentifier>
+      <UniqueIdentifier>{b3606d4b-14a0-4aa0-ba91-1375bdb5b305}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{4b333bdb-c5b6-4a74-8802-17eb7ebe96ae}</UniqueIdentifier>
+      <UniqueIdentifier>{4c89bfe7-282c-4651-a337-9ff8c125ff56}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{b93abf82-5fe8-4f89-afd0-d509104a3c15}</UniqueIdentifier>
+      <UniqueIdentifier>{b54c51d7-5743-47ba-8bd6-e1f3fe6bdeb0}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{1998a2d4-8c6b-45f9-a986-43361e74c95f}</UniqueIdentifier>
+      <UniqueIdentifier>{95743e1b-e68e-469c-8413-2b493e12e58a}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{23262db9-954d-4d00-89ad-e83fa36ce0f5}</UniqueIdentifier>
+      <UniqueIdentifier>{3b42eda6-4378-40b0-8488-1c9c2ff8927e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{e7b43808-e473-41f5-ab75-74fe4e94c064}</UniqueIdentifier>
+      <UniqueIdentifier>{0be90184-6d12-4297-8003-dd76ed9c6314}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{f0c7e064-edba-4de8-a3f4-81bf3bc63440}</UniqueIdentifier>
+      <UniqueIdentifier>{85dcd541-4d94-4631-a0d2-2cafdb44aea3}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{276cd6b2-6fcb-48d5-ab6a-e5d26586e77b}</UniqueIdentifier>
+      <UniqueIdentifier>{32bec252-ffd1-4e8b-b3ff-7b5eb1875ee5}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{8d108b96-f5ff-48e0-bd6a-68d8bbc709d8}</UniqueIdentifier>
+      <UniqueIdentifier>{d87bb541-8cb3-4c5e-a521-b017e4b0344c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{c0434fd2-8b90-415d-9ee0-f8b0d8f798bf}</UniqueIdentifier>
+      <UniqueIdentifier>{58be13b5-55c8-4f12-867c-d1957aff2c0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{4fae28d6-ef01-4587-b717-bf048c803d93}</UniqueIdentifier>
+      <UniqueIdentifier>{d0a2128c-7eca-40a0-8a32-5a39e75e1833}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{7c1f0e20-c68e-41d0-86a1-3f34951f3e1f}</UniqueIdentifier>
+      <UniqueIdentifier>{540a8a02-ddee-4f7c-b4f2-2daa969b1061}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{e6357d2f-1c39-4c9e-b3c4-5118be69ad0f}</UniqueIdentifier>
+      <UniqueIdentifier>{913e84e8-d89f-4256-99c6-89d25d1fc804}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{aaf605d7-11e6-4aab-bc57-ddd5e65ad44c}</UniqueIdentifier>
+      <UniqueIdentifier>{b16b0096-8608-42c7-adff-1e37fa39b315}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{559701bf-59bd-46f9-ad12-ba7aec09600f}</UniqueIdentifier>
+      <UniqueIdentifier>{016a5097-0560-4cc3-be8e-b58dcb0ef812}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{f0ed8757-4994-4627-b76b-4c3367476137}</UniqueIdentifier>
+      <UniqueIdentifier>{6f422809-c68d-4481-9fe7-fb7b81043d1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{93d2c47c-068b-4866-a654-7309b68ccc38}</UniqueIdentifier>
+      <UniqueIdentifier>{57a8e134-53f8-428f-b400-c6e1ed6758fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{57405867-eeac-4bf4-8bdf-9b614f02b562}</UniqueIdentifier>
+      <UniqueIdentifier>{954b89b3-3058-4d51-ad29-475115d3d35c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{4bd2879b-4e23-446c-95c9-1a1628774c45}</UniqueIdentifier>
+      <UniqueIdentifier>{e7a7cad6-9384-41f9-b6ed-92125741ead9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{08de05ff-958a-4146-bafe-8c38c6ee1a76}</UniqueIdentifier>
+      <UniqueIdentifier>{c7887cd0-f2c2-4aee-82b1-6d55d68bc350}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{fad494e5-26da-4b47-8f4e-81aa0c19e0f7}</UniqueIdentifier>
+      <UniqueIdentifier>{b4f07c2c-30f3-43e1-a9dc-839f5268dcb6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{cf174669-73a2-4f48-8bbb-ec5ea1c09f4b}</UniqueIdentifier>
+      <UniqueIdentifier>{8076cd1c-8172-47a7-a0f3-1fb00cd5c750}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{4c661a1b-1281-42e9-bfd8-f86d3e7d4daf}</UniqueIdentifier>
+      <UniqueIdentifier>{799064a7-fb76-4c59-9373-5265da80326a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{a1adc868-69d4-4d26-a361-238b35a6cf93}</UniqueIdentifier>
+      <UniqueIdentifier>{76ed377a-9849-4609-8f3a-4287d24c57d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{009defb4-dc35-4ac4-88aa-5b9cd342110b}</UniqueIdentifier>
+      <UniqueIdentifier>{9e1fbabf-b2b3-49ff-a734-3ba0329c5efc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{2d58ce37-9daa-4359-a602-06de87c1d4eb}</UniqueIdentifier>
+      <UniqueIdentifier>{8366a632-1b32-4035-95f5-57184a393955}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{896a3ce9-b004-4ea8-aa48-ab1b4db9d863}</UniqueIdentifier>
+      <UniqueIdentifier>{e9ba73ed-4974-440c-987a-07e64ce2e60f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{a38a83b0-a188-4e99-b3a9-37453c6a9559}</UniqueIdentifier>
+      <UniqueIdentifier>{d27cc925-c5b3-4924-8321-a5b2c5971ddc}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -198,9 +201,18 @@
     <ClCompile Include="src\CoreTestSuite.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -225,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -255,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -300,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -405,10 +426,10 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FilesystemTestSuite.cpp">
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+    <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\FileTest.cpp">
@@ -573,29 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -611,12 +620,21 @@
     <ClInclude Include="src\CoreTestSuite.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryIteratorsTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\DynamicAnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -641,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -671,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -716,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -821,10 +848,10 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FilesystemTestSuite.h">
+    <ClInclude Include="src\DirectoryWatcherTest.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\DirectoryIteratorsTest.h">
+    <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\FileTest.h">
@@ -986,23 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj
index 53f837a6e9..7b1596b0d7 100644
--- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|x64">
@@ -28,88 +28,64 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <ProjectGuid>{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}</ProjectGuid>
+    <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">bin64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">bin64\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">bin64\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">bin64\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">bin64\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">false</LinkIncremental>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -117,11 +93,42 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
+    <OutDir>bin64\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
+    <OutDir>bin64\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+    <OutDir>bin64\static_mt\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+    <OutDir>bin64\static_mt\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
+    <OutDir>bin64\static_md\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+    <OutDir>bin64\static_md\</OutDir>
+    <IntDir>obj64\TestSuite\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -129,16 +136,16 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -152,7 +159,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -160,56 +167,76 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader/>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;PocoFoundationmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -219,8 +246,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -228,368 +256,335 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;PocoFoundationmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;PocoFoundationmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader/>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <AdditionalOptions>/FS</AdditionalOptions>
+      <DebugInformationFormat/>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;PocoFoundationmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\ArrayTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp" />
-    <ClCompile Include="src\DirectoryWatcherTest.cpp" />
-    <ClCompile Include="src\Driver.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\ListMapTest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\ObjectPoolTest.cpp" />
-    <ClCompile Include="src\PBKDF2EngineTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base32Test.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\VarTest.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\MutexTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\ClockTest.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
+    <ClCompile Include="src\AnyTest.cpp"/>
+    <ClCompile Include="src\ArrayTest.cpp"/>
+    <ClCompile Include="src\AutoPtrTest.cpp"/>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp"/>
+    <ClCompile Include="src\ByteOrderTest.cpp"/>
+    <ClCompile Include="src\CoreTest.cpp"/>
+    <ClCompile Include="src\CoreTestSuite.cpp"/>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp"/>
+    <ClCompile Include="src\DynamicFactoryTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp"/>
+    <ClCompile Include="src\FormatTest.cpp"/>
+    <ClCompile Include="src\FPETest.cpp"/>
+    <ClCompile Include="src\ListMapTest.cpp"/>
+    <ClCompile Include="src\MemoryPoolTest.cpp"/>
+    <ClCompile Include="src\NamedTuplesTest.cpp"/>
+    <ClCompile Include="src\NDCTest.cpp"/>
+    <ClCompile Include="src\NumberFormatterTest.cpp"/>
+    <ClCompile Include="src\NumberParserTest.cpp"/>
+    <ClCompile Include="src\ObjectPoolTest.cpp"/>
+    <ClCompile Include="src\RegularExpressionTest.cpp"/>
+    <ClCompile Include="src\SharedPtrTest.cpp"/>
+    <ClCompile Include="src\StringTest.cpp"/>
+    <ClCompile Include="src\StringTokenizerTest.cpp"/>
+    <ClCompile Include="src\TuplesTest.cpp"/>
+    <ClCompile Include="src\TypeListTest.cpp"/>
+    <ClCompile Include="src\Base32Test.cpp"/>
+    <ClCompile Include="src\Base64Test.cpp"/>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp"/>
+    <ClCompile Include="src\CountingStreamTest.cpp"/>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp"/>
+    <ClCompile Include="src\FileStreamTest.cpp"/>
+    <ClCompile Include="src\HexBinaryTest.cpp"/>
+    <ClCompile Include="src\LineEndingConverterTest.cpp"/>
+    <ClCompile Include="src\MemoryStreamTest.cpp"/>
+    <ClCompile Include="src\NullStreamTest.cpp"/>
+    <ClCompile Include="src\StreamCopierTest.cpp"/>
+    <ClCompile Include="src\StreamsTestSuite.cpp"/>
+    <ClCompile Include="src\StreamTokenizerTest.cpp"/>
+    <ClCompile Include="src\TeeStreamTest.cpp"/>
+    <ClCompile Include="src\ZLibTest.cpp"/>
+    <ClCompile Include="src\CryptTestSuite.cpp"/>
+    <ClCompile Include="src\DigestStreamTest.cpp"/>
+    <ClCompile Include="src\HMACEngineTest.cpp"/>
+    <ClCompile Include="src\MD4EngineTest.cpp"/>
+    <ClCompile Include="src\MD5EngineTest.cpp"/>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp"/>
+    <ClCompile Include="src\RandomStreamTest.cpp"/>
+    <ClCompile Include="src\RandomTest.cpp"/>
+    <ClCompile Include="src\SHA1EngineTest.cpp"/>
+    <ClCompile Include="src\NotificationCenterTest.cpp"/>
+    <ClCompile Include="src\NotificationQueueTest.cpp"/>
+    <ClCompile Include="src\NotificationsTestSuite.cpp"/>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp"/>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp"/>
+    <ClCompile Include="src\ActiveMethodTest.cpp"/>
+    <ClCompile Include="src\ActivityTest.cpp"/>
+    <ClCompile Include="src\ConditionTest.cpp"/>
+    <ClCompile Include="src\MutexTest.cpp"/>
+    <ClCompile Include="src\RWLockTest.cpp"/>
+    <ClCompile Include="src\SemaphoreTest.cpp"/>
+    <ClCompile Include="src\ThreadingTestSuite.cpp"/>
+    <ClCompile Include="src\ThreadLocalTest.cpp"/>
+    <ClCompile Include="src\ThreadPoolTest.cpp"/>
+    <ClCompile Include="src\ThreadTest.cpp"/>
+    <ClCompile Include="src\TimerTest.cpp"/>
+    <ClCompile Include="src\ClassLoaderTest.cpp"/>
+    <ClCompile Include="src\ManifestTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTest.cpp"/>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp"/>
+    <ClCompile Include="src\TestPlugin.cpp"/>
+    <ClCompile Include="src\ChannelTest.cpp"/>
+    <ClCompile Include="src\FileChannelTest.cpp"/>
+    <ClCompile Include="src\LoggerTest.cpp"/>
+    <ClCompile Include="src\LoggingFactoryTest.cpp"/>
+    <ClCompile Include="src\LoggingRegistryTest.cpp"/>
+    <ClCompile Include="src\LoggingTestSuite.cpp"/>
+    <ClCompile Include="src\LogStreamTest.cpp"/>
+    <ClCompile Include="src\PatternFormatterTest.cpp"/>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp"/>
+    <ClCompile Include="src\TestChannel.cpp"/>
+    <ClCompile Include="src\DirectoryWatcherTest.cpp"/>
+    <ClCompile Include="src\FilesystemTestSuite.cpp"/>
+    <ClCompile Include="src\FileTest.cpp"/>
+    <ClCompile Include="src\GlobTest.cpp"/>
+    <ClCompile Include="src\PathTest.cpp"/>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp"/>
+    <ClCompile Include="src\UUIDTest.cpp"/>
+    <ClCompile Include="src\UUIDTestSuite.cpp"/>
+    <ClCompile Include="src\ClockTest.cpp"/>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp"/>
+    <ClCompile Include="src\DateTimeParserTest.cpp"/>
+    <ClCompile Include="src\DateTimeTest.cpp"/>
+    <ClCompile Include="src\DateTimeTestSuite.cpp"/>
+    <ClCompile Include="src\LocalDateTimeTest.cpp"/>
+    <ClCompile Include="src\StopwatchTest.cpp"/>
+    <ClCompile Include="src\TimespanTest.cpp"/>
+    <ClCompile Include="src\TimestampTest.cpp"/>
+    <ClCompile Include="src\TimezoneTest.cpp"/>
+    <ClCompile Include="src\StreamConverterTest.cpp"/>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp"/>
+    <ClCompile Include="src\TextConverterTest.cpp"/>
+    <ClCompile Include="src\TextEncodingTest.cpp"/>
+    <ClCompile Include="src\TextIteratorTest.cpp"/>
+    <ClCompile Include="src\TextTestSuite.cpp"/>
+    <ClCompile Include="src\UnicodeConverterTest.cpp"/>
+    <ClCompile Include="src\UTF8StringTest.cpp"/>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp"/>
+    <ClCompile Include="src\URITest.cpp"/>
+    <ClCompile Include="src\URITestSuite.cpp"/>
+    <ClCompile Include="src\FoundationTestSuite.cpp"/>
+    <ClCompile Include="src\Driver.cpp"/>
+    <ClCompile Include="src\NamedEventTest.cpp"/>
+    <ClCompile Include="src\NamedMutexTest.cpp"/>
+    <ClCompile Include="src\ProcessesTestSuite.cpp"/>
+    <ClCompile Include="src\ProcessTest.cpp"/>
+    <ClCompile Include="src\SharedMemoryTest.cpp"/>
+    <ClCompile Include="src\TaskManagerTest.cpp"/>
+    <ClCompile Include="src\TaskTest.cpp"/>
+    <ClCompile Include="src\TaskTestSuite.cpp"/>
+    <ClCompile Include="src\BasicEventTest.cpp"/>
+    <ClCompile Include="src\DummyDelegate.cpp"/>
+    <ClCompile Include="src\EventTestSuite.cpp"/>
+    <ClCompile Include="src\FIFOEventTest.cpp"/>
+    <ClCompile Include="src\PriorityEventTest.cpp"/>
+    <ClCompile Include="src\CacheTestSuite.cpp"/>
+    <ClCompile Include="src\ExpireCacheTest.cpp"/>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\LRUCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp"/>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp"/>
+    <ClCompile Include="src\HashingTestSuite.cpp"/>
+    <ClCompile Include="src\HashMapTest.cpp"/>
+    <ClCompile Include="src\HashSetTest.cpp"/>
+    <ClCompile Include="src\HashTableTest.cpp"/>
+    <ClCompile Include="src\LinearHashTableTest.cpp"/>
+    <ClCompile Include="src\SimpleHashTableTest.cpp"/>
+    <ClCompile Include="src\VarTest.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\ArrayTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DirectoryIteratorsTest.h" />
-    <ClInclude Include="src\DirectoryWatcherTest.h" />
-    <ClInclude Include="src\DynamicAnyTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FIFOBufferStreamTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\ListMapTest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\ObjectPoolTest.h" />
-    <ClInclude Include="src\PBKDF2EngineTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base32Test.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\VarTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\MutexTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\ClockTest.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
+    <ClInclude Include="src\AnyTest.h"/>
+    <ClInclude Include="src\ArrayTest.h"/>
+    <ClInclude Include="src\AutoPtrTest.h"/>
+    <ClInclude Include="src\AutoReleasePoolTest.h"/>
+    <ClInclude Include="src\ByteOrderTest.h"/>
+    <ClInclude Include="src\CoreTest.h"/>
+    <ClInclude Include="src\CoreTestSuite.h"/>
+    <ClInclude Include="src\DirectoryIteratorsTest.h"/>
+    <ClInclude Include="src\DynamicAnyTest.h"/>
+    <ClInclude Include="src\DynamicFactoryTest.h"/>
+    <ClInclude Include="src\FIFOBufferTest.h"/>
+    <ClInclude Include="src\FIFOBufferTestSuite.h"/>
+    <ClInclude Include="src\FormatTest.h"/>
+    <ClInclude Include="src\FPETest.h"/>
+    <ClInclude Include="src\ListMapTest.h"/>
+    <ClInclude Include="src\MemoryPoolTest.h"/>
+    <ClInclude Include="src\NamedTuplesTest.h"/>
+    <ClInclude Include="src\NDCTest.h"/>
+    <ClInclude Include="src\NumberFormatterTest.h"/>
+    <ClInclude Include="src\NumberParserTest.h"/>
+    <ClInclude Include="src\ObjectPoolTest.h"/>
+    <ClInclude Include="src\RegularExpressionTest.h"/>
+    <ClInclude Include="src\SharedPtrTest.h"/>
+    <ClInclude Include="src\StringTest.h"/>
+    <ClInclude Include="src\StringTokenizerTest.h"/>
+    <ClInclude Include="src\TuplesTest.h"/>
+    <ClInclude Include="src\TypeListTest.h"/>
+    <ClInclude Include="src\Base32Test.h"/>
+    <ClInclude Include="src\Base64Test.h"/>
+    <ClInclude Include="src\BinaryReaderWriterTest.h"/>
+    <ClInclude Include="src\CountingStreamTest.h"/>
+    <ClInclude Include="src\FIFOBufferStreamTest.h"/>
+    <ClInclude Include="src\FileStreamTest.h"/>
+    <ClInclude Include="src\HexBinaryTest.h"/>
+    <ClInclude Include="src\LineEndingConverterTest.h"/>
+    <ClInclude Include="src\MemoryStreamTest.h"/>
+    <ClInclude Include="src\NullStreamTest.h"/>
+    <ClInclude Include="src\StreamCopierTest.h"/>
+    <ClInclude Include="src\StreamsTestSuite.h"/>
+    <ClInclude Include="src\StreamTokenizerTest.h"/>
+    <ClInclude Include="src\TeeStreamTest.h"/>
+    <ClInclude Include="src\ZLibTest.h"/>
+    <ClInclude Include="src\CryptTestSuite.h"/>
+    <ClInclude Include="src\DigestStreamTest.h"/>
+    <ClInclude Include="src\HMACEngineTest.h"/>
+    <ClInclude Include="src\MD4EngineTest.h"/>
+    <ClInclude Include="src\MD5EngineTest.h"/>
+    <ClInclude Include="src\PBKDF2EngineTest.h"/>
+    <ClInclude Include="src\RandomStreamTest.h"/>
+    <ClInclude Include="src\RandomTest.h"/>
+    <ClInclude Include="src\SHA1EngineTest.h"/>
+    <ClInclude Include="src\NotificationCenterTest.h"/>
+    <ClInclude Include="src\NotificationQueueTest.h"/>
+    <ClInclude Include="src\NotificationsTestSuite.h"/>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h"/>
+    <ClInclude Include="src\TimedNotificationQueueTest.h"/>
+    <ClInclude Include="src\ActiveDispatcherTest.h"/>
+    <ClInclude Include="src\ActiveMethodTest.h"/>
+    <ClInclude Include="src\ActivityTest.h"/>
+    <ClInclude Include="src\ConditionTest.h"/>
+    <ClInclude Include="src\MutexTest.h"/>
+    <ClInclude Include="src\RWLockTest.h"/>
+    <ClInclude Include="src\SemaphoreTest.h"/>
+    <ClInclude Include="src\ThreadingTestSuite.h"/>
+    <ClInclude Include="src\ThreadLocalTest.h"/>
+    <ClInclude Include="src\ThreadPoolTest.h"/>
+    <ClInclude Include="src\ThreadTest.h"/>
+    <ClInclude Include="src\TimerTest.h"/>
+    <ClInclude Include="src\ClassLoaderTest.h"/>
+    <ClInclude Include="src\ManifestTest.h"/>
+    <ClInclude Include="src\SharedLibraryTest.h"/>
+    <ClInclude Include="src\SharedLibraryTestSuite.h"/>
+    <ClInclude Include="src\TestPlugin.h"/>
+    <ClInclude Include="src\ChannelTest.h"/>
+    <ClInclude Include="src\FileChannelTest.h"/>
+    <ClInclude Include="src\LoggerTest.h"/>
+    <ClInclude Include="src\LoggingFactoryTest.h"/>
+    <ClInclude Include="src\LoggingRegistryTest.h"/>
+    <ClInclude Include="src\LoggingTestSuite.h"/>
+    <ClInclude Include="src\LogStreamTest.h"/>
+    <ClInclude Include="src\PatternFormatterTest.h"/>
+    <ClInclude Include="src\SimpleFileChannelTest.h"/>
+    <ClInclude Include="src\TestChannel.h"/>
+    <ClInclude Include="src\DirectoryWatcherTest.h"/>
+    <ClInclude Include="src\FilesystemTestSuite.h"/>
+    <ClInclude Include="src\FileTest.h"/>
+    <ClInclude Include="src\GlobTest.h"/>
+    <ClInclude Include="src\PathTest.h"/>
+    <ClInclude Include="src\UUIDGeneratorTest.h"/>
+    <ClInclude Include="src\UUIDTest.h"/>
+    <ClInclude Include="src\UUIDTestSuite.h"/>
+    <ClInclude Include="src\ClockTest.h"/>
+    <ClInclude Include="src\DateTimeFormatterTest.h"/>
+    <ClInclude Include="src\DateTimeParserTest.h"/>
+    <ClInclude Include="src\DateTimeTest.h"/>
+    <ClInclude Include="src\DateTimeTestSuite.h"/>
+    <ClInclude Include="src\LocalDateTimeTest.h"/>
+    <ClInclude Include="src\StopwatchTest.h"/>
+    <ClInclude Include="src\TimespanTest.h"/>
+    <ClInclude Include="src\TimestampTest.h"/>
+    <ClInclude Include="src\TimezoneTest.h"/>
+    <ClInclude Include="src\StreamConverterTest.h"/>
+    <ClInclude Include="src\TextBufferIteratorTest.h"/>
+    <ClInclude Include="src\TextConverterTest.h"/>
+    <ClInclude Include="src\TextEncodingTest.h"/>
+    <ClInclude Include="src\TextIteratorTest.h"/>
+    <ClInclude Include="src\TextTestSuite.h"/>
+    <ClInclude Include="src\UnicodeConverterTest.h"/>
+    <ClInclude Include="src\UTF8StringTest.h"/>
+    <ClInclude Include="src\URIStreamOpenerTest.h"/>
+    <ClInclude Include="src\URITest.h"/>
+    <ClInclude Include="src\URITestSuite.h"/>
+    <ClInclude Include="src\FoundationTestSuite.h"/>
+    <ClInclude Include="src\NamedEventTest.h"/>
+    <ClInclude Include="src\NamedMutexTest.h"/>
+    <ClInclude Include="src\ProcessesTestSuite.h"/>
+    <ClInclude Include="src\ProcessTest.h"/>
+    <ClInclude Include="src\SharedMemoryTest.h"/>
+    <ClInclude Include="src\TaskManagerTest.h"/>
+    <ClInclude Include="src\TaskTest.h"/>
+    <ClInclude Include="src\TaskTestSuite.h"/>
+    <ClInclude Include="src\BasicEventTest.h"/>
+    <ClInclude Include="src\DummyDelegate.h"/>
+    <ClInclude Include="src\EventTestSuite.h"/>
+    <ClInclude Include="src\FIFOEventTest.h"/>
+    <ClInclude Include="src\PriorityEventTest.h"/>
+    <ClInclude Include="src\CacheTestSuite.h"/>
+    <ClInclude Include="src\ExpireCacheTest.h"/>
+    <ClInclude Include="src\ExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\LRUCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireCacheTest.h"/>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h"/>
+    <ClInclude Include="src\HashingTestSuite.h"/>
+    <ClInclude Include="src\HashMapTest.h"/>
+    <ClInclude Include="src\HashSetTest.h"/>
+    <ClInclude Include="src\HashTableTest.h"/>
+    <ClInclude Include="src\LinearHashTableTest.h"/>
+    <ClInclude Include="src\SimpleHashTableTest.h"/>
+    <ClInclude Include="src\VarTest.h"/>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters
index f1072639f6..18888b68aa 100644
--- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,187 +2,190 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{61761bcd-174d-44c0-a1da-09a3c0fbf3b9}</UniqueIdentifier>
+      <UniqueIdentifier>{0e00b184-3b99-459c-9cc8-2808a90fa23c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{a4ffaebf-880e-42a1-926a-a34c1d8cfcd7}</UniqueIdentifier>
+      <UniqueIdentifier>{15e5e4ff-7073-4237-9c5a-220ee8415122}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{5a4f6520-cf4d-4251-b13a-3a686198ae50}</UniqueIdentifier>
+      <UniqueIdentifier>{8c34e8a7-d612-4824-b0ea-9fc2a74e86f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams">
-      <UniqueIdentifier>{dbcab07d-4ac6-4770-a2b7-e30117e9026a}</UniqueIdentifier>
+      <UniqueIdentifier>{3a1e209f-248a-4de5-8c78-5fcb3c800755}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{d341facd-6c2b-4406-8952-84cee2ff921c}</UniqueIdentifier>
+      <UniqueIdentifier>{7471f380-2621-4245-a3f2-7505438703be}</UniqueIdentifier>
     </Filter>
     <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{cbdd7506-5701-4cd7-aafa-6239e9338154}</UniqueIdentifier>
+      <UniqueIdentifier>{a2958c58-740f-4d4b-96b1-d731a5d162a2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt">
-      <UniqueIdentifier>{7c1fea8f-9e19-4775-ad45-52514212eaa5}</UniqueIdentifier>
+      <UniqueIdentifier>{ea037f1d-456b-4f8a-8b2f-25bc75589c45}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{45ddfc2d-41dd-4ec3-b1fe-68badc9dc053}</UniqueIdentifier>
+      <UniqueIdentifier>{ab286879-10cf-4c67-946a-b1c4c475d600}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{41f6221c-287f-4095-8d68-bf7d43d57986}</UniqueIdentifier>
+      <UniqueIdentifier>{37e39842-f9fc-4800-8344-204e29752615}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications">
-      <UniqueIdentifier>{5206216b-93f1-4d4b-9bd3-2e569fd14c35}</UniqueIdentifier>
+      <UniqueIdentifier>{f31b7b6b-a922-45d3-b4dd-e5f2f7dc192b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f8ec3a-9632-49c0-a73f-8d64bbbe554a}</UniqueIdentifier>
+      <UniqueIdentifier>{80efda2e-8cab-4a61-9114-d6d395206396}</UniqueIdentifier>
     </Filter>
     <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{3658231d-8f2d-40ec-982f-a819f16e14ef}</UniqueIdentifier>
+      <UniqueIdentifier>{4cb42974-fc70-44a0-a067-acbdccdcd315}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading">
-      <UniqueIdentifier>{66b741e5-c5d7-4918-b5d9-f7e123541fcc}</UniqueIdentifier>
+      <UniqueIdentifier>{96cda732-5fd4-47b0-907d-6fff177b91ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{90b4814d-e820-4e7e-9478-e3b1a8b29425}</UniqueIdentifier>
+      <UniqueIdentifier>{b73b1c49-9c44-447a-b768-a3a7de9e1153}</UniqueIdentifier>
     </Filter>
     <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{db7fa0c6-ead3-4c4f-a183-c35ced9c94e2}</UniqueIdentifier>
+      <UniqueIdentifier>{c30e4b84-654f-4711-9cbd-2839a2fd9c10}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{3e366905-3992-407b-8490-26bf9683b753}</UniqueIdentifier>
+      <UniqueIdentifier>{a269d791-ff4b-463d-a1b8-7e4326e9a005}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{8230d159-b383-46e6-9343-c5994eeb0023}</UniqueIdentifier>
+      <UniqueIdentifier>{75dbb83b-bec3-42e2-95b3-e595bfbcbd74}</UniqueIdentifier>
     </Filter>
     <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{98980fff-4121-45a6-abbe-44f9decca606}</UniqueIdentifier>
+      <UniqueIdentifier>{565af9bc-8a7c-411c-a430-85f432062580}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{b1055477-4a46-4f4d-9bd9-dc62158af7eb}</UniqueIdentifier>
+      <UniqueIdentifier>{13050775-eb77-4cca-9609-64f0ac029c1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{3740e219-0bf8-488c-8a6a-e41f0c7f7084}</UniqueIdentifier>
+      <UniqueIdentifier>{0c12be5c-44a7-44bb-a2c7-c3ce9cf70ebe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{b60a9646-1ae9-4f3a-9f56-5fdf2966be4a}</UniqueIdentifier>
+      <UniqueIdentifier>{0af95aea-3db1-43c9-a349-1595b4e147e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem">
-      <UniqueIdentifier>{20c8773e-2f4a-4ae8-82b8-e43b2af181b2}</UniqueIdentifier>
+      <UniqueIdentifier>{7249a21f-b876-42a4-95f1-7a8b78050717}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{120e0d1a-fd1f-4676-a6a4-60bd0a092353}</UniqueIdentifier>
+      <UniqueIdentifier>{feb283a1-4e6c-4aaa-9a48-0848fc4c3526}</UniqueIdentifier>
     </Filter>
     <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{6c7e9ef2-8efb-4fd9-b8c9-426816ae09dc}</UniqueIdentifier>
+      <UniqueIdentifier>{21d484a4-e1c2-489d-93fe-04f08a916e06}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID">
-      <UniqueIdentifier>{57dd2c28-dc2c-4d4a-8ac3-06d6cc28f628}</UniqueIdentifier>
+      <UniqueIdentifier>{83ced0b7-47ba-4b75-9086-a040eca18a8c}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{ff262ea5-7e9b-46a9-a78c-71cd456df4de}</UniqueIdentifier>
+      <UniqueIdentifier>{03a99443-0bd8-40f3-9c5e-349898fdb5f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{5c8f9e34-d180-4044-8426-9a9a80ab9c16}</UniqueIdentifier>
+      <UniqueIdentifier>{4efa7119-2c9a-46db-82db-85d3e91caa6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime">
-      <UniqueIdentifier>{a14ac415-611f-406d-975a-587107bd148e}</UniqueIdentifier>
+      <UniqueIdentifier>{80037cf5-ee02-4f27-91eb-0d25634e5eea}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{5444d0b1-31a5-45f6-91fb-b10fa497f9d7}</UniqueIdentifier>
+      <UniqueIdentifier>{2f5d4342-ca65-42c2-b958-7778145e7000}</UniqueIdentifier>
     </Filter>
     <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{b0970c59-85a1-493e-8bd7-a8d4b3d73479}</UniqueIdentifier>
+      <UniqueIdentifier>{8f1bfe3e-fb12-4696-942b-6aae01c4c0ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text">
-      <UniqueIdentifier>{c09a0d17-1c4c-41bf-bb88-1affba28cc9f}</UniqueIdentifier>
+      <UniqueIdentifier>{c1a5615c-b30f-4258-a1e9-f81666168c2f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{a313536b-447f-411b-8812-d317b6ccbed7}</UniqueIdentifier>
+      <UniqueIdentifier>{3793d9ae-e147-44f9-8a31-3b8104ad5d4e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{4b333bdb-c5b6-4a74-8802-17eb7ebe96ae}</UniqueIdentifier>
+      <UniqueIdentifier>{5583ad7d-0871-4744-92f6-b082428f61f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI">
-      <UniqueIdentifier>{b93abf82-5fe8-4f89-afd0-d509104a3c15}</UniqueIdentifier>
+      <UniqueIdentifier>{849c603f-4b6d-4738-a688-48dd5bb58503}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{1998a2d4-8c6b-45f9-a986-43361e74c95f}</UniqueIdentifier>
+      <UniqueIdentifier>{765fee03-e62c-46e8-9344-73bed86484d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{23262db9-954d-4d00-89ad-e83fa36ce0f5}</UniqueIdentifier>
+      <UniqueIdentifier>{b78bdeb9-0887-400c-bd50-858641f7b983}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{e7b43808-e473-41f5-ab75-74fe4e94c064}</UniqueIdentifier>
+      <UniqueIdentifier>{f86c0d76-bac9-47ed-a907-984af5ca979c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{f0c7e064-edba-4de8-a3f4-81bf3bc63440}</UniqueIdentifier>
+      <UniqueIdentifier>{b7655966-3ece-4556-963f-f928fd4b1c10}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{276cd6b2-6fcb-48d5-ab6a-e5d26586e77b}</UniqueIdentifier>
+      <UniqueIdentifier>{a2f3660d-abb4-4f78-aa18-8e5b14ccde0b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{8d108b96-f5ff-48e0-bd6a-68d8bbc709d8}</UniqueIdentifier>
+      <UniqueIdentifier>{5dba321d-681f-4c1f-ab7c-49c52d302e1b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{c0434fd2-8b90-415d-9ee0-f8b0d8f798bf}</UniqueIdentifier>
+      <UniqueIdentifier>{51e89edd-69a3-4322-99b1-a1bd0cce3802}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes">
-      <UniqueIdentifier>{4fae28d6-ef01-4587-b717-bf048c803d93}</UniqueIdentifier>
+      <UniqueIdentifier>{e1859bc6-555f-4ed5-9c8d-251433dc57ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{7c1f0e20-c68e-41d0-86a1-3f34951f3e1f}</UniqueIdentifier>
+      <UniqueIdentifier>{45d57438-0d8f-43a4-bfe5-853f16cb52f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{e6357d2f-1c39-4c9e-b3c4-5118be69ad0f}</UniqueIdentifier>
+      <UniqueIdentifier>{b33309ca-5291-400a-a788-9f7be34a99b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks">
-      <UniqueIdentifier>{aaf605d7-11e6-4aab-bc57-ddd5e65ad44c}</UniqueIdentifier>
+      <UniqueIdentifier>{f186f299-f6ed-456b-9252-df7ecc22c46d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{559701bf-59bd-46f9-ad12-ba7aec09600f}</UniqueIdentifier>
+      <UniqueIdentifier>{85cb91f7-e9c0-4216-8155-a3a74cef1267}</UniqueIdentifier>
     </Filter>
     <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{f0ed8757-4994-4627-b76b-4c3367476137}</UniqueIdentifier>
+      <UniqueIdentifier>{d3e99fb1-a414-4311-ad1b-c7f17362d209}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event">
-      <UniqueIdentifier>{93d2c47c-068b-4866-a654-7309b68ccc38}</UniqueIdentifier>
+      <UniqueIdentifier>{74ad0b0c-1365-4c54-9140-6977869e56c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{57405867-eeac-4bf4-8bdf-9b614f02b562}</UniqueIdentifier>
+      <UniqueIdentifier>{e566d884-f010-4f7b-b2b6-3eba2f946469}</UniqueIdentifier>
     </Filter>
     <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{4bd2879b-4e23-446c-95c9-1a1628774c45}</UniqueIdentifier>
+      <UniqueIdentifier>{d5275606-4d7f-4284-a89e-3e2d68dab44e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache">
-      <UniqueIdentifier>{08de05ff-958a-4146-bafe-8c38c6ee1a76}</UniqueIdentifier>
+      <UniqueIdentifier>{d48b61af-3f99-4fdc-9520-b339cfb70e22}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{fad494e5-26da-4b47-8f4e-81aa0c19e0f7}</UniqueIdentifier>
+      <UniqueIdentifier>{5347c37e-beef-4ea3-a548-dc767f3c3db3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{cf174669-73a2-4f48-8bbb-ec5ea1c09f4b}</UniqueIdentifier>
+      <UniqueIdentifier>{40ee9cf3-2880-4fbc-9848-5ffe6c490677}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing">
-      <UniqueIdentifier>{4c661a1b-1281-42e9-bfd8-f86d3e7d4daf}</UniqueIdentifier>
+      <UniqueIdentifier>{d3d6ab72-a48b-4188-89b0-8ea68460901b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{a1adc868-69d4-4d26-a361-238b35a6cf93}</UniqueIdentifier>
+      <UniqueIdentifier>{5d7f0494-3773-4353-9dd7-bff5529e81ae}</UniqueIdentifier>
     </Filter>
     <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{009defb4-dc35-4ac4-88aa-5b9cd342110b}</UniqueIdentifier>
+      <UniqueIdentifier>{13ead250-20c5-4ceb-b46c-3de0b618896d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic">
-      <UniqueIdentifier>{2d58ce37-9daa-4359-a602-06de87c1d4eb}</UniqueIdentifier>
+      <UniqueIdentifier>{63544c87-245c-477c-a377-d714f1aa5f93}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Source Files">
-      <UniqueIdentifier>{896a3ce9-b004-4ea8-aa48-ab1b4db9d863}</UniqueIdentifier>
+      <UniqueIdentifier>{4f7ca775-acba-4c2d-83b6-2b785e99c6fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Dynamic\Header Files">
-      <UniqueIdentifier>{a38a83b0-a188-4e99-b3a9-37453c6a9559}</UniqueIdentifier>
+      <UniqueIdentifier>{c95ce7bc-34a7-4ec7-b01a-a9dc31ce61f9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AnyTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\AutoPtrTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -198,9 +201,18 @@
     <ClCompile Include="src\CoreTestSuite.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\DynamicFactoryTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOBufferTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FormatTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -225,6 +237,9 @@
     <ClCompile Include="src\NumberParserTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\ObjectPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RegularExpressionTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -255,6 +270,9 @@
     <ClCompile Include="src\CountingStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\FileStreamTest.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -300,6 +318,9 @@
     <ClCompile Include="src\MD5EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\RandomStreamTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
@@ -405,10 +426,10 @@
     <ClCompile Include="src\TestChannel.cpp">
       <Filter>Logging\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FilesystemTestSuite.cpp">
+    <ClCompile Include="src\DirectoryWatcherTest.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\DirectoryIteratorsTest.cpp">
+    <ClCompile Include="src\FilesystemTestSuite.cpp">
       <Filter>Filesystem\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\FileTest.cpp">
@@ -495,6 +516,9 @@
     <ClCompile Include="src\FoundationTestSuite.cpp">
       <Filter>_Suite\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Driver.cpp">
+      <Filter>_Driver\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\NamedEventTest.cpp">
       <Filter>Processes\Source Files</Filter>
     </ClCompile>
@@ -570,32 +594,17 @@
     <ClCompile Include="src\SimpleHashTableTest.cpp">
       <Filter>Hashing\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\ObjectPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DirectoryWatcherTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\VarTest.cpp">
       <Filter>Dynamic\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\FIFOBufferStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ArrayTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Driver.cpp">
-      <Filter>_Driver\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PBKDF2EngineTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ArrayTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\AutoPtrTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -611,12 +620,21 @@
     <ClInclude Include="src\CoreTestSuite.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DirectoryIteratorsTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\DynamicAnyTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\DynamicFactoryTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOBufferTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FormatTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -641,6 +659,9 @@
     <ClInclude Include="src\NumberParserTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\ObjectPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RegularExpressionTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -671,6 +692,9 @@
     <ClInclude Include="src\CountingStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\FIFOBufferStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\FileStreamTest.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
@@ -716,6 +740,9 @@
     <ClInclude Include="src\MD5EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\RandomStreamTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
@@ -821,10 +848,10 @@
     <ClInclude Include="src\TestChannel.h">
       <Filter>Logging\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FilesystemTestSuite.h">
+    <ClInclude Include="src\DirectoryWatcherTest.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\DirectoryIteratorsTest.h">
+    <ClInclude Include="src\FilesystemTestSuite.h">
       <Filter>Filesystem\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\FileTest.h">
@@ -986,23 +1013,8 @@
     <ClInclude Include="src\SimpleHashTableTest.h">
       <Filter>Hashing\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\ObjectPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DirectoryWatcherTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\VarTest.h">
       <Filter>Dynamic\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\FIFOBufferStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ArrayTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PBKDF2EngineTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_x64_vs90.vcproj b/Foundation/testsuite/TestSuite_x64_vs90.vcproj
index 49979b6966..4424ee6b8b 100644
--- a/Foundation/testsuite/TestSuite_x64_vs90.vcproj
+++ b/Foundation/testsuite/TestSuite_x64_vs90.vcproj
@@ -547,6 +547,14 @@
 					RelativePath=".\src\AutoReleasePoolTest.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTestSuite.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\ByteOrderTest.cpp"
 					>
@@ -647,6 +655,14 @@
 					RelativePath=".\src\AutoReleasePoolTest.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTest.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\FIFOBufferTestSuite.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\ByteOrderTest.h"
 					>
diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp
index 5a84c9ca40..d1226b52cf 100644
--- a/Foundation/testsuite/src/CoreTest.cpp
+++ b/Foundation/testsuite/src/CoreTest.cpp
@@ -39,8 +39,6 @@ using Poco::Environment;
 using Poco::Thread;
 using Poco::Runnable;
 using Poco::Buffer;
-using Poco::BasicFIFOBuffer;
-using Poco::FIFOBuffer;
 using Poco::AtomicCounter;
 using Poco::Nullable;
 using Poco::Ascii;
@@ -319,591 +317,6 @@ void CoreTest::testBuffer()
 }
 
 
-void CoreTest::testFIFOBufferEOFAndError()
-{
-	typedef FIFOBuffer::Type T;
-
-	FIFOBuffer f(20, true);
-	
-	assert (f.isEmpty());
-	assert (!f.isFull());
-
-	Buffer<T> b(10);
-	std::vector<T> v;
-
-	f.readable += delegate(this, &CoreTest::onReadable);
-	f.writable += delegate(this, &CoreTest::onWritable);
-
-	for (T c = '0'; c < '0' +  10; ++c)
-		v.push_back(c);
-
-	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
-	assert(0 == _notToReadable);
-	assert(0 == _readableToNot);
-	assert (10 == f.write(b));
-	assert(1 == _notToReadable);
-	assert(0 == _readableToNot);
-	assert (20 == f.size());
-	assert (10 == f.used());
-	assert (!f.isEmpty());
-	f.setEOF();
-	assert(0 == _notToWritable);
-	assert(1 == _writableToNot);
-	assert (f.hasEOF());
-	assert (!f.isEOF());
-	assert(1 == _notToReadable);
-	assert(0 == _readableToNot);
-	assert (20 == f.size());
-	assert (10 == f.used());
-	assert (0 == f.write(b));
-	assert (!f.isEmpty());
-	assert (5 == f.read(b, 5));
-	assert(1 == _notToReadable);
-	assert(0 == _readableToNot);
-	assert (f.hasEOF());
-	assert (!f.isEOF());
-	assert (5 == f.read(b, 5));
-	assert(1 == _notToReadable);
-	assert(1 == _readableToNot);
-	assert (f.hasEOF());
-	assert (f.isEOF());
-	assert(0 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	f.setEOF(false);
-	assert (!f.hasEOF());
-	assert (!f.isEOF());
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-	assert(1 == _notToReadable);
-	assert(1 == _readableToNot);
-
-	assert (5 == f.write(b));
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-	assert(2 == _notToReadable);
-	assert(1 == _readableToNot);
-	assert (20 == f.size());
-	assert (5 == f.used());
-	f.setError();
-	assert (0 == f.write(b));
-	
-	try
-	{
-		f.copy(b.begin(), 5);
-		fail ("must throw InvalidAccessException");
-	}
-	catch (InvalidAccessException&) { }
-
-	try
-	{
-		f.advance(5);
-		fail ("must throw InvalidAccessException");
-	}
-	catch (InvalidAccessException&) { }
-	
-	assert(1 == _notToWritable);
-	assert(2 == _writableToNot);
-	assert(2 == _notToReadable);
-	assert(2 == _readableToNot);
-	assert (20 == f.size());
-	assert (0 == f.used());
-	f.setError(false);
-	assert(2 == _notToWritable);
-	assert(2 == _writableToNot);
-	assert(2 == _notToReadable);
-	assert(2 == _readableToNot);
-	assert (20 == f.size());
-	assert (0 == f.used());
-	assert (5 == f.write(b));
-	assert(2 == _notToWritable);
-	assert(2 == _writableToNot);
-	assert(3 == _notToReadable);
-	assert(2 == _readableToNot);
-	assert (20 == f.size());
-	assert (5 == f.used());
-}
-
-
-void CoreTest::testFIFOBufferChar()
-{
-	typedef FIFOBuffer::Type T;
-
-	FIFOBuffer f(20, true);
-	
-	assert (f.isEmpty());
-	assert (!f.isFull());
-
-	Buffer<T> b(10);
-	std::vector<T> v;
-
-	f.readable += delegate(this, &CoreTest::onReadable);
-	f.writable += delegate(this, &CoreTest::onWritable);
-
-	for (T c = '0'; c < '0' +  10; ++c)
-		v.push_back(c);
-
-	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
-	assert(0 == _notToReadable);
-	assert(0 == _readableToNot);
-	f.write(b);
-	assert(1 == _notToReadable);
-	assert(0 == _readableToNot);
-	assert (20 == f.size());
-	assert (10 == f.used());
-	assert (!f.isEmpty());
-	assert ('0' == f[0]);
-	assert ('1' == f[1]);
-	assert ('2' == f[2]);
-	assert ('3' == f[3]);
-	assert ('4' == f[4]);
-	assert ('5' == f[5]);
-	assert ('6' == f[6]);
-	assert ('7' == f[7]);
-	assert ('8' == f[8]);
-	assert ('9' == f[9]);
-
-	b.resize(5);
-	f.read(b, b.size());
-	assert (20 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert ('5' == f[0]);
-	assert ('6' == f[1]);
-	assert ('7' == f[2]);
-	assert ('8' == f[3]);
-	assert ('9' == f[4]);
-	try { T i = f[10]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-
-	v.clear();
-	for (T c = 'a'; c < 'a' + 10; ++c)
-		v.push_back(c);
-
-	b.resize(10);
-	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
-	f.write(b);
-	assert (20 == f.size());
-	assert (15 == f.used());
-	assert (!f.isEmpty());
-	assert ('5' == f[0]);
-	assert ('6' == f[1]);
-	assert ('7' == f[2]);
-	assert ('8' == f[3]);
-	assert ('9' == f[4]);
-	assert ('a' == f[5]);
-	assert ('b' == f[6]);
-	assert ('c' == f[7]);
-	assert ('d' == f[8]);
-	assert ('e' == f[9]);
-	assert ('f' == f[10]);
-	assert ('g' == f[11]);
-	assert ('h' == f[12]);
-	assert ('i' == f[13]);
-	assert ('j' == f[14]);
-	try { T i = f[15]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-
-	f.read(b, 10);
-	assert (20 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert ('f' == f[0]);
-	assert ('g' == f[1]);
-	assert ('h' == f[2]);
-	assert ('i' == f[3]);
-	assert ('j' == f[4]);
-	try { T i = f[5]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-
-	assert(1 == _notToReadable);
-	assert(0 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(0 == _writableToNot);
-	f.read(b, 6);
-	assert(1 == _notToReadable);
-	assert(1 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(0 == _writableToNot);
-
-	assert (5 == b.size());
-	assert (20 == f.size());
-	assert (0 == f.used());
-	try { T i = f[0]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-	assert (f.isEmpty());
-
-	assert(1 == _notToReadable);
-	assert(1 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(0 == _writableToNot);
-	assert (5 == f.write(b));
-	assert(2 == _notToReadable);
-	assert(1 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(0 == _writableToNot);
-
-	assert (20 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert ('f' == f[0]);
-	assert ('g' == f[1]);
-	assert ('h' == f[2]);
-	assert ('i' == f[3]);
-	assert ('j' == f[4]);
-
-	f.resize(10);
-	assert (10 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert ('f' == f[0]);
-	assert ('g' == f[1]);
-	assert ('h' == f[2]);
-	assert ('i' == f[3]);
-	assert ('j' == f[4]);
-
-	assert(2 == _notToReadable);
-	assert(1 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(0 == _writableToNot);
-	f.resize(3, false);
-	assert(2 == _notToReadable);
-	assert(2 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(0 == _writableToNot);
-	assert (3 == f.size());
-	assert (0 == f.used());
-	assert (f.isEmpty());
-
-	b.resize(3);
-	b[0] = 'x';
-	b[1] = 'y';
-	b[2] = 'z';
-	f.resize(3);
-
-	assert(2 == _notToReadable);
-	assert(2 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(0 == _writableToNot);
-	f.write(b);
-	assert(3 == _notToReadable);
-	assert(2 == _readableToNot);
-	assert(0 == _notToWritable);
-	assert(1 == _writableToNot);
-	assert (f.isFull());
-
-	f.read(b);
-	assert(3 == _notToReadable);
-	assert(3 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-	assert (f.isEmpty());
-
-	f.resize(10);
-	assert (10 == f.size());
-	assert (0 == f.used());
-	assert (10 == f.available());
-	assert (f.isEmpty());
-
-	assert(3 == _notToReadable);
-	assert(3 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-	f.write(b);
-	assert(4 == _notToReadable);
-	assert(3 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	assert (10 == f.size());
-	assert (3 == f.used());
-	assert (7 == f.available());
-	assert (!f.isEmpty());
-
-	f.drain(1);
-	assert(4 == _notToReadable);
-	assert(3 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	assert (10 == f.size());
-	assert (2 == f.used());
-	assert (8 == f.available());
-	assert (!f.isEmpty());
-
-	f.drain(2);
-	assert(4 == _notToReadable);
-	assert(4 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	assert (10 == f.size());
-	assert (0 == f.used());
-	assert (10 == f.available());
-	assert (f.isEmpty());
-
-	f.write(b);
-	assert(5 == _notToReadable);
-	assert(4 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	assert (10 == f.size());
-	assert (3 == f.used());
-	assert (7 == f.available());
-	assert (!f.isEmpty());
-
-	f.drain();
-	assert(5 == _notToReadable);
-	assert(5 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-	assert (10 == f.size());
-	assert (0 == f.used());
-	assert (10 == f.available());
-	assert (f.isEmpty());
-
-	f.write(b, 2);
-	assert (10 == f.size());
-	assert (2 == f.used());
-	assert (8 == f.available());
-	assert (!f.isEmpty());
-
-	assert(6 == _notToReadable);
-	assert(5 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	f.drain();
-	assert(6 == _notToReadable);
-	assert(6 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	assert (3 == f.write(b, 10));
-	assert (10 == f.size());
-	assert (3 == f.used());
-	assert (7 == f.available());
-	assert (!f.isEmpty());
-
-	assert(7 == _notToReadable);
-	assert(6 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	const char arr[3] = {'4', '5', '6' };
-	try
-	{
-		f.copy(&arr[0], 8);
-		fail("must fail");
-	} catch (InvalidAccessException&) { }
-
-	f.copy(&arr[0], 3);
-	assert(7 == _notToReadable);
-	assert(6 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(1 == _writableToNot);
-
-	assert (10 == f.size());
-	assert (6 == f.used());
-	assert (4 == f.available());
-
-	f.copy(&arr[0], 4);
-	assert(7 == _notToReadable);
-	assert(6 == _readableToNot);
-	assert(1 == _notToWritable);
-	assert(2 == _writableToNot);
-	assert (f.isFull());
-
-	assert (10 == f.size());
-	assert (10 == f.used());
-	assert (0 == f.available());
-
-	try
-	{
-		f.copy(&arr[0], 1);
-		fail("must fail");
-	} catch (InvalidAccessException&) { }
-
-	f.drain(1);
-	assert(7 == _notToReadable);
-	assert(6 == _readableToNot);
-	assert(2 == _notToWritable);
-	assert(2 == _writableToNot);
-
-	f.drain(9);
-	assert (10 == f.size());
-	assert (0 == f.used());
-	assert (10 == f.available());
-
-	const char e[10] = { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' };
-	f.copy(&e[0], 10);
-	assert (10 == f.size());
-	assert (10 == f.used());
-	assert (0 == f.available());
-	f.drain(1);
-	f.write(e, 1);
-	assert (10 == f.size());
-	assert (10 == f.used());
-	assert (0 == f.available());
-	
-	assert(f[0] == '2');
-	assert(f[1] == '3');
-	assert(f[2] == '4');
-	assert(f[3] == '5');
-	assert(f[4] == '6');
-	assert(f[5] == '7');
-	assert(f[6] == '8');
-	assert(f[7] == '9');
-	assert(f[8] == '0');
-	assert(f[9] == '1');
-
-	f.readable -= delegate(this, &CoreTest::onReadable);
-	f.writable -= delegate(this, &CoreTest::onReadable);
-}
-
-
-void CoreTest::testFIFOBufferInt()
-{
-	typedef int T;
-
-	BasicFIFOBuffer<T> f(20);
-	Buffer<T> b(10);
-	std::vector<T> v;
-
-	for (T c = 0; c < 10; ++c)
-		v.push_back(c);
-
-	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
-	f.write(b);
-	assert (20 == f.size());
-	assert (10 == f.used());
-	assert (!f.isEmpty());
-	assert (0 == f[0]);
-	assert (1 == f[1]);
-	assert (2 == f[2]);
-	assert (3 == f[3]);
-	assert (4 == f[4]);
-	assert (5 == f[5]);
-	assert (6 == f[6]);
-	assert (7 == f[7]);
-	assert (8 == f[8]);
-	assert (9 == f[9]);
-
-	b.resize(5);
-	f.read(b, b.size());
-	assert (20 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert (5 == f[0]);
-	assert (6 == f[1]);
-	assert (7 == f[2]);
-	assert (8 == f[3]);
-	assert (9 == f[4]);
-	try { T i = f[10]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-
-	v.clear();
-	for (T c = 10; c < 20; ++c)
-		v.push_back(c);
-
-	b.resize(10);
-	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
-	f.write(b);
-	assert (20 == f.size());
-	assert (15 == f.used());
-	assert (!f.isEmpty());
-	assert (5 == f[0]);
-	assert (6 == f[1]);
-	assert (7 == f[2]);
-	assert (8 == f[3]);
-	assert (9 == f[4]);
-	assert (10 == f[5]);
-	assert (11 == f[6]);
-	assert (12 == f[7]);
-	assert (13 == f[8]);
-	assert (14 == f[9]);
-	assert (15 == f[10]);
-	assert (16 == f[11]);
-	assert (17 == f[12]);
-	assert (18 == f[13]);
-	assert (19 == f[14]);
-	try { T i = f[15]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-
-	f.read(b, 10);
-	assert (20 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert (15 == f[0]);
-	assert (16 == f[1]);
-	assert (17 == f[2]);
-	assert (18 == f[3]);
-	assert (19 == f[4]);
-	try { T i = f[5]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-
-	f.read(b, 6);
-	assert (5 == b.size());
-	assert (20 == f.size());
-	assert (0 == f.used());
-	try { T i = f[0]; fail ("must fail"); }
-	catch (InvalidAccessException&) { }
-
-	assert (f.isEmpty());
-
-	assert (5 == f.write(b));
-	assert (20 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert (15 == f[0]);
-	assert (16 == f[1]);
-	assert (17 == f[2]);
-	assert (18 == f[3]);
-	assert (19 == f[4]);
-
-	f.resize(10);
-	assert (10 == f.size());
-	assert (5 == f.used());
-	assert (!f.isEmpty());
-	assert (15 == f[0]);
-	assert (16 == f[1]);
-	assert (17 == f[2]);
-	assert (18 == f[3]);
-	assert(19 == f[4]);
-
-	f.drain(9);
-	assert(10 == f.size());
-	assert(0 == f.used());
-	assert(10 == f.available());
-
-	const int e[10] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-	f.copy(&e[0], 10);
-	assert(10 == f.size());
-	assert(10 == f.used());
-	assert(0 == f.available());
-	f.drain(1);
-	f.write(e, 1);
-	assert(10 == f.size());
-	assert(10 == f.used());
-	assert(0 == f.available());
-
-	assert(f[0] == 2);
-	assert(f[1] == 3);
-	assert(f[2] == 4);
-	assert(f[3] == 5);
-	assert(f[4] == 6);
-	assert(f[5] == 7);
-	assert(f[6] == 8);
-	assert(f[7] == 9);
-	assert(f[8] == 0);
-	assert(f[9] == 1);
-
-	f.resize(3, false);
-	assert (3 == f.size());
-	assert (0 == f.used());
-	assert (f.isEmpty());
-}
 
 
 void CoreTest::testAtomicCounter()
@@ -1121,19 +534,6 @@ void CoreTest::testAscii()
 }
 
 
-void CoreTest::onReadable(bool& b)
-{
-	if (b) ++_notToReadable;
-	else ++_readableToNot;
-};
-
-
-void CoreTest::onWritable(bool& b)
-{
-	if (b) ++_notToWritable;
-	else ++_writableToNot;
-}
-
 
 void CoreTest::setUp()
 {
@@ -1158,9 +558,6 @@ CppUnit::Test* CoreTest::suite()
 	CppUnit_addTest(pSuite, CoreTest, testBugcheck);
 	CppUnit_addTest(pSuite, CoreTest, testEnvironment);
 	CppUnit_addTest(pSuite, CoreTest, testBuffer);
-	CppUnit_addTest(pSuite, CoreTest, testFIFOBufferChar);
-	CppUnit_addTest(pSuite, CoreTest, testFIFOBufferInt);
-	CppUnit_addTest(pSuite, CoreTest, testFIFOBufferEOFAndError);
 	CppUnit_addTest(pSuite, CoreTest, testAtomicCounter);
 	CppUnit_addTest(pSuite, CoreTest, testNullable);
 	CppUnit_addTest(pSuite, CoreTest, testAscii);
diff --git a/Foundation/testsuite/src/CoreTest.h b/Foundation/testsuite/src/CoreTest.h
index 3b3a6a1d58..3b5a85f803 100644
--- a/Foundation/testsuite/src/CoreTest.h
+++ b/Foundation/testsuite/src/CoreTest.h
@@ -32,9 +32,6 @@ class CoreTest: public CppUnit::TestCase
 	void testFPE();
 	void testEnvironment();
 	void testBuffer();
-	void testFIFOBufferChar();
-	void testFIFOBufferInt();
-	void testFIFOBufferEOFAndError();
 	void testAtomicCounter();
 	void testNullable();
 	void testAscii();
@@ -45,13 +42,9 @@ class CoreTest: public CppUnit::TestCase
 	static CppUnit::Test* suite();
 
 protected:
-	void onReadable(bool& b);
-	void onWritable(bool& b);
-
-private:
 	int _readableToNot;
-	int _notToReadable;
 	int _writableToNot;
+	int _notToReadable;
 	int _notToWritable;
 };
 
diff --git a/Foundation/testsuite/src/FIFOBufferTest.cpp b/Foundation/testsuite/src/FIFOBufferTest.cpp
new file mode 100644
index 0000000000..a3819d6efd
--- /dev/null
+++ b/Foundation/testsuite/src/FIFOBufferTest.cpp
@@ -0,0 +1,698 @@
+//
+// FIFOBufferTest.cpp
+//
+// $Id: //poco/1.4/Foundation/testsuite/src/FIFOBufferTest.cpp#1 $
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "FIFOBufferTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Buffer.h"
+#include "Poco/Exception.h"
+#include "Poco/Delegate.h"
+#include "Poco/FIFOBuffer.h"
+#include <iostream>
+#include <memory>
+#include <cstring>
+
+
+// NOTE: using for certain namespace
+using Poco::BasicFIFOBuffer;
+using Poco::FIFOBuffer;
+using Poco::Buffer;
+using Poco::InvalidAccessException;
+using Poco::delegate;
+using std::memcpy;
+
+
+FIFOBufferTest::FIFOBufferTest(const std::string& name): 
+	CppUnit::TestCase(name),
+	_notToReadable(0),
+	_notToWritable(0),
+	_readableToNot(0),
+	_writableToNot(0)
+{
+}
+
+
+FIFOBufferTest::~FIFOBufferTest()
+{
+}
+
+void FIFOBufferTest::onReadable(bool& b)
+{
+	if (b) ++_notToReadable;
+	else ++_readableToNot;
+};
+
+
+void FIFOBufferTest::onWritable(bool& b)
+{
+	if (b) ++_notToWritable;
+	else ++_writableToNot;
+}
+
+void FIFOBufferTest::testNextWrite()
+{
+	// String length is 88 characters.
+	const int BUFFER_SIZE = 128;
+	std::string text("The Quick Brown Dog Jumps Over The Lazy Fox.");
+	BasicFIFOBuffer<char> buffer(BUFFER_SIZE);
+	buffer.write(text.data(), text.size());
+	char cbuffer[BUFFER_SIZE];
+	std::memset(cbuffer, 0, buffer.size());
+	
+	buffer.read(cbuffer, 4);
+
+	assert(std::string(cbuffer, 4) == std::string("The "));
+	
+	buffer.peek(cbuffer, buffer.used());
+	assert(std::string(cbuffer, buffer.used()) ==
+			std::string("Quick Brown Dog Jumps Over The Lazy Fox."));
+
+	memcpy(buffer.next(), "The ", 4);
+	buffer.advance(4);
+
+	buffer.peek(cbuffer, buffer.used());
+
+	assert(std::string("Quick Brown Dog Jumps Over The Lazy Fox.The ") == std::string(cbuffer, buffer.used()));
+}
+
+
+void FIFOBufferTest::testEOFAndError()
+{
+	typedef FIFOBuffer::Type T;
+
+	FIFOBuffer f(20, true);
+	
+	assert (f.isEmpty());
+	assert (!f.isFull());
+
+	Buffer<T> b(10);
+	std::vector<T> v;
+
+	f.readable += delegate(this, &FIFOBufferTest::onReadable);
+	f.writable += delegate(this, &FIFOBufferTest::onWritable);
+
+	for (T c = '0'; c < '0' +  10; ++c)
+		v.push_back(c);
+
+	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
+	assert(0 == _notToReadable);
+	assert(0 == _readableToNot);
+	assert (10 == f.write(b));
+	assert(1 == _notToReadable);
+	assert(0 == _readableToNot);
+	assert (20 == f.size());
+	assert (10 == f.used());
+	assert (!f.isEmpty());
+	f.setEOF();
+	assert(0 == _notToWritable);
+	assert(1 == _writableToNot);
+	assert (f.hasEOF());
+	assert (!f.isEOF());
+	assert(1 == _notToReadable);
+	assert(0 == _readableToNot);
+	assert (20 == f.size());
+	assert (10 == f.used());
+	assert (0 == f.write(b));
+	assert (!f.isEmpty());
+	assert (5 == f.read(b, 5));
+	assert(1 == _notToReadable);
+	assert(0 == _readableToNot);
+	assert (f.hasEOF());
+	assert (!f.isEOF());
+	assert (5 == f.read(b, 5));
+	assert(1 == _notToReadable);
+	assert(1 == _readableToNot);
+	assert (f.hasEOF());
+	assert (f.isEOF());
+	assert(0 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	f.setEOF(false);
+	assert (!f.hasEOF());
+	assert (!f.isEOF());
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+	assert(1 == _notToReadable);
+	assert(1 == _readableToNot);
+
+	assert (5 == f.write(b));
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+	assert(2 == _notToReadable);
+	assert(1 == _readableToNot);
+	assert (20 == f.size());
+	assert (5 == f.used());
+	f.setError();
+	assert (0 == f.write(b));
+	
+	try
+	{
+		f.copy(b.begin(), 5);
+		fail ("must throw InvalidAccessException");
+	}
+	catch (InvalidAccessException&) { }
+
+	try
+	{
+		f.advance(5);
+		fail ("must throw InvalidAccessException");
+	}
+	catch (InvalidAccessException&) { }
+	
+	assert(1 == _notToWritable);
+	assert(2 == _writableToNot);
+	assert(2 == _notToReadable);
+	assert(2 == _readableToNot);
+	assert (20 == f.size());
+	assert (0 == f.used());
+	f.setError(false);
+	assert(2 == _notToWritable);
+	assert(2 == _writableToNot);
+	assert(2 == _notToReadable);
+	assert(2 == _readableToNot);
+	assert (20 == f.size());
+	assert (0 == f.used());
+	assert (5 == f.write(b));
+	assert(2 == _notToWritable);
+	assert(2 == _writableToNot);
+	assert(3 == _notToReadable);
+	assert(2 == _readableToNot);
+	assert (20 == f.size());
+	assert (5 == f.used());
+}
+
+
+void FIFOBufferTest::testChar()
+{
+	typedef FIFOBuffer::Type T;
+
+	FIFOBuffer f(20, true);
+	
+	assert (f.isEmpty());
+	assert (!f.isFull());
+
+	Buffer<T> b(10);
+	std::vector<T> v;
+
+	f.readable += delegate(this, &FIFOBufferTest::onReadable);
+	f.writable += delegate(this, &FIFOBufferTest::onWritable);
+
+	for (T c = '0'; c < '0' +  10; ++c)
+		v.push_back(c);
+
+	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
+	assert(0 == _notToReadable);
+	assert(0 == _readableToNot);
+	f.write(b);
+	assert(1 == _notToReadable);
+	assert(0 == _readableToNot);
+	assert (20 == f.size());
+	assert (10 == f.used());
+	assert (!f.isEmpty());
+	assert ('0' == f[0]);
+	assert ('1' == f[1]);
+	assert ('2' == f[2]);
+	assert ('3' == f[3]);
+	assert ('4' == f[4]);
+	assert ('5' == f[5]);
+	assert ('6' == f[6]);
+	assert ('7' == f[7]);
+	assert ('8' == f[8]);
+	assert ('9' == f[9]);
+
+	b.resize(5);
+	f.read(b, b.size());
+	assert (20 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert ('5' == f[0]);
+	assert ('6' == f[1]);
+	assert ('7' == f[2]);
+	assert ('8' == f[3]);
+	assert ('9' == f[4]);
+	try { T i = f[10]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+
+	v.clear();
+	for (T c = 'a'; c < 'a' + 10; ++c)
+		v.push_back(c);
+
+	b.resize(10);
+	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
+	f.write(b);
+	assert (20 == f.size());
+	assert (15 == f.used());
+	assert (!f.isEmpty());
+	assert ('5' == f[0]);
+	assert ('6' == f[1]);
+	assert ('7' == f[2]);
+	assert ('8' == f[3]);
+	assert ('9' == f[4]);
+	assert ('a' == f[5]);
+	assert ('b' == f[6]);
+	assert ('c' == f[7]);
+	assert ('d' == f[8]);
+	assert ('e' == f[9]);
+	assert ('f' == f[10]);
+	assert ('g' == f[11]);
+	assert ('h' == f[12]);
+	assert ('i' == f[13]);
+	assert ('j' == f[14]);
+	try { T i = f[15]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+
+	f.read(b, 10);
+	assert (20 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert ('f' == f[0]);
+	assert ('g' == f[1]);
+	assert ('h' == f[2]);
+	assert ('i' == f[3]);
+	assert ('j' == f[4]);
+	try { T i = f[5]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+
+	assert(1 == _notToReadable);
+	assert(0 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(0 == _writableToNot);
+	f.read(b, 6);
+	assert(1 == _notToReadable);
+	assert(1 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(0 == _writableToNot);
+
+	assert (5 == b.size());
+	assert (20 == f.size());
+	assert (0 == f.used());
+	try { T i = f[0]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+	assert (f.isEmpty());
+
+	assert(1 == _notToReadable);
+	assert(1 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(0 == _writableToNot);
+	assert (5 == f.write(b));
+	assert(2 == _notToReadable);
+	assert(1 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(0 == _writableToNot);
+
+	assert (20 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert ('f' == f[0]);
+	assert ('g' == f[1]);
+	assert ('h' == f[2]);
+	assert ('i' == f[3]);
+	assert ('j' == f[4]);
+
+	f.resize(10);
+	assert (10 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert ('f' == f[0]);
+	assert ('g' == f[1]);
+	assert ('h' == f[2]);
+	assert ('i' == f[3]);
+	assert ('j' == f[4]);
+
+	assert(2 == _notToReadable);
+	assert(1 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(0 == _writableToNot);
+	f.resize(3, false);
+	assert(2 == _notToReadable);
+	assert(2 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(0 == _writableToNot);
+	assert (3 == f.size());
+	assert (0 == f.used());
+	assert (f.isEmpty());
+
+	b.resize(3);
+	b[0] = 'x';
+	b[1] = 'y';
+	b[2] = 'z';
+	f.resize(3);
+
+	assert(2 == _notToReadable);
+	assert(2 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(0 == _writableToNot);
+	f.write(b);
+	assert(3 == _notToReadable);
+	assert(2 == _readableToNot);
+	assert(0 == _notToWritable);
+	assert(1 == _writableToNot);
+	assert (f.isFull());
+
+	f.read(b);
+	assert(3 == _notToReadable);
+	assert(3 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+	assert (f.isEmpty());
+
+	f.resize(10);
+	assert (10 == f.size());
+	assert (0 == f.used());
+	assert (10 == f.available());
+	assert (f.isEmpty());
+
+	assert(3 == _notToReadable);
+	assert(3 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+	f.write(b);
+	assert(4 == _notToReadable);
+	assert(3 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	assert (10 == f.size());
+	assert (3 == f.used());
+	assert (7 == f.available());
+	assert (!f.isEmpty());
+
+	f.drain(1);
+	assert(4 == _notToReadable);
+	assert(3 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	assert (10 == f.size());
+	assert (2 == f.used());
+	assert (8 == f.available());
+	assert (!f.isEmpty());
+
+	f.drain(2);
+	assert(4 == _notToReadable);
+	assert(4 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	assert (10 == f.size());
+	assert (0 == f.used());
+	assert (10 == f.available());
+	assert (f.isEmpty());
+
+	f.write(b);
+	assert(5 == _notToReadable);
+	assert(4 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	assert (10 == f.size());
+	assert (3 == f.used());
+	assert (7 == f.available());
+	assert (!f.isEmpty());
+
+	f.drain();
+	assert(5 == _notToReadable);
+	assert(5 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+	assert (10 == f.size());
+	assert (0 == f.used());
+	assert (10 == f.available());
+	assert (f.isEmpty());
+
+	f.write(b, 2);
+	assert (10 == f.size());
+	assert (2 == f.used());
+	assert (8 == f.available());
+	assert (!f.isEmpty());
+
+	assert(6 == _notToReadable);
+	assert(5 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	f.drain();
+	assert(6 == _notToReadable);
+	assert(6 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	assert (3 == f.write(b, 10));
+	assert (10 == f.size());
+	assert (3 == f.used());
+	assert (7 == f.available());
+	assert (!f.isEmpty());
+
+	assert(7 == _notToReadable);
+	assert(6 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	const char arr[3] = {'4', '5', '6' };
+	try
+	{
+		f.copy(&arr[0], 8);
+		fail("must fail");
+	} catch (InvalidAccessException&) { }
+
+	f.copy(&arr[0], 3);
+	assert(7 == _notToReadable);
+	assert(6 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(1 == _writableToNot);
+
+	assert (10 == f.size());
+	assert (6 == f.used());
+	assert (4 == f.available());
+
+	f.copy(&arr[0], 4);
+	assert(7 == _notToReadable);
+	assert(6 == _readableToNot);
+	assert(1 == _notToWritable);
+	assert(2 == _writableToNot);
+	assert (f.isFull());
+
+	assert (10 == f.size());
+	assert (10 == f.used());
+	assert (0 == f.available());
+
+	try
+	{
+		f.copy(&arr[0], 1);
+		fail("must fail");
+	} catch (InvalidAccessException&) { }
+
+	f.drain(1);
+	assert(7 == _notToReadable);
+	assert(6 == _readableToNot);
+	assert(2 == _notToWritable);
+	assert(2 == _writableToNot);
+
+	f.drain(9);
+	assert (10 == f.size());
+	assert (0 == f.used());
+	assert (10 == f.available());
+
+	const char e[10] = { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' };
+	f.copy(&e[0], 10);
+	assert (10 == f.size());
+	assert (10 == f.used());
+	assert (0 == f.available());
+	f.drain(1);
+	f.write(e, 1);
+	assert (10 == f.size());
+	assert (10 == f.used());
+	assert (0 == f.available());
+	
+	assert(f[0] == '2');
+	assert(f[1] == '3');
+	assert(f[2] == '4');
+	assert(f[3] == '5');
+	assert(f[4] == '6');
+	assert(f[5] == '7');
+	assert(f[6] == '8');
+	assert(f[7] == '9');
+	assert(f[8] == '0');
+	assert(f[9] == '1');
+
+	f.readable -= delegate(this, &FIFOBufferTest::onReadable);
+	f.writable -= delegate(this, &FIFOBufferTest::onReadable);
+}
+
+
+void FIFOBufferTest::testInt()
+{
+	typedef int T;
+
+	BasicFIFOBuffer<T> f(20);
+	Buffer<T> b(10);
+	std::vector<T> v;
+
+	for (T c = 0; c < 10; ++c)
+		v.push_back(c);
+
+	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
+	f.write(b);
+	assert (20 == f.size());
+	assert (10 == f.used());
+	assert (!f.isEmpty());
+	assert (0 == f[0]);
+	assert (1 == f[1]);
+	assert (2 == f[2]);
+	assert (3 == f[3]);
+	assert (4 == f[4]);
+	assert (5 == f[5]);
+	assert (6 == f[6]);
+	assert (7 == f[7]);
+	assert (8 == f[8]);
+	assert (9 == f[9]);
+
+	b.resize(5);
+	f.read(b, b.size());
+	assert (20 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert (5 == f[0]);
+	assert (6 == f[1]);
+	assert (7 == f[2]);
+	assert (8 == f[3]);
+	assert (9 == f[4]);
+	try { T i = f[10]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+
+	v.clear();
+	for (T c = 10; c < 20; ++c)
+		v.push_back(c);
+
+	b.resize(10);
+	std::memcpy(b.begin(), &v[0], sizeof(T) * v.size());
+	f.write(b);
+	assert (20 == f.size());
+	assert (15 == f.used());
+	assert (!f.isEmpty());
+	assert (5 == f[0]);
+	assert (6 == f[1]);
+	assert (7 == f[2]);
+	assert (8 == f[3]);
+	assert (9 == f[4]);
+	assert (10 == f[5]);
+	assert (11 == f[6]);
+	assert (12 == f[7]);
+	assert (13 == f[8]);
+	assert (14 == f[9]);
+	assert (15 == f[10]);
+	assert (16 == f[11]);
+	assert (17 == f[12]);
+	assert (18 == f[13]);
+	assert (19 == f[14]);
+	try { T i = f[15]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+
+	f.read(b, 10);
+	assert (20 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert (15 == f[0]);
+	assert (16 == f[1]);
+	assert (17 == f[2]);
+	assert (18 == f[3]);
+	assert (19 == f[4]);
+	try { T i = f[5]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+
+	f.read(b, 6);
+	assert (5 == b.size());
+	assert (20 == f.size());
+	assert (0 == f.used());
+	try { T i = f[0]; fail ("must fail"); }
+	catch (InvalidAccessException&) { }
+
+	assert (f.isEmpty());
+
+	assert (5 == f.write(b));
+	assert (20 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert (15 == f[0]);
+	assert (16 == f[1]);
+	assert (17 == f[2]);
+	assert (18 == f[3]);
+	assert (19 == f[4]);
+
+	f.resize(10);
+	assert (10 == f.size());
+	assert (5 == f.used());
+	assert (!f.isEmpty());
+	assert (15 == f[0]);
+	assert (16 == f[1]);
+	assert (17 == f[2]);
+	assert (18 == f[3]);
+	assert(19 == f[4]);
+
+	f.drain(9);
+	assert(10 == f.size());
+	assert(0 == f.used());
+	assert(10 == f.available());
+
+	const int e[10] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
+	f.copy(&e[0], 10);
+	assert(10 == f.size());
+	assert(10 == f.used());
+	assert(0 == f.available());
+	f.drain(1);
+	f.write(e, 1);
+	assert(10 == f.size());
+	assert(10 == f.used());
+	assert(0 == f.available());
+
+	assert(f[0] == 2);
+	assert(f[1] == 3);
+	assert(f[2] == 4);
+	assert(f[3] == 5);
+	assert(f[4] == 6);
+	assert(f[5] == 7);
+	assert(f[6] == 8);
+	assert(f[7] == 9);
+	assert(f[8] == 0);
+	assert(f[9] == 1);
+
+	f.resize(3, false);
+	assert (3 == f.size());
+	assert (0 == f.used());
+	assert (f.isEmpty());
+}
+
+void FIFOBufferTest::setUp()
+{
+	_notToReadable = 0;
+	_notToWritable = 0;
+	_readableToNot = 0;
+	_writableToNot = 0;
+}
+
+
+void FIFOBufferTest::tearDown()
+{
+}
+
+
+CppUnit::Test* FIFOBufferTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("FIFOBufferTest");
+
+	CppUnit_addTest(pSuite, FIFOBufferTest, testNextWrite);
+	CppUnit_addTest(pSuite, FIFOBufferTest, testChar);
+	CppUnit_addTest(pSuite, FIFOBufferTest, testInt);
+	CppUnit_addTest(pSuite, FIFOBufferTest, testEOFAndError);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/FIFOBufferTest.h b/Foundation/testsuite/src/FIFOBufferTest.h
new file mode 100644
index 0000000000..8e4a8a64c2
--- /dev/null
+++ b/Foundation/testsuite/src/FIFOBufferTest.h
@@ -0,0 +1,51 @@
+//
+// FIFOBufferTest.h
+//
+// $Id: //poco/1.6/Foundation/testsuite/src/FIFOBufferTest.h#1 $
+//
+// Definition of the FIFOBufferTest class.
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef FIFOBufferTest_INCLUDED
+#define FIFOBufferTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class FIFOBufferTest: public CppUnit::TestCase
+{
+public:
+	FIFOBufferTest(const std::string& name);
+	~FIFOBufferTest();
+
+	void testNextWrite();
+	void testChar();
+	void testInt();
+	void testEOFAndError();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+protected:
+	void onReadable(bool& b);
+	void onWritable(bool& b);
+
+private:
+	int _notToReadable;
+	int _notToWritable;
+	int _readableToNot;
+	int _writableToNot;
+};
+
+
+#endif // FIFOBufferTest_INCLUDED
diff --git a/Foundation/testsuite/src/FIFOBufferTestSuite.cpp b/Foundation/testsuite/src/FIFOBufferTestSuite.cpp
new file mode 100644
index 0000000000..0e560ef8cf
--- /dev/null
+++ b/Foundation/testsuite/src/FIFOBufferTestSuite.cpp
@@ -0,0 +1,24 @@
+//
+// FIFOBufferTestSuite.cpp
+//
+// $Id: //poco/1.4/Foundation/testsuite/src/FIFOBufferTestSuite.cpp#1 $
+//
+// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "FIFOBufferTestSuite.h"
+#include "FIFOBufferTest.h"
+
+
+CppUnit::Test* FIFOBufferTestSuite::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("FIFOBufferTestSuite");
+
+	pSuite->addTest(FIFOBufferTest::suite());
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/FIFOBufferTestSuite.h b/Foundation/testsuite/src/FIFOBufferTestSuite.h
new file mode 100644
index 0000000000..f0bce19a0a
--- /dev/null
+++ b/Foundation/testsuite/src/FIFOBufferTestSuite.h
@@ -0,0 +1,29 @@
+//
+// FIFOBufferTestSuite.h
+//
+// $Id: //poco/1.6/Foundation/testsuite/src/FIFOBufferTestSuite.h#1 $
+//
+// Definition of the FIFOBufferTestSuite class.
+//
+// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef FIFOBufferTestSuite_INCLUDED
+#define FIFOBufferTestSuite_INCLUDED
+
+
+#include "CppUnit/TestSuite.h"
+
+
+class FIFOBufferTestSuite
+{
+public:
+	static CppUnit::Test* suite();
+};
+
+
+#endif // FIFOBufferTestSuite_INCLUDED
diff --git a/Foundation/testsuite/src/FoundationTestSuite.cpp b/Foundation/testsuite/src/FoundationTestSuite.cpp
index b492d5634e..f188f27907 100644
--- a/Foundation/testsuite/src/FoundationTestSuite.cpp
+++ b/Foundation/testsuite/src/FoundationTestSuite.cpp
@@ -30,6 +30,7 @@
 #include "EventTestSuite.h"
 #include "CacheTestSuite.h"
 #include "HashingTestSuite.h"
+#include "FIFOBufferTestSuite.h"
 
 
 CppUnit::Test* FoundationTestSuite::suite()
@@ -39,6 +40,7 @@ CppUnit::Test* FoundationTestSuite::suite()
 	pSuite->addTest(CoreTestSuite::suite());
 	pSuite->addTest(DateTimeTestSuite::suite());
 	pSuite->addTest(StreamsTestSuite::suite());
+	pSuite->addTest(FIFOBufferTestSuite::suite());
 	pSuite->addTest(CryptTestSuite::suite());
 	pSuite->addTest(NotificationsTestSuite::suite());
 	pSuite->addTest(ThreadingTestSuite::suite());
diff --git a/Foundation/testsuite/src/MemoryStreamTest.cpp b/Foundation/testsuite/src/MemoryStreamTest.cpp
index 4daa68284d..86ea9557ae 100644
--- a/Foundation/testsuite/src/MemoryStreamTest.cpp
+++ b/Foundation/testsuite/src/MemoryStreamTest.cpp
@@ -15,9 +15,9 @@
 #include "CppUnit/TestSuite.h"
 #include "Poco/Buffer.h"
 #include "Poco/MemoryStream.h"
-
 #include <sstream>
 
+
 using Poco::MemoryInputStream;
 using Poco::MemoryOutputStream;
 
@@ -148,7 +148,13 @@ void MemoryStreamTest::testInputSeek()
 	{
 		Poco::MemoryInputStream istr2(buffer.begin(), buffer.size());
 		istr2.seekg(10, std::ios_base::beg);
+#ifdef __APPLE__
+		// workaround for clang libstdc++, which does not
+		// set failbit if seek returns -1
+		assert (istr2.fail() || istr2.tellg() == std::streampos(0));
+#else
 		assert (istr2.fail());
+#endif
 	}
 
 
@@ -159,7 +165,13 @@ void MemoryStreamTest::testInputSeek()
 	{
 		Poco::MemoryInputStream istr2(buffer.begin(), buffer.size());
 		istr2.seekg(-10, std::ios_base::end);
+#ifdef __APPLE__
+		// workaround for clang libstdc++, which does not
+		// set failbit if seek returns -1
+		assert (istr2.fail() || istr2.tellg() == std::streampos(0));
+#else
 		assert (istr2.fail());
+#endif
 	}
 
 
@@ -170,7 +182,13 @@ void MemoryStreamTest::testInputSeek()
 	{
 		Poco::MemoryInputStream istr2(buffer.begin(), buffer.size());
 		istr2.seekg(-1, std::ios_base::beg);
+#ifdef __APPLE__
+		// workaround for clang libstdc++, which does not
+		// set failbit if seek returns -1
+		assert (istr2.fail() || istr2.tellg() == std::streampos(0));
+#else
 		assert (istr2.fail());
+#endif
 	}
 
 
@@ -181,7 +199,13 @@ void MemoryStreamTest::testInputSeek()
 	{
 		Poco::MemoryInputStream istr2(buffer.begin(), buffer.size());
 		istr2.seekg(1, std::ios_base::end);
+#ifdef __APPLE__
+		// workaround for clang libstdc++, which does not
+		// set failbit if seek returns -1
+		assert (istr2.fail() || istr2.tellg() == std::streampos(0));
+#else
 		assert (istr2.fail());
+#endif
 	}
 
 
@@ -196,7 +220,13 @@ void MemoryStreamTest::testInputSeek()
 		Poco::MemoryInputStream istr2(buffer.begin(), buffer.size());
 		istr2.seekg(4, std::ios_base::beg);
 		istr2.seekg(6, std::ios_base::cur);
+#ifdef __APPLE__
+		// workaround for clang libstdc++, which does not
+		// set failbit if seek returns -1
+		assert (istr2.fail() || istr2.tellg() == std::streampos(4));
+#else
 		assert (istr2.fail());
+#endif
 	}
 
 
@@ -211,7 +241,13 @@ void MemoryStreamTest::testInputSeek()
 		Poco::MemoryInputStream istr2(buffer.begin(), buffer.size());
 		istr2.seekg(-4, std::ios_base::end);
 		istr2.seekg(5, std::ios_base::cur);
+#ifdef __APPLE__
+		// workaround for clang libstdc++, which does not
+		// set failbit if seek returns -1
+		assert (istr2.fail() || istr2.tellg() == std::streampos(5));
+#else
 		assert (istr2.fail());
+#endif
 	}
 
 
@@ -226,7 +262,13 @@ void MemoryStreamTest::testInputSeek()
 		Poco::MemoryInputStream istr2(buffer.begin(), buffer.size());
 		istr2.seekg(4, std::ios_base::beg);
 		istr2.seekg(-5, std::ios_base::cur);
+#ifdef __APPLE__
+		// workaround for clang libstdc++, which does not
+		// set failbit if seek returns -1
+		assert (istr2.fail() || istr2.tellg() == std::streampos(4));
+#else
 		assert (istr2.fail());
+#endif
 	}
 }
 
diff --git a/Foundation/testsuite/src/TaskManagerTest.cpp b/Foundation/testsuite/src/TaskManagerTest.cpp
index 6deb5c50be..85d5ea11bf 100644
--- a/Foundation/testsuite/src/TaskManagerTest.cpp
+++ b/Foundation/testsuite/src/TaskManagerTest.cpp
@@ -246,7 +246,7 @@ TaskManagerTest::~TaskManagerTest()
 
 void TaskManagerTest::testFinish()
 {
-	TaskManager tm;
+	TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
 	TaskObserver to;
 	tm.addObserver(Observer<TaskObserver, TaskStartedNotification>(to, &TaskObserver::taskStarted));
 	tm.addObserver(Observer<TaskObserver, TaskCancelledNotification>(to, &TaskObserver::taskCancelled));
@@ -281,7 +281,7 @@ void TaskManagerTest::testFinish()
 
 void TaskManagerTest::testCancel()
 {
-	TaskManager tm;
+	TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
 	TaskObserver to;
 	tm.addObserver(Observer<TaskObserver, TaskStartedNotification>(to, &TaskObserver::taskStarted));
 	tm.addObserver(Observer<TaskObserver, TaskCancelledNotification>(to, &TaskObserver::taskCancelled));
@@ -315,7 +315,7 @@ void TaskManagerTest::testCancel()
 
 void TaskManagerTest::testError()
 {
-	TaskManager tm;
+	TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
 	TaskObserver to;
 	tm.addObserver(Observer<TaskObserver, TaskStartedNotification>(to, &TaskObserver::taskStarted));
 	tm.addObserver(Observer<TaskObserver, TaskCancelledNotification>(to, &TaskObserver::taskCancelled));
@@ -348,7 +348,7 @@ void TaskManagerTest::testError()
 
 void TaskManagerTest::testCustom()
 {
-	TaskManager tm;
+	TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
 	
 	CustomTaskObserver<int> ti(0);
 	tm.addObserver(
@@ -431,7 +431,7 @@ void TaskManagerTest::testCustom()
 
 void TaskManagerTest::testMultiTasks()
 {
-	TaskManager tm;
+	TaskManager tm(ThreadPool::TAP_UNIFORM_DISTRIBUTION);
 	tm.start(new SimpleTask);
 	tm.start(new SimpleTask);
 	tm.start(new SimpleTask);
@@ -447,7 +447,7 @@ void TaskManagerTest::testMultiTasks()
 
 void TaskManagerTest::testCustomThreadPool()
 {
-	ThreadPool  tp(2, 5, 120);
+	ThreadPool  tp(2, 5, 120, POCO_THREAD_STACK_SIZE, ThreadPool::TAP_UNIFORM_DISTRIBUTION);
 	TaskManager tm(tp);
 
 	// fill up the thread pool
diff --git a/Foundation/testsuite/src/ThreadPoolTest.cpp b/Foundation/testsuite/src/ThreadPoolTest.cpp
index 3083f90f02..3ec9cd262e 100644
--- a/Foundation/testsuite/src/ThreadPoolTest.cpp
+++ b/Foundation/testsuite/src/ThreadPoolTest.cpp
@@ -35,9 +35,15 @@ ThreadPoolTest::~ThreadPoolTest()
 }
 
 
-void ThreadPoolTest::testThreadPool()
+void ThreadPoolTest::startThreadPoolTest(int affinityPolicy)
 {
-	ThreadPool pool(2, 3, 3);
+	int cpu = -1;
+	if (affinityPolicy == static_cast<int>(ThreadPool::TAP_CUSTOM)) 
+	{
+		cpu = 0;
+	}
+
+	ThreadPool pool(2, 3, 3, POCO_THREAD_STACK_SIZE, static_cast<ThreadPool::ThreadAffinityPolicy>(affinityPolicy));
 	pool.setStackSize(1);
 
 	assert (pool.allocated() == 2);
@@ -51,25 +57,25 @@ void ThreadPoolTest::testThreadPool()
 	assert (pool.available() == 4);
 
 	RunnableAdapter<ThreadPoolTest> ra(*this, &ThreadPoolTest::count);
-	pool.start(ra);
+	pool.start(ra, cpu);
 	assert (pool.allocated() == 2);
 	assert (pool.used() == 1);
 	assert (pool.capacity() == 4);
 	assert (pool.available() == 3);
 
-	pool.start(ra);
+	pool.start(ra, cpu);
 	assert (pool.allocated() == 2);
 	assert (pool.used() == 2);
 	assert (pool.capacity() == 4);
 	assert (pool.available() == 2);
 
-	pool.start(ra);
+	pool.start(ra, cpu);
 	assert (pool.allocated() == 3);
 	assert (pool.used() == 3);
 	assert (pool.capacity() == 4);
 	assert (pool.available() == 1);
 
-	pool.start(ra);
+	pool.start(ra, cpu);
 	assert (pool.allocated() == 4);
 	assert (pool.used() == 4);
 	assert (pool.capacity() == 4);
@@ -77,7 +83,7 @@ void ThreadPoolTest::testThreadPool()
 
 	try
 	{
-		pool.start(ra);
+		pool.start(ra, cpu);
 		failmsg("thread pool exhausted - must throw exception");
 	}	
 	catch (Poco::NoThreadAvailableException&)
@@ -108,13 +114,13 @@ void ThreadPoolTest::testThreadPool()
 	
 	_count = 0;
 	_event.reset();
-	pool.start(ra);
+	pool.start(ra, cpu);
 	assert (pool.allocated() == 2);
 	assert (pool.used() == 1);
 	assert (pool.capacity() == 4);
 	assert (pool.available() == 3);
 
-	pool.start(ra);
+	pool.start(ra, cpu);
 	assert (pool.allocated() == 2);
 	assert (pool.used() == 2);
 	assert (pool.capacity() == 4);
@@ -127,7 +133,25 @@ void ThreadPoolTest::testThreadPool()
 	assert (pool.allocated() == 2);
 	assert (pool.used() == 0);
 	assert (pool.capacity() == 4);
-	assert (pool.available() == 4);
+	assert (pool.available() == 4);	
+}
+
+
+void ThreadPoolTest::testThreadPool()
+{
+	startThreadPoolTest(Poco::ThreadPool::TAP_DEFAULT);
+}
+
+
+void ThreadPoolTest::testThreadPoolUniformDistribution()
+{
+	startThreadPoolTest(Poco::ThreadPool::TAP_UNIFORM_DISTRIBUTION);
+}
+
+
+void ThreadPoolTest::testThreadPoolCustomDistribution()
+{
+	startThreadPoolTest(Poco::ThreadPool::TAP_CUSTOM);
 }
 
 
@@ -160,6 +184,8 @@ CppUnit::Test* ThreadPoolTest::suite()
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ThreadPoolTest");
 
 	CppUnit_addTest(pSuite, ThreadPoolTest, testThreadPool);
+	CppUnit_addTest(pSuite, ThreadPoolTest, testThreadPoolUniformDistribution);
+	CppUnit_addTest(pSuite, ThreadPoolTest, testThreadPoolCustomDistribution);
 
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/ThreadPoolTest.h b/Foundation/testsuite/src/ThreadPoolTest.h
index 80e662bd7e..1da8babd21 100644
--- a/Foundation/testsuite/src/ThreadPoolTest.h
+++ b/Foundation/testsuite/src/ThreadPoolTest.h
@@ -29,7 +29,9 @@ class ThreadPoolTest: public CppUnit::TestCase
 	~ThreadPoolTest();
 
 	void testThreadPool();
-
+	void testThreadPoolUniformDistribution();
+	void testThreadPoolCustomDistribution();
+	
 	void setUp();
 	void tearDown();
 
@@ -39,6 +41,7 @@ class ThreadPoolTest: public CppUnit::TestCase
 	void count();
 
 private:
+	void startThreadPoolTest(int affinityPolicy);
 	Poco::FastMutex _mutex;
 	Poco::Event _event;
 	int   _count;
diff --git a/Foundation/testsuite/src/ThreadTest.cpp b/Foundation/testsuite/src/ThreadTest.cpp
index e9fa730720..199ba1c8e0 100644
--- a/Foundation/testsuite/src/ThreadTest.cpp
+++ b/Foundation/testsuite/src/ThreadTest.cpp
@@ -19,12 +19,13 @@
 #include "Poco/Event.h"
 #include "Poco/Timestamp.h"
 #include "Poco/Timespan.h"
-//#include <iostream>
+#include "Poco/Environment.h"
 #if defined(__sun) && defined(__SVR4) && !defined(__EXTENSIONS__)
 #define __EXTENSIONS__
 #endif
 #include <climits>
-
+#include <vector>
+#include <sstream>
 
 using Poco::Thread;
 using Poco::Runnable;
@@ -38,7 +39,7 @@ class MyRunnable: public Runnable
 	MyRunnable(): _ran(false)
 	{
 	}
-	
+
 	void run()
 	{
 		Thread* pThread = Thread::current();
@@ -47,22 +48,22 @@ class MyRunnable: public Runnable
 		_ran = true;
 		_event.wait();
 	}
-	
+
 	bool ran() const
 	{
 		return _ran;
 	}
-	
+
 	const std::string& threadName() const
 	{
 		return _threadName;
 	}
-	
+
 	void notify()
 	{
 		_event.set();
 	}
-	
+
 	static void staticFunc()
 	{
 		++_staticVar;
@@ -98,17 +99,17 @@ class NonJoinRunnable : public Runnable
 	NonJoinRunnable() : _finished(false)
 	{
 	}
-	
+
 	void run()
 	{
 		_finished = true;
 	}
-	
+
 	bool finished() const
 	{
 		return _finished;
 	}
-	
+
 private:
 	bool _finished;
 };
@@ -266,12 +267,12 @@ void ThreadTest::testNotJoin()
 	Thread thread;
 	NonJoinRunnable r;
 	thread.start(r);
-	
+
 	while (!r.finished())
 	{
 		Thread::sleep(10);
 	}
-	
+
 	Thread::sleep(100);
 	assert (!thread.isRunning());
 }
@@ -291,12 +292,14 @@ void ThreadTest::testTrySleep()
 	Thread::sleep(100);
 	assert(r.counter() == 0);
 	assert(r.isSleepy());
-	thread.wakeUp(); Thread::sleep(10);
+	thread.wakeUp();
+	Thread::sleep(10);
 	assert(r.counter() == 1);
 	assert(r.isSleepy());
 	Thread::sleep(100);
 	assert(r.counter() == 1);
-	thread.wakeUp(); Thread::sleep(10);
+	thread.wakeUp();
+	Thread::sleep(10);
 	assert(r.counter() == 2);
 	assert(r.isSleepy());
 	Thread::sleep(200);
@@ -392,7 +395,10 @@ void ThreadTest::testThreadFunctor()
 	assert (!thread2.isRunning());
 
 	MyRunnable::_staticVar = 0;
-	thread.startFunc([] () {MyRunnable::_staticVar++;});
+	thread.startFunc([] ()
+	{
+		MyRunnable::_staticVar++;
+	});
 	thread.join();
 	assert (1 == MyRunnable::_staticVar);
 
@@ -420,11 +426,11 @@ void ThreadTest::testThreadStackSize()
 	thread.setStackSize(stackSize);
 
 #if !defined(POCO_OS_FAMILY_BSD) // on BSD family, stack size is rounded
-	#ifdef PTHREAD_STACK_MIN
-		assert (PTHREAD_STACK_MIN == thread.getStackSize());
-	#else
-		assert (stackSize >= thread.getStackSize());
-	#endif
+#ifdef PTHREAD_STACK_MIN
+	assert (PTHREAD_STACK_MIN == thread.getStackSize());
+#else
+	assert (stackSize >= thread.getStackSize());
+#endif
 #endif
 
 	tmp = MyRunnable::_staticVar;
@@ -449,6 +455,49 @@ void ThreadTest::testSleep()
 	assert (elapsed.totalMilliseconds() >= 190 && elapsed.totalMilliseconds() < 250);
 }
 
+void ThreadTest::testAffinity()
+{
+	std::stringstream ss;
+	unsigned cpuCount = Poco::Environment::processorCount();
+	unsigned usedCpu = 0;
+	std::vector<Thread*> threadList;
+	Thread* thread = NULL;
+	std::vector<MyRunnable*> runnableList;
+	MyRunnable* runbl = NULL;
+
+	for (unsigned i = 0; i < cpuCount; i++)
+	{
+		ss.str("");
+		ss << "Thread" << i;
+		thread = new Thread(ss.str());
+		threadList.push_back(thread);
+		runbl = new MyRunnable();
+		runnableList.push_back(runbl);
+	}
+
+	for (int i = 0; i < cpuCount; i++)
+	{
+		assert (!threadList[i]->isRunning());
+	}
+
+	for (int i = 0; i < cpuCount; i++)
+	{
+		threadList[i]->start(*runnableList[i]);
+		threadList[i]->setAffinity(i);
+		Thread::sleep(100);
+		usedCpu = threadList[i]->getAffinity();
+		assert (usedCpu == i || usedCpu == -1);
+	}
+
+	for (int i = 0; i < cpuCount; i++)
+	{
+		runnableList[i]->notify();
+		threadList[i]->join();
+		delete runnableList[i];
+		delete threadList[i];
+	}
+}
+
 
 void ThreadTest::setUp()
 {
@@ -478,6 +527,7 @@ CppUnit::Test* ThreadTest::suite()
 	CppUnit_addTest(pSuite, ThreadTest, testThreadFunctor);
 	CppUnit_addTest(pSuite, ThreadTest, testThreadStackSize);
 	CppUnit_addTest(pSuite, ThreadTest, testSleep);
+	CppUnit_addTest(pSuite, ThreadTest, testAffinity);
 
 	return pSuite;
 }
diff --git a/Foundation/testsuite/src/ThreadTest.h b/Foundation/testsuite/src/ThreadTest.h
index 3e9f50dae1..4aa6e51872 100644
--- a/Foundation/testsuite/src/ThreadTest.h
+++ b/Foundation/testsuite/src/ThreadTest.h
@@ -23,28 +23,29 @@
 class ThreadTest: public CppUnit::TestCase
 {
 public:
-	ThreadTest(const std::string& name);
-	~ThreadTest();
-
-	void testThread();
-	void testNamedThread();
-	void testCurrent();
-	void testThreads();
-	void testJoin();
-	void testNotJoin();
-	void testNotRun();
-	void testNotRunJoin();
-	void testTrySleep();
-	void testThreadTarget();
-	void testThreadFunction();
-	void testThreadFunctor();
-	void testThreadStackSize();
-	void testSleep();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
+    ThreadTest(const std::string& name);
+    ~ThreadTest();
+
+    void testThread();
+    void testNamedThread();
+    void testCurrent();
+    void testThreads();
+    void testJoin();
+    void testNotJoin();
+    void testNotRun();
+    void testNotRunJoin();
+    void testTrySleep();
+    void testThreadTarget();
+    void testThreadFunction();
+    void testThreadFunctor();
+    void testThreadStackSize();
+    void testSleep();
+    void testAffinity();
+
+    void setUp();
+    void tearDown();
+
+    static CppUnit::Test* suite();
 
 private:
 };
diff --git a/MongoDB/include/Poco/MongoDB/Binary.h b/MongoDB/include/Poco/MongoDB/Binary.h
index 8bb3833234..ea95bfbd0f 100644
--- a/MongoDB/include/Poco/MongoDB/Binary.h
+++ b/MongoDB/include/Poco/MongoDB/Binary.h
@@ -117,6 +117,7 @@ inline void BSONReader::read<Binary::Ptr>(Binary::Ptr& to)
 template<>
 inline void BSONWriter::write<Binary::Ptr>(Binary::Ptr& from)
 {
+	_writer << (Poco::Int32) from->buffer().size();
 	_writer << from->subtype();
 	_writer.writeRaw((char*) from->buffer().begin(), from->buffer().size());
 }
diff --git a/MongoDB/include/Poco/MongoDB/Database.h b/MongoDB/include/Poco/MongoDB/Database.h
index a6ccff8ebb..946df111ee 100644
--- a/MongoDB/include/Poco/MongoDB/Database.h
+++ b/MongoDB/include/Poco/MongoDB/Database.h
@@ -45,7 +45,7 @@ class MongoDB_API Database
 	virtual ~Database();
 		/// Destructor
 
-	double count(Connection& connection, const std::string& collectionName) const;
+	int count(Connection& connection, const std::string& collectionName) const;
 		/// Sends a count request for the given collection to MongoDB. When
 		/// the command fails, -1 is returned.
 
diff --git a/MongoDB/src/Database.cpp b/MongoDB/src/Database.cpp
index be4b1518c8..27186c3173 100644
--- a/MongoDB/src/Database.cpp
+++ b/MongoDB/src/Database.cpp
@@ -32,7 +32,7 @@ Database::~Database()
 }
 
 
-double Database::count(Connection& connection, const std::string& collectionName) const
+int Database::count(Connection& connection, const std::string& collectionName) const
 {
 	Poco::SharedPtr<Poco::MongoDB::QueryRequest> countRequest = createCountRequest(collectionName);
 
@@ -42,7 +42,7 @@ double Database::count(Connection& connection, const std::string& collectionName
 	if ( response.documents().size() > 0 )
 	{
 		Poco::MongoDB::Document::Ptr doc = response.documents()[0];
-		return doc->get<double>("n");
+		return doc->get<int>("n");
 	}
 
 	return -1;
diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp
index 09024c75c7..e55418fefb 100644
--- a/MongoDB/testsuite/src/MongoDBTest.cpp
+++ b/MongoDB/testsuite/src/MongoDBTest.cpp
@@ -221,7 +221,8 @@ void MongoDBTest::testCountCommand()
 	if ( response.documents().size() > 0 )
 	{
 		Poco::MongoDB::Document::Ptr doc = response.documents()[0];
-		double count = doc->get<double>("n");
+		std::cout << doc->toString() << std::endl;
+		int count = doc->get<int>("n");
 		assert(count == 1);
 	}
 	else
@@ -248,7 +249,7 @@ void MongoDBTest::testDBCountCommand()
 	if ( response.documents().size() > 0 )
 	{
 		Poco::MongoDB::Document::Ptr doc = response.documents()[0];
-		double count = doc->get<double>("n");
+		int count = doc->get<int>("n");
 		assert(count == 1);
 	}
 	else
@@ -267,7 +268,7 @@ void MongoDBTest::testDBCount2Command()
 	}
 
 	Poco::MongoDB::Database db("team");
-	double count = db.count(_mongo, "players");
+	int count = db.count(_mongo, "players");
 	assert(count == 1);
 }
 
@@ -305,7 +306,8 @@ void MongoDBTest::testCursorRequest()
 	}
 	_mongo.sendRequest(*insertRequest);
 
-	double count = db.count(_mongo, "numbers");
+	int count = db.count(_mongo, "numbers");
+	std::cout << "count= " << count << std::endl;
 	assert(count == 10000);
 
 	Poco::MongoDB::Cursor cursor("team", "numbers");
@@ -390,7 +392,7 @@ void MongoDBTest::testConnectionPool()
 	if ( response.documents().size() > 0 )
 	{
 		Poco::MongoDB::Document::Ptr doc = response.documents()[0];
-		double count = doc->get<double>("n");
+		int count = doc->get<int>("n");
 		assert(count == 1);
 	}
 	else
diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h
index f16c2ff5c6..695f7d4de3 100644
--- a/Net/include/Poco/Net/FTPClientSession.h
+++ b/Net/include/Poco/Net/FTPClientSession.h
@@ -227,7 +227,7 @@ class Net_API FTPClientSession
 	std::ostream& beginUpload(const std::string& path);
 		/// Starts uploading the file with the given name.
 		/// After all data has been written to the returned stream,
-		/// endUpload() must be called to finish the download.
+		/// endUpload() must be called to finish the upload.
 		///
 		/// A stream for reading the file's content is returned.
 		/// The stream is valid until endUpload() is called.
diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h
index 04e4e3ab47..e7514c0ead 100644
--- a/Net/include/Poco/Net/HTTPClientSession.h
+++ b/Net/include/Poco/Net/HTTPClientSession.h
@@ -45,7 +45,7 @@ class Net_API HTTPClientSession: public HTTPSession
 	/// specify the server's host name and port number.
 	///
 	/// Then create a HTTPRequest object, fill it accordingly,
-	/// and pass it as argument to the sendRequst() method.
+	/// and pass it as argument to the sendRequest() method.
 	///
 	/// sendRequest() will return an output stream that can
 	/// be used to send the request body, if there is any.
diff --git a/Net/include/Poco/Net/IPAddress.h b/Net/include/Poco/Net/IPAddress.h
index b182ff9bb9..8dc290c659 100644
--- a/Net/include/Poco/Net/IPAddress.h
+++ b/Net/include/Poco/Net/IPAddress.h
@@ -26,6 +26,7 @@
 #include "Poco/AutoPtr.h"
 #include "Poco/Exception.h"
 #include <vector>
+#include <ostream>
 
 
 namespace Poco {
@@ -413,6 +414,11 @@ class Net_API IPAddress
 };
 
 
+//
+// inlines
+//
+
+
 inline void IPAddress::destruct()
 {
 #ifdef POCO_HAVE_ALIGNMENT
@@ -510,11 +516,12 @@ inline char* IPAddress::storage()
 #endif
 
 
-BinaryWriter& operator << (BinaryWriter& writer, const IPAddress& value);
-BinaryReader& operator >> (BinaryReader& reader, IPAddress& value);
+} } // namespace Poco::Net
 
 
-} } // namespace Poco::Net
+Net_API Poco::BinaryWriter& operator << (Poco::BinaryWriter& writer, const Poco::Net::IPAddress& value);
+Net_API Poco::BinaryReader& operator >> (Poco::BinaryReader& reader, Poco::Net::IPAddress& value);
+Net_API std::ostream& operator << (std::ostream& ostr, const Poco::Net::IPAddress& addr);
 
 
 #endif // Net_IPAddress_INCLUDED
diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h
index ee4f118c5e..d0f5135679 100644
--- a/Net/include/Poco/Net/NetworkInterface.h
+++ b/Net/include/Poco/Net/NetworkInterface.h
@@ -30,6 +30,7 @@
 #include "Poco/Mutex.h"
 #include "Poco/Tuple.h"
 #include <map>
+#include <ostream>
 
 
 namespace Poco {
@@ -342,7 +343,7 @@ inline bool NetworkInterface::operator == (const NetworkInterface& other) const
 } } // namespace Poco::Net
 
 
-Net_API std::ostream& operator<<(std::ostream& os, const Poco::Net::NetworkInterface::MACAddress& mac);
+Net_API std::ostream& operator << (std::ostream& ostr, const Poco::Net::NetworkInterface::MACAddress& addr);
 
 
 #endif // POCO_NET_HAS_INTERFACE
diff --git a/Net/include/Poco/Net/SocketAddress.h b/Net/include/Poco/Net/SocketAddress.h
index 4c92f4e4fd..ee1029ed48 100644
--- a/Net/include/Poco/Net/SocketAddress.h
+++ b/Net/include/Poco/Net/SocketAddress.h
@@ -22,9 +22,14 @@
 
 #include "Poco/Net/Net.h"
 #include "Poco/Net/SocketAddressImpl.h"
+#include <ostream>
 
 
 namespace Poco {
+
+class BinaryReader;
+class BinaryWriter;
+
 namespace Net {
 
 
@@ -276,4 +281,9 @@ inline bool SocketAddress::operator != (const SocketAddress& socketAddress) cons
 } } // namespace Poco::Net
 
 
+Net_API Poco::BinaryWriter& operator << (Poco::BinaryWriter& writer, const Poco::Net::SocketAddress& value);
+Net_API Poco::BinaryReader& operator >> (Poco::BinaryReader& reader, Poco::Net::SocketAddress& value);
+Net_API std::ostream& operator << (std::ostream& ostr, const Poco::Net::SocketAddress& address);
+
+
 #endif // Net_SocketAddress_INCLUDED
diff --git a/Net/include/Poco/Net/WebSocket.h b/Net/include/Poco/Net/WebSocket.h
index 173eae6839..dc372931a4 100644
--- a/Net/include/Poco/Net/WebSocket.h
+++ b/Net/include/Poco/Net/WebSocket.h
@@ -23,6 +23,7 @@
 #include "Poco/Net/Net.h"
 #include "Poco/Net/StreamSocket.h"
 #include "Poco/Net/HTTPCredentials.h"
+#include "Poco/Buffer.h"
 
 
 namespace Poco {
@@ -221,6 +222,21 @@ class Net_API WebSocket: public StreamSocket
 		/// The frame flags and opcode (FrameFlags and FrameOpcodes)
 		/// is stored in flags.
 		
+	int receiveFrame(Poco::Buffer<char>& buffer, int& flags);
+		/// Receives a frame from the socket and stores it
+		/// after any previous content in buffer.
+		///
+		/// Returns the number of bytes received.
+		/// A return value of 0 means that the peer has
+		/// shut down or closed the connection.
+		///
+		/// Throws a TimeoutException if a receive timeout has
+		/// been set and nothing is received within that interval.
+		/// Throws a NetException (or a subclass) in case of other errors.
+		///
+		/// The frame flags and opcode (FrameFlags and FrameOpcodes)
+		/// is stored in flags.
+
 	Mode mode() const;
 		/// Returns WS_SERVER if the WebSocket is a server-side
 		/// WebSocket, or WS_CLIENT otherwise.
diff --git a/Net/include/Poco/Net/WebSocketImpl.h b/Net/include/Poco/Net/WebSocketImpl.h
index b631a5d2e4..648dac9eec 100644
--- a/Net/include/Poco/Net/WebSocketImpl.h
+++ b/Net/include/Poco/Net/WebSocketImpl.h
@@ -21,6 +21,7 @@
 
 
 #include "Poco/Net/StreamSocketImpl.h"
+#include "Poco/Buffer.h"
 #include "Poco/Random.h"
 
 
@@ -43,6 +44,9 @@ class Net_API WebSocketImpl: public StreamSocketImpl
 	virtual int receiveBytes(void* buffer, int length, int flags);
 		/// Receives a WebSocket protocol frame.
 		
+	virtual int receiveBytes(Poco::Buffer<char>& buffer, int flags);
+		/// Receives a WebSocket protocol frame.
+
 	virtual SocketImpl* acceptConnection(SocketAddress& clientAddr);
 	virtual void connect(const SocketAddress& address);
 	virtual void connect(const SocketAddress& address, const Poco::Timespan& timeout);
@@ -77,6 +81,9 @@ class Net_API WebSocketImpl: public StreamSocketImpl
 		MAX_HEADER_LENGTH = 14
 	};
 	
+	int receiveHeader(char mask[4], bool& useMask);
+	int receivePayload(char *buffer, int payloadLength, char mask[4], bool useMask);
+
 	int receiveNBytes(void* buffer, int bytes);
 	virtual ~WebSocketImpl();
 
diff --git a/Net/src/IPAddress.cpp b/Net/src/IPAddress.cpp
index 783d90a813..326fbbe9bc 100644
--- a/Net/src/IPAddress.cpp
+++ b/Net/src/IPAddress.cpp
@@ -563,19 +563,30 @@ IPAddress IPAddress::broadcast()
 }
 
 
-BinaryWriter& operator << (BinaryWriter& writer, const IPAddress& value)
+} } // namespace Poco::Net
+
+
+Poco::BinaryWriter& operator << (Poco::BinaryWriter& writer, const Poco::Net::IPAddress& value)
 {
-	writer.stream().write((const char*) value.addr(), value.length());
+	writer << static_cast<Poco::UInt8>(value.length());
+	writer.writeRaw(reinterpret_cast<const char*>(value.addr()), value.length());
 	return writer;
 }
 
-BinaryReader& operator >> (BinaryReader& reader, IPAddress& value)
+
+Poco::BinaryReader& operator >> (Poco::BinaryReader& reader, Poco::Net::IPAddress& value)
 {
 	char buf[sizeof(struct in6_addr)];
-	reader.stream().read(buf, value.length());
-	value = IPAddress(buf, value.length());
+	Poco::UInt8 length;
+	reader >> length;
+	reader.readRaw(buf, length);
+	value = Poco::Net::IPAddress(buf, length);
 	return reader;
 }
 
 
-} } // namespace Poco::Net
+std::ostream& operator << (std::ostream& ostr, const Poco::Net::IPAddress& addr)
+{
+	ostr << addr.toString();
+	return ostr;
+}
diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp
index e8140afec6..584264137a 100644
--- a/Net/src/NetworkInterface.cpp
+++ b/Net/src/NetworkInterface.cpp
@@ -38,12 +38,13 @@
 #include <iostream>
 #include <iomanip>
 
+
 using Poco::NumberFormatter;
 using Poco::FastMutex;
 using Poco::format;
 
 
-std::ostream& operator<<(std::ostream& os, const Poco::Net::NetworkInterface::MACAddress& mac)
+std::ostream& operator << (std::ostream& os, const Poco::Net::NetworkInterface::MACAddress& mac)
 {
 	std::ios state(0);
 	state.copyfmt(os);
@@ -1356,6 +1357,7 @@ namespace Net {
 
 namespace {
 
+
 NetworkInterface::Type fromNative(u_char nativeType)
 {
 	switch (nativeType)
@@ -1376,6 +1378,7 @@ NetworkInterface::Type fromNative(u_char nativeType)
 	}
 }
 
+
 void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
 {
 	struct sockaddr_dl* sdl = (struct sockaddr_dl*) iface->ifa_addr;
@@ -1388,6 +1391,7 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
 	impl.setType(fromNative(sdl->sdl_type));
 }
 
+
 } // namespace
 
 
@@ -1525,6 +1529,7 @@ namespace Net {
 
 namespace {
 
+
 static NetworkInterface::Type fromNative(unsigned arphrd)
 {
 	switch (arphrd)
@@ -1559,6 +1564,7 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
 
 #endif
 
+
 }
 
 
diff --git a/Net/src/SocketAddress.cpp b/Net/src/SocketAddress.cpp
index ac3da51f0c..cf2721d742 100644
--- a/Net/src/SocketAddress.cpp
+++ b/Net/src/SocketAddress.cpp
@@ -21,6 +21,8 @@
 #include "Poco/RefCountedObject.h"
 #include "Poco/NumberParser.h"
 #include "Poco/NumberFormatter.h"
+#include "Poco/BinaryReader.h"
+#include "Poco/BinaryWriter.h"
 #include <algorithm>
 #include <cstring>
 
@@ -268,3 +270,29 @@ Poco::UInt16 SocketAddress::resolveService(const std::string& service)
 
 
 } } // namespace Poco::Net
+
+
+Poco::BinaryWriter& operator << (Poco::BinaryWriter& writer, const Poco::Net::SocketAddress& value)
+{
+	writer << value.host();
+	writer << value.port();
+	return writer;
+}
+
+
+Poco::BinaryReader& operator >> (Poco::BinaryReader& reader, Poco::Net::SocketAddress& value)
+{
+	Poco::Net::IPAddress host;
+	reader >> host;
+	Poco::UInt16 port;
+	reader >> port;
+	value = Poco::Net::SocketAddress(host, port);
+	return reader;
+}
+
+
+inline std::ostream& operator << (std::ostream& ostr, const Poco::Net::SocketAddress& address)
+{
+	ostr << address.toString();
+	return ostr;
+}
diff --git a/Net/src/WebSocket.cpp b/Net/src/WebSocket.cpp
index 5950a6a9d9..ca09c59991 100644
--- a/Net/src/WebSocket.cpp
+++ b/Net/src/WebSocket.cpp
@@ -29,6 +29,7 @@
 #include "Poco/String.h"
 #include "Poco/Random.h"
 #include "Poco/StreamCopier.h"
+#include "Poco/Buffer.h"
 #include <sstream>
 
 
@@ -114,6 +115,14 @@ int WebSocket::receiveFrame(void* buffer, int length, int& flags)
 }
 
 	
+int WebSocket::receiveFrame(Poco::Buffer<char>& buffer, int& flags)
+{
+	int n = static_cast<WebSocketImpl*>(impl())->receiveBytes(buffer, 0);
+	flags = static_cast<WebSocketImpl*>(impl())->frameFlags();
+	return n;
+}
+
+
 WebSocket::Mode WebSocket::mode() const
 {
 	return static_cast<WebSocketImpl*>(impl())->mustMaskPayload() ? WS_CLIENT : WS_SERVER;
diff --git a/Net/src/WebSocketImpl.cpp b/Net/src/WebSocketImpl.cpp
index 4ed6354d62..92a56aebf5 100644
--- a/Net/src/WebSocketImpl.cpp
+++ b/Net/src/WebSocketImpl.cpp
@@ -104,7 +104,7 @@ int WebSocketImpl::sendBytes(const void* buffer, int length, int flags)
 }
 
 	
-int WebSocketImpl::receiveBytes(void* buffer, int length, int)
+int WebSocketImpl::receiveHeader(char mask[4], bool& useMask)
 {
 	char header[MAX_HEADER_LENGTH];
 	int n = receiveNBytes(header, 2);
@@ -114,82 +114,100 @@ int WebSocketImpl::receiveBytes(void* buffer, int length, int)
 		return n;
 	}
 	poco_assert (n == 2);
+	Poco::UInt8 flags = static_cast<Poco::UInt8>(header[0]);
+	_frameFlags = flags;
 	Poco::UInt8 lengthByte = static_cast<Poco::UInt8>(header[1]);
-	int maskOffset = 0;
-	if (lengthByte & FRAME_FLAG_MASK) maskOffset += 4;
+	useMask = ((lengthByte & FRAME_FLAG_MASK) != 0);
+	int payloadLength;
 	lengthByte &= 0x7f;
-	if (lengthByte > 0 || maskOffset > 0)
+	if (lengthByte == 127)
 	{
-		if (lengthByte + 2 + maskOffset < MAX_HEADER_LENGTH)
+		n = receiveNBytes(header + 2, 8);
+		if (n <= 0)
 		{
-			n = receiveNBytes(header + 2, lengthByte + maskOffset);
+			_frameFlags = 0;
+			return n;
 		}
-		else
-		{
-			n = receiveNBytes(header + 2, MAX_HEADER_LENGTH - 2);
-		}
-		if (n <= 0) throw WebSocketException("Incomplete header received", WebSocket::WS_ERR_INCOMPLETE_FRAME);
-		n += 2;
-	}
-	Poco::MemoryInputStream istr(header, n);
-	Poco::BinaryReader reader(istr, Poco::BinaryReader::NETWORK_BYTE_ORDER);
-	Poco::UInt8 flags;
-	char mask[4];
-	reader >> flags >> lengthByte;
-	_frameFlags = flags;
-	int payloadLength = 0;
-	int payloadOffset = 2;
-	if ((lengthByte & 0x7f) == 127)
-	{
+		Poco::MemoryInputStream istr(header + 2, 8);
+		Poco::BinaryReader reader(istr, Poco::BinaryReader::NETWORK_BYTE_ORDER);
 		Poco::UInt64 l;
 		reader >> l;
-		if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %Lu", l), WebSocket::WS_ERR_PAYLOAD_TOO_BIG);
 		payloadLength = static_cast<int>(l);
-		payloadOffset += 8;
-	}
-	else if ((lengthByte & 0x7f) == 126)
+	} else if (lengthByte == 126)
 	{
+		n = receiveNBytes(header + 2, 2);
+		if (n <= 0)
+		{
+			_frameFlags = 0;
+			return n;
+		}
+		Poco::MemoryInputStream istr(header + 2, 2);
+		Poco::BinaryReader reader(istr, Poco::BinaryReader::NETWORK_BYTE_ORDER);
 		Poco::UInt16 l;
 		reader >> l;
-		if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %hu", l), WebSocket::WS_ERR_PAYLOAD_TOO_BIG);
 		payloadLength = static_cast<int>(l);
-		payloadOffset += 2;
 	}
 	else
 	{
-		Poco::UInt8 l = lengthByte & 0x7f;
-		if (l > length) throw WebSocketException(Poco::format("Insufficient buffer for payload size %u", unsigned(l)), WebSocket::WS_ERR_PAYLOAD_TOO_BIG);
-		payloadLength = static_cast<int>(l);
-	}
-	if (lengthByte & FRAME_FLAG_MASK)
-	{
-		reader.readRaw(mask, 4);
-		payloadOffset += 4;
+		payloadLength = lengthByte;
 	}
-	int received = 0;
-	if (payloadOffset < n)
-	{
-		std::memcpy(buffer, header + payloadOffset, n - payloadOffset);
-		received = n - payloadOffset;
-	}
-	if (received < payloadLength)
+
+	if (useMask)
 	{
-		n = receiveNBytes(reinterpret_cast<char*>(buffer) + received, payloadLength - received);
-		if (n <= 0) throw WebSocketException("Incomplete frame received", WebSocket::WS_ERR_INCOMPLETE_FRAME);
-		received += n;
+		n = receiveNBytes(mask, 4);
+		if (n <= 0)
+		{
+			_frameFlags = 0;
+			return n;
+		}
 	}
-	if (lengthByte & FRAME_FLAG_MASK)
+
+	return payloadLength;
+}
+
+
+int WebSocketImpl::receivePayload(char *buffer, int payloadLength, char mask[4], bool useMask)
+{
+	int received = receiveNBytes(reinterpret_cast<char*>(buffer), payloadLength);
+	if (received <= 0) throw WebSocketException("Incomplete frame received", WebSocket::WS_ERR_INCOMPLETE_FRAME);
+
+	if (useMask)
 	{
-		char* p = reinterpret_cast<char*>(buffer);
 		for (int i = 0; i < received; i++)
 		{
-			p[i] ^= mask[i % 4];
+			buffer[i] ^= mask[i % 4];
 		}
 	}
 	return received;
 }
 
 
+int WebSocketImpl::receiveBytes(void* buffer, int length, int)
+{
+	char mask[4];
+	bool useMask;
+	int payloadLength = receiveHeader(mask, useMask);
+	if (payloadLength <= 0)
+		return payloadLength;
+	if (payloadLength > length)
+		throw WebSocketException(Poco::format("Insufficient buffer for payload size %hu", payloadLength), WebSocket::WS_ERR_PAYLOAD_TOO_BIG);
+	return receivePayload(reinterpret_cast<char*>(buffer), payloadLength, mask, useMask);
+}
+
+
+int WebSocketImpl::receiveBytes(Poco::Buffer<char>& buffer, int)
+{
+	char mask[4];
+	bool useMask;
+	int payloadLength = receiveHeader(mask, useMask);
+	if (payloadLength <= 0)
+		return payloadLength;
+	int oldSize = buffer.size();
+	buffer.resize(oldSize + payloadLength);
+	return receivePayload(buffer.begin() + oldSize, payloadLength, mask, useMask);
+}
+
+
 int WebSocketImpl::receiveNBytes(void* buffer, int bytes)
 {
 	int received = _pStreamSocketImpl->receiveBytes(reinterpret_cast<char*>(buffer), bytes);
diff --git a/Net/testsuite/src/NetworkInterfaceTest.cpp b/Net/testsuite/src/NetworkInterfaceTest.cpp
index 840d8d0d2b..2214396b72 100644
--- a/Net/testsuite/src/NetworkInterfaceTest.cpp
+++ b/Net/testsuite/src/NetworkInterfaceTest.cpp
@@ -65,11 +65,11 @@ void NetworkInterfaceTest::testMap()
 			std::cout << std::endl << "----------" << std::endl;
 			std::cout << "Address " << counter << std::endl;
 			std::cout << "----------" << std::endl;
-			std::cout << "Address:     " << ipIt->get<NetworkInterface::IP_ADDRESS>().toString() << std::endl;
+			std::cout << "Address:     " << ipIt->get<NetworkInterface::IP_ADDRESS>() << std::endl;
 			IPAddress addr = ipIt->get<NetworkInterface::SUBNET_MASK>();
-			if (!addr.isWildcard()) std::cout << "Subnet:      " << addr.toString() << " (/" << addr.prefixLength() << ")" << std::endl;
+			if (!addr.isWildcard()) std::cout << "Subnet:      " << addr << " (/" << addr.prefixLength() << ")" << std::endl;
 			addr = ipIt->get<NetworkInterface::BROADCAST_ADDRESS>();
-			if (!addr.isWildcard()) std::cout << "Broadcast:   " << addr.toString() << std::endl;
+			if (!addr.isWildcard()) std::cout << "Broadcast:   " << addr << std::endl;
 		}
 
 		std::cout << "=============" << std::endl << std::endl;
@@ -100,11 +100,11 @@ void NetworkInterfaceTest::testList()
 		List::const_iterator ipEnd = ipList.end();
 		for (int counter = 0; ipIt != ipEnd; ++ipIt, ++counter)
 		{
-			std::cout << "IP Address:  " << ipIt->get<NetworkInterface::IP_ADDRESS>().toString() << std::endl;
+			std::cout << "IP Address:  " << ipIt->get<NetworkInterface::IP_ADDRESS>() << std::endl;
 			IPAddress addr = ipIt->get<NetworkInterface::SUBNET_MASK>();
-			if (!addr.isWildcard()) std::cout << "Subnet:      " << ipIt->get<NetworkInterface::SUBNET_MASK>().toString() << " (/" << ipIt->get<NetworkInterface::SUBNET_MASK>().prefixLength() << ")" << std::endl;
+			if (!addr.isWildcard()) std::cout << "Subnet:      " << ipIt->get<NetworkInterface::SUBNET_MASK>() << " (/" << ipIt->get<NetworkInterface::SUBNET_MASK>().prefixLength() << ")" << std::endl;
 			addr = ipIt->get<NetworkInterface::BROADCAST_ADDRESS>();
-			if (!addr.isWildcard()) std::cout << "Broadcast:   " << ipIt->get<NetworkInterface::BROADCAST_ADDRESS>().toString() << std::endl;
+			if (!addr.isWildcard()) std::cout << "Broadcast:   " << ipIt->get<NetworkInterface::BROADCAST_ADDRESS>() << std::endl;
 		}
 
 		std::cout << "==============" << std::endl << std::endl;
@@ -180,7 +180,7 @@ void NetworkInterfaceTest::testMapIpOnly()
 	{
 		assert(it->second.supportsIPv4() || it->second.supportsIPv6());
 		std::cout << "Interface: (" << it->second.index() << ")" << std::endl;
-		std::cout << "Address:    " << it->second.address().toString() << std::endl;
+		std::cout << "Address:    " << it->second.address() << std::endl;
 		NetworkInterface::MACAddress mac(it->second.macAddress());
 		if (!mac.empty() && (it->second.type() != NetworkInterface::NI_TYPE_SOFTWARE_LOOPBACK))
 			std::cout << "MAC Address:" << mac << std::endl;
diff --git a/Net/testsuite/src/WebSocketTest.cpp b/Net/testsuite/src/WebSocketTest.cpp
index 3cb7016672..1f8cb9dde8 100644
--- a/Net/testsuite/src/WebSocketTest.cpp
+++ b/Net/testsuite/src/WebSocketTest.cpp
@@ -141,6 +141,13 @@ void WebSocketTest::testWebSocket()
 		assert (n == payload.size());
 		assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
 		assert (flags == WebSocket::FRAME_TEXT);
+
+		ws.sendFrame(payload.data(), (int) payload.size());
+		Poco::Buffer<char> pocobuffer(0);
+		n = ws.receiveFrame(pocobuffer, flags);
+		assert (n == payload.size());
+		assert (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
+		assert (flags == WebSocket::FRAME_TEXT);
 	}
 
 	for (int i = 125; i < 129; i++)
@@ -151,6 +158,13 @@ void WebSocketTest::testWebSocket()
 		assert (n == payload.size());
 		assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
 		assert (flags == WebSocket::FRAME_TEXT);
+
+		ws.sendFrame(payload.data(), (int) payload.size());
+		Poco::Buffer<char> pocobuffer(0);
+		n = ws.receiveFrame(pocobuffer, flags);
+		assert (n == payload.size());
+		assert (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
+		assert (flags == WebSocket::FRAME_TEXT);
 	}
 
 	payload = "Hello, world!";
@@ -210,6 +224,49 @@ void WebSocketTest::testWebSocketLarge()
 }
 
 
+void WebSocketTest::testOneLargeFrame(int msgSize)
+{
+	Poco::Net::ServerSocket ss(0);
+	Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory(msgSize), ss, new Poco::Net::HTTPServerParams);
+	server.start();
+
+	Poco::Thread::sleep(200);
+
+	HTTPClientSession cs("localhost", ss.address().port());
+	HTTPRequest request(HTTPRequest::HTTP_GET, "/ws");
+	HTTPResponse response;
+	WebSocket ws(cs, request, response);
+	ws.setSendBufferSize(msgSize);
+	ws.setReceiveBufferSize(msgSize);
+	std::string payload(msgSize, 'x');
+
+	ws.sendFrame(payload.data(), msgSize);
+
+	Poco::Buffer<char> buffer(msgSize);
+	int flags;
+	int n;
+
+	n = ws.receiveFrame(buffer.begin(), buffer.size(), flags);
+	assert (n == payload.size());
+	assert (payload.compare(0, payload.size(), buffer.begin(), 0, n) == 0);
+
+	ws.sendFrame(payload.data(), msgSize);
+
+	Poco::Buffer<char> pocobuffer(0);
+
+	n = ws.receiveFrame(pocobuffer, flags);
+	assert (n == payload.size());
+	assert (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
+}
+
+
+void WebSocketTest::testWebSocketLargeInOneFrame()
+{
+	testOneLargeFrame(64000);
+	testOneLargeFrame(70000);
+}
+
+
 void WebSocketTest::setUp()
 {
 }
@@ -226,6 +283,7 @@ CppUnit::Test* WebSocketTest::suite()
 
 	CppUnit_addTest(pSuite, WebSocketTest, testWebSocket);
 	CppUnit_addTest(pSuite, WebSocketTest, testWebSocketLarge);
+	CppUnit_addTest(pSuite, WebSocketTest, testWebSocketLargeInOneFrame);
 
 	return pSuite;
 }
diff --git a/Net/testsuite/src/WebSocketTest.h b/Net/testsuite/src/WebSocketTest.h
index 939acf630c..07f18a857d 100644
--- a/Net/testsuite/src/WebSocketTest.h
+++ b/Net/testsuite/src/WebSocketTest.h
@@ -28,6 +28,7 @@ class WebSocketTest: public CppUnit::TestCase
 
 	void testWebSocket();
 	void testWebSocketLarge();
+	void testWebSocketLargeInOneFrame();
 
 	void setUp();
 	void tearDown();
@@ -35,6 +36,7 @@ class WebSocketTest: public CppUnit::TestCase
 	static CppUnit::Test* suite();
 
 private:
+	void testOneLargeFrame(int msgSize);
 };
 
 
diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
index 638403b9b8..88ae814cf8 100644
--- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
@@ -46,7 +46,7 @@ class NetSSL_API HTTPSClientSession: public HTTPClientSession
 	/// specify the server's host name and port number.
 	///
 	/// Then create a HTTPRequest object, fill it accordingly,
-	/// and pass it as argument to the sendRequst() method.
+	/// and pass it as argument to the sendRequest() method.
 	///
 	/// sendRequest() will return an output stream that can
 	/// be used to send the request body, if there is any.
diff --git a/NetSSL_OpenSSL/testsuite/Makefile b/NetSSL_OpenSSL/testsuite/Makefile
index 496d15aae7..de9dd79637 100644
--- a/NetSSL_OpenSSL/testsuite/Makefile
+++ b/NetSSL_OpenSSL/testsuite/Makefile
@@ -17,7 +17,8 @@ endif
 
 objects = NetSSLTestSuite Driver \
 	HTTPSClientSessionTest HTTPSClientTestSuite HTTPSServerTest HTTPSServerTestSuite \
-	HTTPSStreamFactoryTest HTTPSTestServer TCPServerTest TCPServerTestSuite
+	HTTPSStreamFactoryTest HTTPSTestServer TCPServerTest TCPServerTestSuite \
+	WebSocketTest WebSocketTestSuite
 
 target         = testrunner
 target_version = 1
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj
index a869a6097e..9bc21f583e 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj
@@ -551,6 +551,23 @@
 					RelativePath=".\src\HTTPSStreamFactoryTest.cpp"/>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="WebSocket">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\WebSocketTest.cpp"/>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\src\WebSocketTest.h"/>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.h"/>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals/>
 </VisualStudioProject>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj
index 20941365a0..d02b8dea10 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj
@@ -1,30 +1,17 @@
 <?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|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>debug_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_md|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>debug_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_mt|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>debug_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_shared|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>release_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_md|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>release_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_mt|SDK_AM335X_SK_WEC2013_V300">
-      <Configuration>release_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V300</Platform>
-    </ProjectConfiguration>
+    <ClInclude Include="src\HTTPSTestServer.h"/>
+    <ClInclude Include="src\NetSSLTestSuite.h"/>
+    <ClInclude Include="src\TCPServerTest.h"/>
+    <ClInclude Include="src\TCPServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSServerTest.h"/>
+    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
+    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
+    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
@@ -36,59 +23,11 @@
     <PlatformToolset>CE800</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
   <ImportGroup Label="ExtensionSettings"/>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">TestSuited</TargetName>
@@ -96,227 +35,7 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">TestSuite</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">
-    <OutDir>bin\$(Platform)\shared\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">
-    <OutDir>bin\$(Platform)\shared\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">
-    <OutDir>bin\$(Platform)\static_mt\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">
-    <OutDir>bin\$(Platform)\static_mt\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">
-    <OutDir>bin\$(Platform)\static_md\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">
-    <OutDir>bin\$(Platform)\static_md\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitd.lib;libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\shared\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\shared\TestSuited.pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnit.lib;libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\shared\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile/>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile/>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_md\TestSuited.pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile/>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\HTTPSTestServer.h"/>
-    <ClInclude Include="src\NetSSLTestSuite.h"/>
-    <ClInclude Include="src\TCPServerTest.h"/>
-    <ClInclude Include="src\TCPServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPSServerTest.h"/>
-    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
-    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
-    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
-  </ItemGroup>
+  <ItemDefinitionGroup/>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
     <ClCompile Include="src\NetSSLTestSuite.cpp"/>
@@ -328,6 +47,8 @@
     <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
     <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
index 7665127a3e..65312fbf65 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{6b9fda75-5ac4-4eb7-a731-2c7ed4b76a66}</UniqueIdentifier>
+      <UniqueIdentifier>{04df41c9-3ee2-496a-a3f4-608debb2f0b3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{4d44660a-0622-4214-838f-d6707f73c935}</UniqueIdentifier>
+      <UniqueIdentifier>{1b49d0a2-b247-482c-8507-fcb17def9054}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{e7b0464b-3626-4c49-8aa3-30fc1a5a4dde}</UniqueIdentifier>
+      <UniqueIdentifier>{fd0ee3cb-ce45-4919-8514-dd672e12bfd1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{d74cb83a-5984-4d45-9026-dd10c3409a72}</UniqueIdentifier>
+      <UniqueIdentifier>{f75f756a-ad4a-4ee5-a400-e3e415b6e9bc}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{a2cd0c24-6477-44f9-81c5-f9b1cfbc2942}</UniqueIdentifier>
+      <UniqueIdentifier>{6d320bac-1f29-4834-b008-d4bf5b6f89c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{ec853bd5-5da7-4b94-9146-1f7775c334ef}</UniqueIdentifier>
+      <UniqueIdentifier>{76f0aaf7-d89b-4bbe-a3cc-cf5c13b7cd46}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{7af9db51-c8bb-45da-999d-3f33920a5837}</UniqueIdentifier>
+      <UniqueIdentifier>{1aa3c893-db2b-4b5e-9d8f-0b2f0394b294}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{4c6e45a0-1c9f-4338-bf1f-8c6faff9bf13}</UniqueIdentifier>
+      <UniqueIdentifier>{f7634e2d-27b4-4f45-bad5-f9714c4f4030}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{af78292a-88af-4593-abf7-7c0877554324}</UniqueIdentifier>
+      <UniqueIdentifier>{c7ee446e-53c9-469b-8f6d-c9430614d1ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{ee92d35d-1fd6-4d2e-9aaa-15ffe92e86f0}</UniqueIdentifier>
+      <UniqueIdentifier>{81c7ec98-2b90-4891-b3e2-56aba10d5d31}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{c380a3b5-d5f8-405e-bff0-225ace2db183}</UniqueIdentifier>
+      <UniqueIdentifier>{0e97d9d5-5614-4f3b-88c4-1b8b28d39ff5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{8dc3c2a8-7f04-4c7b-9eac-5b85b5aad2f2}</UniqueIdentifier>
+      <UniqueIdentifier>{c51d13ca-8f56-413e-9698-aeb9bc96612b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{88d17109-e5df-4297-82f6-6cf65d187124}</UniqueIdentifier>
+      <UniqueIdentifier>{902efde1-a4a1-4cfd-abad-3f135d55bc0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{f3ef342f-efa6-4bc9-b6c9-56f7ba823e1f}</UniqueIdentifier>
+      <UniqueIdentifier>{4482cc44-a8d4-4b97-a791-af3036be02e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{6e51c855-98a5-490d-9587-cfb01bcff9f2}</UniqueIdentifier>
+      <UniqueIdentifier>{d9bdcaed-d5ee-4f4a-9de3-08c435d7c61b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{4a7f3bf8-4719-4f8f-b414-c205979fbdba}</UniqueIdentifier>
+      <UniqueIdentifier>{ed7abad3-c8a9-41f8-bccd-7fa72cc1751e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{60af884b-fbb3-4380-977f-078c473d0aa3}</UniqueIdentifier>
+      <UniqueIdentifier>{7cc64001-7b50-4170-8fed-874a21636aa2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{06e08bb8-a657-4ed7-a5af-8f725ed1df87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{a37185a3-4c6d-481c-b160-f59eb75fcb8c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{25611509-32cb-4feb-846e-efee396807ef}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj
index ef9369d4e9..ba0ea78ffa 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj
@@ -1,30 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug_shared|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>debug_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_md|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>debug_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_mt|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>debug_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_shared|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>release_shared</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_md|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>release_static_md</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_mt|SDK_AM335X_SK_WEC2013_V310">
-      <Configuration>release_static_mt</Configuration>
-      <Platform>SDK_AM335X_SK_WEC2013_V310</Platform>
-    </ProjectConfiguration>
+    <ClInclude Include="src\HTTPSTestServer.h"/>
+    <ClInclude Include="src\NetSSLTestSuite.h"/>
+    <ClInclude Include="src\TCPServerTest.h"/>
+    <ClInclude Include="src\TCPServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSServerTest.h"/>
+    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
+    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
+    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
@@ -36,59 +23,11 @@
     <PlatformToolset>CE800</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>CE800</PlatformToolset>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
   <ImportGroup Label="ExtensionSettings"/>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'" Label="PropertySheets">
-    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">TestSuited</TargetName>
@@ -96,238 +35,20 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">TestSuite</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">
-    <OutDir>bin\$(Platform)\shared\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">
-    <OutDir>bin\$(Platform)\shared\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">
-    <OutDir>bin\$(Platform)\static_mt\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">
-    <OutDir>bin\$(Platform)\static_mt\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">
-    <OutDir>bin\$(Platform)\static_md\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">
-    <OutDir>bin\$(Platform)\static_md\</OutDir>
-    <IntDir>obj\TestSuite\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitd.lib;libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\shared\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\shared\TestSuited.pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnit.lib;libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\shared\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile/>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_mt\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile/>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\$(Platform)\static_md\TestSuited.pdb</ProgramDatabaseFile>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">
-    <Midl>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\$(Platform)\static_md\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile/>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
-      <SubSystem>WindowsCE</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
-    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
-    <ClInclude Include="src\HTTPSServerTest.h"/>
-    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
-    <ClInclude Include="src\HTTPSTestServer.h"/>
-    <ClInclude Include="src\NetSSLTestSuite.h"/>
-    <ClInclude Include="src\TCPServerTest.h"/>
-    <ClInclude Include="src\TCPServerTestSuite.h"/>
-  </ItemGroup>
+  <ItemDefinitionGroup/>
   <ItemGroup>
-    <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
-    <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSServerTest.cpp"/>
-    <ClCompile Include="src\HTTPSServerTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
     <ClCompile Include="src\NetSSLTestSuite.cpp"/>
+    <ClCompile Include="src\WinCEDriver.cpp"/>
     <ClCompile Include="src\TCPServerTest.cpp"/>
     <ClCompile Include="src\TCPServerTestSuite.cpp"/>
-    <ClCompile Include="src\WinCEDriver.cpp"/>
+    <ClCompile Include="src\HTTPSServerTest.cpp"/>
+    <ClCompile Include="src\HTTPSServerTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
+    <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
index 9488efd056..6c336ca3ef 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{9d365ec9-2f58-4224-beaa-3f60d56d5d8c}</UniqueIdentifier>
+      <UniqueIdentifier>{e9d7c7b8-b84c-4ea2-b0b7-5ff2f9c7feb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{c3cdcf57-399f-4cf0-b699-3b1d2d6ccb43}</UniqueIdentifier>
+      <UniqueIdentifier>{52a26c82-915b-4d00-911a-7730dafb2885}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{625b7cd3-ece0-467c-8425-e3d7e883a25d}</UniqueIdentifier>
+      <UniqueIdentifier>{d94c8f93-d502-49dd-9148-d9d176549eee}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{2c2b7b6f-ddd0-438e-9151-7bf15c469c03}</UniqueIdentifier>
+      <UniqueIdentifier>{8ec55b51-5f3f-4799-a01d-c934cb7a4767}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{30228a2d-02d7-401b-a872-cfa459da23f4}</UniqueIdentifier>
+      <UniqueIdentifier>{7e410e75-103b-492e-8971-95619c502c93}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{10859724-8714-4e28-a121-00731b472293}</UniqueIdentifier>
+      <UniqueIdentifier>{e07167a2-bc64-4d6c-8dfe-38b6ba3d44e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{07dfa716-b6ea-456e-a022-8e0a5dcb450b}</UniqueIdentifier>
+      <UniqueIdentifier>{bba27924-a09f-4fcb-894b-54894deed569}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{46c56674-48f6-4789-a5eb-735d1290b9ea}</UniqueIdentifier>
+      <UniqueIdentifier>{f7481006-7683-4dea-870d-7f7367d500a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{d186016e-cd19-400a-89bd-b0158fffa3bb}</UniqueIdentifier>
+      <UniqueIdentifier>{5c2967ff-a52c-4688-9025-dfc125c6b515}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{c21b7e7c-3bfe-43ec-8892-496fa6f5cb1d}</UniqueIdentifier>
+      <UniqueIdentifier>{9390f3e6-cdcc-494d-acc9-e4442c737cc4}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{64c3746e-e858-47e9-84c6-33f84a6db437}</UniqueIdentifier>
+      <UniqueIdentifier>{1d20f39c-29bb-4f73-a011-f7439c9998a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{e9eb9bf7-cfc2-44a5-8dc2-b777843b6d23}</UniqueIdentifier>
+      <UniqueIdentifier>{2ac9f173-17e2-4133-b3e2-2a7305644b24}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{b88efe8f-7b01-47d4-92a9-29192886850b}</UniqueIdentifier>
+      <UniqueIdentifier>{69179ea6-a66a-4b94-9b11-72f9c0a7b9f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{7cb394e3-e15f-4a24-95ed-9d3eba55e770}</UniqueIdentifier>
+      <UniqueIdentifier>{ef9c8b0e-d0d8-4e93-a95e-aa8c59eac7e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{76125e6f-1bb5-4c53-8a45-f6170a63db7f}</UniqueIdentifier>
+      <UniqueIdentifier>{1c7a3379-7f2d-4072-90c5-74be26dc43ed}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{0b3fe0c0-7b8c-47f3-b160-96337e970395}</UniqueIdentifier>
+      <UniqueIdentifier>{754c50f5-e11c-4294-a245-1dec8ed4dc31}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{a68ad76a-e8d6-42b8-9967-947b44beea2e}</UniqueIdentifier>
+      <UniqueIdentifier>{9eaa4d40-d4d5-4b8f-a5ce-138b977ece65}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{41fd072c-2046-4ed2-a2cf-b5b4f0ef310e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{5158d325-b8d9-4301-86b5-16b9bd220de3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{d9a9bcd7-d1c0-4242-a95c-4e511dc37d17}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj
index 7877dae15a..452652b37f 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj
@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
@@ -321,6 +321,8 @@
     <ClInclude Include="src\HTTPSClientSessionTest.h"/>
     <ClInclude Include="src\HTTPSClientTestSuite.h"/>
     <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
@@ -333,6 +335,8 @@
     <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
     <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters
index 57666fe732..aacb6751e7 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{17969387-e1c8-4ca8-b56c-ed74398a47c2}</UniqueIdentifier>
+      <UniqueIdentifier>{121758df-1dae-4ad9-b187-45b7f8116af9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{e939f34f-e3e4-4ce9-9dcd-fd246d947e6d}</UniqueIdentifier>
+      <UniqueIdentifier>{5352cf03-a95a-4b37-9be0-0edd61b96d45}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{7367322c-b946-42f0-824b-479a59e8cf62}</UniqueIdentifier>
+      <UniqueIdentifier>{c78b49db-5e16-4f28-9aee-bd04e506e85b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{f92cca1e-3ec0-47e8-b60c-ac9a626aecd6}</UniqueIdentifier>
+      <UniqueIdentifier>{1f3ffdbf-a441-43d9-8cd8-4c74bdbc625d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{2d739fef-bfb0-4f5e-81d9-668a420b33bf}</UniqueIdentifier>
+      <UniqueIdentifier>{760d3eea-e3ab-4f1c-986e-0eb2f7e2ee6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{bf3e15dc-58b9-495b-beca-6f21b4f8d503}</UniqueIdentifier>
+      <UniqueIdentifier>{5245bc82-7a02-4a82-9881-7042dd1d1032}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{34c100e3-0695-45e9-a742-87917d5a8201}</UniqueIdentifier>
+      <UniqueIdentifier>{20b0b455-1be2-436f-9dbb-608da8fa8e55}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{cdfbae39-5127-478b-b442-ba4cb8fe1dda}</UniqueIdentifier>
+      <UniqueIdentifier>{8a7eb904-582a-45a0-a51d-c1df372103a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{ae219834-9613-4178-88f7-c26560a04b73}</UniqueIdentifier>
+      <UniqueIdentifier>{d33713fa-e256-4df3-a8de-e266e6981cdb}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{8c26c474-414a-474b-bc3f-4dca00d18def}</UniqueIdentifier>
+      <UniqueIdentifier>{5d6a7226-eab6-4b27-92b4-b8420e41131a}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{ba418e81-d3da-4501-ab92-1dc95eedeeb8}</UniqueIdentifier>
+      <UniqueIdentifier>{2b407caf-6758-40db-b692-ee896e504756}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{c725c10f-16b1-4bef-9cfd-06f28b1f630a}</UniqueIdentifier>
+      <UniqueIdentifier>{ead8ed7b-781a-4378-b4b8-e7bda85da0d4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{20ee7be5-f3da-46d1-9318-709942f28e5e}</UniqueIdentifier>
+      <UniqueIdentifier>{0b3b8373-b96f-439f-b853-cfea6babb05c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{98eb13c3-39d6-42bf-837c-17ed2a483421}</UniqueIdentifier>
+      <UniqueIdentifier>{c3154b09-7da1-4459-a231-8c75bcb16217}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{f0c294e6-f951-444f-98b8-de682b4b9a57}</UniqueIdentifier>
+      <UniqueIdentifier>{8b5d231a-9a7b-443f-acf7-87f24fda0fa2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{4f6f82c2-2842-418a-bd5c-eb25926cc4ec}</UniqueIdentifier>
+      <UniqueIdentifier>{d176e423-afd6-4df2-b169-c29a0202e2af}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{45e4aa39-27c9-4f44-a5e0-b6fcd987f96a}</UniqueIdentifier>
+      <UniqueIdentifier>{a1d10e6e-cd96-4c89-abf0-8e814e4a321a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{a4c7374e-f372-4644-81f1-6d7014943f45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{4b5fd321-993b-42ef-847a-23d315b191af}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{dcba1a0a-f5c6-4933-b1a2-48d740f8c6d9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj
index 00c59fa690..04d78e1293 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj
@@ -91,7 +91,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <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>
@@ -321,6 +321,8 @@
     <ClInclude Include="src\HTTPSClientSessionTest.h"/>
     <ClInclude Include="src\HTTPSClientTestSuite.h"/>
     <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
@@ -333,6 +335,8 @@
     <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
     <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters
index 9cbddcf505..725f837661 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{ea075f5c-41b9-44e3-9a9e-b1f9af3a780c}</UniqueIdentifier>
+      <UniqueIdentifier>{1671a15d-e60f-4783-822c-90b3937dba88}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{d827489b-6cc8-4ec0-a4bd-6e5d7f0d940c}</UniqueIdentifier>
+      <UniqueIdentifier>{6f53f5ef-f1a3-47d9-baa4-7369461056e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{fe717bc0-718d-4602-a0d6-e13b62e46893}</UniqueIdentifier>
+      <UniqueIdentifier>{0009be6f-81d6-461a-bac4-b7deffbe7d25}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{ee0b0a3f-ca3e-4bef-91b7-2cdc9e0b8f88}</UniqueIdentifier>
+      <UniqueIdentifier>{9854bf06-24e7-49a7-8ba5-ead47aa576f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{7133fc30-72f9-4f2f-8524-2f23f48145d9}</UniqueIdentifier>
+      <UniqueIdentifier>{2941501d-bafa-4d34-ad9a-154e8a343458}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{7a4d3f81-dbe6-457e-b5be-93c9bc7293b2}</UniqueIdentifier>
+      <UniqueIdentifier>{36bcb347-20cf-468e-ae41-ed315f4f42ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{f031335a-e900-4279-a0ff-848b8bf04c82}</UniqueIdentifier>
+      <UniqueIdentifier>{0061fa85-0168-4538-856b-adcd048dd410}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{08625993-4471-4d5f-9328-c477e83182bb}</UniqueIdentifier>
+      <UniqueIdentifier>{4c2e7272-2a39-45c6-9e28-69f431420173}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{857f58a9-a2be-493e-b389-54060d2e358a}</UniqueIdentifier>
+      <UniqueIdentifier>{bc13b75d-9781-46bd-abc0-3a89a5c47fff}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{382e2b1f-c7c1-4b71-b361-da2f36fe3648}</UniqueIdentifier>
+      <UniqueIdentifier>{741d3021-3d8b-4cac-9573-a35919d9f0b4}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{eca9e146-e523-44dc-967d-a6891c13ed1a}</UniqueIdentifier>
+      <UniqueIdentifier>{eb04a956-7b1e-4105-8a89-0de11f9a0fa0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{1c405df3-959e-455a-9978-e9ad659279c9}</UniqueIdentifier>
+      <UniqueIdentifier>{a5b8f580-a3f2-46c8-8a81-13afe6d47a84}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{a21fca18-d566-4acb-91b4-f2f6be5a9e43}</UniqueIdentifier>
+      <UniqueIdentifier>{477b1628-fd42-49c3-a2ff-e7c129b93ab6}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{7b35b84b-8186-457c-908b-09fd29958a85}</UniqueIdentifier>
+      <UniqueIdentifier>{238fd9c7-8ba4-47d8-b9d8-5b4d9ff18bd1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{0dd151ff-9e73-41ef-a927-0743a7af696c}</UniqueIdentifier>
+      <UniqueIdentifier>{143766cc-0cdf-49b5-8c3c-8509ffc88d84}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{6a1b16a6-db1d-4a42-bf38-49408c3cf41e}</UniqueIdentifier>
+      <UniqueIdentifier>{7e6a0aaf-83f9-4d63-a52d-591fc1578615}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{df510bbf-fbaf-46dc-a5f2-545db17894cd}</UniqueIdentifier>
+      <UniqueIdentifier>{61bba7d4-2883-40b6-ad67-093501f2b32c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{5de08214-e355-44bf-8c0e-b39949da6b55}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{21ceedff-b89f-4b3e-aa8e-f29ef2656222}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{dca12aa7-7e25-4ee5-a6d3-5b8f372609cb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj
index 9569877d22..220d92c30b 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj
@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <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>
@@ -304,27 +304,31 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
-    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
-    <ClInclude Include="src\HTTPSServerTest.h"/>
-    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
     <ClInclude Include="src\HTTPSTestServer.h"/>
     <ClInclude Include="src\NetSSLTestSuite.h"/>
     <ClInclude Include="src\TCPServerTest.h"/>
     <ClInclude Include="src\TCPServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSServerTest.h"/>
+    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
+    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
+    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Driver.cpp"/>
-    <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
-    <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSServerTest.cpp"/>
-    <ClCompile Include="src\HTTPSServerTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
     <ClCompile Include="src\NetSSLTestSuite.cpp"/>
+    <ClCompile Include="src\Driver.cpp"/>
     <ClCompile Include="src\TCPServerTest.cpp"/>
     <ClCompile Include="src\TCPServerTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSServerTest.cpp"/>
+    <ClCompile Include="src\HTTPSServerTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
+    <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters
index c9ac3bdcf4..0ef6530ef3 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{bf26ad3e-a119-4258-aa3d-ecd39b770f1d}</UniqueIdentifier>
+      <UniqueIdentifier>{0e09f5ea-e70f-4718-ba84-73685209ff4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{6fd38c8e-3869-4a18-92ea-50aba36d3317}</UniqueIdentifier>
+      <UniqueIdentifier>{e3608c46-fb38-426c-a3ba-0289f499439a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{092f650d-ff83-4f5f-97ea-49e54b6cc430}</UniqueIdentifier>
+      <UniqueIdentifier>{b748acc1-2bdf-407c-b129-a48adacf5479}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{e8aaf425-d3e2-4623-8864-051d74410e54}</UniqueIdentifier>
+      <UniqueIdentifier>{4e89a416-6af8-4a43-9c3d-9460b0276ff9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{d320db93-98c8-4fb4-a9d0-c004317ca5ea}</UniqueIdentifier>
+      <UniqueIdentifier>{c044bf67-45a4-4e69-a731-e49aaab67832}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{686519b9-cbea-4cfc-938e-4ba923a97f45}</UniqueIdentifier>
+      <UniqueIdentifier>{6b19304a-67b9-412f-96fa-fa107c80f8f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{3e42c898-8f65-4c80-877c-06498f3bd74c}</UniqueIdentifier>
+      <UniqueIdentifier>{1df6d6ea-582f-4d86-9ee8-a3d0255a462d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{9e39d7b6-b038-445d-9dbe-9d24b9b649ee}</UniqueIdentifier>
+      <UniqueIdentifier>{40886e6d-f548-4b3b-9353-96303560cadd}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{3e80bade-01f3-4542-a550-1a3c41d0e3a6}</UniqueIdentifier>
+      <UniqueIdentifier>{a1a685e0-8b93-441b-8b5b-9a4d50a138e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{5720fe3f-31c3-49d0-a2d7-a1de07802add}</UniqueIdentifier>
+      <UniqueIdentifier>{787b361c-ff20-475b-9f30-2a92706f8ce5}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{5768f323-ffb3-4eed-9083-e91c61d963fd}</UniqueIdentifier>
+      <UniqueIdentifier>{2beffe90-0b25-4f52-bbad-2f89627edadd}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{88b06b00-f9c7-4aa0-8840-fdcb3801fd09}</UniqueIdentifier>
+      <UniqueIdentifier>{cbe8d4bc-5f65-4083-8c68-db7add69b6ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{9e20df83-2059-44f3-9eb0-703dd923eb4a}</UniqueIdentifier>
+      <UniqueIdentifier>{ce02aef3-9c36-4b2c-854e-7598124abcd9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{92ac1298-abd7-48bf-a656-3caeeaea50f0}</UniqueIdentifier>
+      <UniqueIdentifier>{31d42856-80d1-4c9b-8a3a-8d7ae25f156c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{30d34fd3-72e1-470c-ac0d-e5f078ab68c6}</UniqueIdentifier>
+      <UniqueIdentifier>{46458469-d145-49f8-9260-7525c487b8ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{31c9b72d-890e-41b3-b30f-9fbcadb9558f}</UniqueIdentifier>
+      <UniqueIdentifier>{84583877-dcac-4381-861d-eb15c1c94c1b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{8d6cc7f2-a67b-475d-92a0-c4e5ab79b415}</UniqueIdentifier>
+      <UniqueIdentifier>{17d546e3-8653-4811-8d7d-159061827f81}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{06bdb051-1698-42f5-9ea8-b9d354891d3e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{5a0ce0b8-0542-4b06-94bc-623a25cfd861}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{afacadc2-8b2b-48aa-a45f-22e90ba6e93c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj
index bb1215a927..ae53aa6590 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj
@@ -532,6 +532,23 @@
 					RelativePath=".\src\HTTPSStreamFactoryTest.cpp"/>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="WebSocket">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\WebSocketTest.cpp"/>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\src\WebSocketTest.h"/>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.h"/>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals/>
 </VisualStudioProject>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj
index 4683bd9825..8abad51477 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj
@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">bin64\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\TestSuite\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
@@ -321,6 +321,8 @@
     <ClInclude Include="src\HTTPSClientSessionTest.h"/>
     <ClInclude Include="src\HTTPSClientTestSuite.h"/>
     <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
@@ -333,6 +335,8 @@
     <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
     <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters
index 73b921fddd..1610925abd 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{15aea0b1-0a6e-4d69-b4c5-4e0e357a8c0c}</UniqueIdentifier>
+      <UniqueIdentifier>{bdf86dfb-0131-424c-b1b6-8cdd823f5473}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{cdb5cc31-0819-48c4-9d33-2e753f5b60e8}</UniqueIdentifier>
+      <UniqueIdentifier>{7961473e-e2bf-4765-ab90-df975486bffe}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{18c8ac4c-48e3-4482-900f-2b3f69c93cb9}</UniqueIdentifier>
+      <UniqueIdentifier>{40cd8ef3-d003-41a0-9e89-f7c8296a2caa}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{ed494781-419a-4093-8cf8-f6459b70b551}</UniqueIdentifier>
+      <UniqueIdentifier>{1941b1a5-ed48-42eb-9447-203c9285da3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{d9ca09e9-9185-4172-9ccb-f6dcd9d87059}</UniqueIdentifier>
+      <UniqueIdentifier>{bf781b52-eb62-4647-bdb8-498ed8f85a9e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{3dfa8c2c-b6dc-469c-9746-6fb3fa729b97}</UniqueIdentifier>
+      <UniqueIdentifier>{32845aa4-4064-456b-aedd-8823fccb9e0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{6d13ed5d-8d7f-45da-a026-55fc75124984}</UniqueIdentifier>
+      <UniqueIdentifier>{fffe2e68-9800-4a5e-b600-32c1dba729d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{0d85d99c-e373-4615-80f6-d16ed7293e42}</UniqueIdentifier>
+      <UniqueIdentifier>{6013768a-09eb-4991-9a61-656b18eb12f0}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{d2666db6-287e-4b83-98fd-399098e9700d}</UniqueIdentifier>
+      <UniqueIdentifier>{911c0822-5c2b-4ff3-abd5-16e9a8a1e563}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{8162f75c-58ce-4027-9247-50b4115a0381}</UniqueIdentifier>
+      <UniqueIdentifier>{2f181791-4ea3-4b5f-8440-5863d71d82db}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{d584d745-d8bd-4d00-8fb2-c6dba15ce15c}</UniqueIdentifier>
+      <UniqueIdentifier>{0ab59e21-5ca1-4fe1-a1e7-2707e9c7451a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{7d24eaa0-a91b-49c8-a6a0-b465cf58cf5d}</UniqueIdentifier>
+      <UniqueIdentifier>{d7baa143-e03f-4b8b-be7f-8b2b60a5db5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{19e1747f-3a09-4fa6-81be-9ea9100e5791}</UniqueIdentifier>
+      <UniqueIdentifier>{b1570109-807d-424c-9df2-be935fee4deb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{608c3cd3-7497-4885-bf1d-1fd960e3c413}</UniqueIdentifier>
+      <UniqueIdentifier>{f28d72d4-40d6-4ebe-aaab-de1b48d1a010}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{36d1c1cf-8282-4260-a665-4233542c46ed}</UniqueIdentifier>
+      <UniqueIdentifier>{3db45545-af6f-44c5-a981-7fb1c05eb7da}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{c7ae4319-2925-483c-947d-cf9a0bc42a56}</UniqueIdentifier>
+      <UniqueIdentifier>{cbf5bcd4-688b-4d7e-b7c4-47fc2c120eb1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{f305a2e5-ae9d-44d0-8038-6e1f20d46ab2}</UniqueIdentifier>
+      <UniqueIdentifier>{ee1deeaa-1ffe-4236-a1b2-67954c62260d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{282cda0b-6ec2-435b-8d33-53b3c7fd1668}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{288d2792-b7ae-47d1-8cc0-de14b19d74b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{522acf16-db9b-4f9e-a54e-ced61aba672d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj
index 3ca6a5b045..dc6a53cb4e 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj
@@ -91,7 +91,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -321,6 +321,8 @@
     <ClInclude Include="src\HTTPSClientSessionTest.h"/>
     <ClInclude Include="src\HTTPSClientTestSuite.h"/>
     <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
@@ -333,6 +335,8 @@
     <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
     <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters
index 41a9e98d52..0b8bb01198 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{d71b5fd6-558a-4d4f-8cca-04d1fa149b5e}</UniqueIdentifier>
+      <UniqueIdentifier>{edcf6b04-9d8b-4196-9c8b-86210ad1e372}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{07f9099a-40b3-4048-8647-a9fe651410ca}</UniqueIdentifier>
+      <UniqueIdentifier>{97759aa9-5165-4dfb-aaff-d66ffbc890b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{afe055c4-1c96-48ec-b2a9-0a03c14031ef}</UniqueIdentifier>
+      <UniqueIdentifier>{5113e1be-e397-496a-8c99-3a4ffb65d02d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{8a7604a6-5f32-4dd2-af7d-e6e0088547fd}</UniqueIdentifier>
+      <UniqueIdentifier>{ad7176be-5b84-4dc9-9385-0d1ee2f2b2f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{24a5e804-3e8b-4e98-ac43-d01dc02be1af}</UniqueIdentifier>
+      <UniqueIdentifier>{6df1fd8c-14f8-4d48-9caa-dfa6786a6d94}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{9151a79f-d715-4e4a-b310-d83e93338173}</UniqueIdentifier>
+      <UniqueIdentifier>{9cd88fc3-bc9f-48e3-ad4d-2afec7ee4f79}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{75f1f8e4-44d1-4b6a-ac18-cd8995996180}</UniqueIdentifier>
+      <UniqueIdentifier>{17395e29-0c23-4633-bb4b-6e4165f94274}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{5aca6f12-139c-46cb-9c42-dd5adf748352}</UniqueIdentifier>
+      <UniqueIdentifier>{a4b97f3e-8178-4941-8de1-0e04fa65902f}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{1ef26b8f-7032-46e5-a2c8-9f1364e590dc}</UniqueIdentifier>
+      <UniqueIdentifier>{6fe05659-8a59-4f90-9777-6a342cc2f99e}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{c2e2a333-4cee-43bf-aa6c-a1568643ff4a}</UniqueIdentifier>
+      <UniqueIdentifier>{ed90d55e-199e-46ac-ba74-33eb220571f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{f84e7a8b-ee1e-4b92-8d1a-c9fc896d8b68}</UniqueIdentifier>
+      <UniqueIdentifier>{3669f0a4-b70c-4b2b-8fc0-8377d5c10ad5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{4ce86ba1-8d73-4c25-88bd-42910d9c1791}</UniqueIdentifier>
+      <UniqueIdentifier>{fbbf283b-a5d2-42e8-ad93-9d4abb064693}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{38363896-1471-41db-8c0d-9842ce3b1725}</UniqueIdentifier>
+      <UniqueIdentifier>{439e1f1a-9144-4f50-811e-371a1285e30a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{dcd36f5d-d708-4d01-93fb-8b24033f6381}</UniqueIdentifier>
+      <UniqueIdentifier>{f2e9667a-6da1-4b6e-bc93-653499fe13ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{572c4662-5139-4132-944a-d21a3a5d74eb}</UniqueIdentifier>
+      <UniqueIdentifier>{7bb76651-8242-4ff9-94fa-3ef075b9acc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{9800df0f-3a8a-48a6-b537-988c4b94a157}</UniqueIdentifier>
+      <UniqueIdentifier>{29a548ee-1a97-4dff-bf7a-03d762349518}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{f491b621-d523-4e14-916b-078e0625118d}</UniqueIdentifier>
+      <UniqueIdentifier>{8aa2c0d5-26b2-48c9-a98a-a0a1cf775860}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{7261974f-da89-408b-bb33-14b4e343b39f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{514e7f71-f2d2-422d-af4f-bd86f7e5148a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{b2716b49-6f6a-4228-a085-8f3af4752b70}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj
index 67f4ced0a1..d3f9b431de 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj
@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -304,27 +304,31 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
-    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
-    <ClInclude Include="src\HTTPSServerTest.h"/>
-    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
-    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
     <ClInclude Include="src\HTTPSTestServer.h"/>
     <ClInclude Include="src\NetSSLTestSuite.h"/>
     <ClInclude Include="src\TCPServerTest.h"/>
     <ClInclude Include="src\TCPServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSServerTest.h"/>
+    <ClInclude Include="src\HTTPSServerTestSuite.h"/>
+    <ClInclude Include="src\HTTPSClientSessionTest.h"/>
+    <ClInclude Include="src\HTTPSClientTestSuite.h"/>
+    <ClInclude Include="src\HTTPSStreamFactoryTest.h"/>
+    <ClInclude Include="src\WebSocketTest.h"/>
+    <ClInclude Include="src\WebSocketTestSuite.h"/>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Driver.cpp"/>
-    <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
-    <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSServerTest.cpp"/>
-    <ClCompile Include="src\HTTPSServerTestSuite.cpp"/>
-    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
     <ClCompile Include="src\HTTPSTestServer.cpp"/>
     <ClCompile Include="src\NetSSLTestSuite.cpp"/>
+    <ClCompile Include="src\Driver.cpp"/>
     <ClCompile Include="src\TCPServerTest.cpp"/>
     <ClCompile Include="src\TCPServerTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSServerTest.cpp"/>
+    <ClCompile Include="src\HTTPSServerTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSClientSessionTest.cpp"/>
+    <ClCompile Include="src\HTTPSClientTestSuite.cpp"/>
+    <ClCompile Include="src\HTTPSStreamFactoryTest.cpp"/>
+    <ClCompile Include="src\WebSocketTest.cpp"/>
+    <ClCompile Include="src\WebSocketTestSuite.cpp"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters
index 92d4be63f4..890da732e1 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,55 +2,64 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="HTTPS">
-      <UniqueIdentifier>{c91e1a1a-ceb0-4a8d-b4b6-2da5aefb5057}</UniqueIdentifier>
+      <UniqueIdentifier>{e8a96a50-3640-48f9-843b-650db9415fa5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Header Files">
-      <UniqueIdentifier>{27a5b704-0bfb-4a18-a702-7bb08610098a}</UniqueIdentifier>
+      <UniqueIdentifier>{b1e58987-cd76-46a1-ad02-a47c8080d223}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPS\Source Files">
-      <UniqueIdentifier>{5efbd378-4739-4bda-ac6f-c96edc8020d7}</UniqueIdentifier>
+      <UniqueIdentifier>{b6d18a24-0d04-4115-935f-fc4076eee1b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{9fb86d1e-3f76-48c3-bb7e-9b5488518ea4}</UniqueIdentifier>
+      <UniqueIdentifier>{d48ae85d-7584-4ee0-955f-d8378f1dacee}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{c799c004-5493-4387-9ae5-53dfb633e1f5}</UniqueIdentifier>
+      <UniqueIdentifier>{537e9b02-2cbc-4a86-b5f0-bb2a6c27470b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{366a3308-4997-4eeb-8053-88e7596de422}</UniqueIdentifier>
+      <UniqueIdentifier>{31730825-d5c3-4cc5-a640-1ae24309001b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{a09010e0-1301-4a76-85d3-4300feb07fea}</UniqueIdentifier>
+      <UniqueIdentifier>{7b957168-eb5d-4f10-a263-3b9d87d5cf26}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{164b9310-f524-423a-8581-90faecc4fb11}</UniqueIdentifier>
+      <UniqueIdentifier>{b65a0239-c96b-4594-a135-f11e76ecbe4e}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{fd23ce38-811e-413f-a62c-c9f3d495b3cd}</UniqueIdentifier>
+      <UniqueIdentifier>{78417f11-bfb0-44ac-8331-cc3136c22e0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{c8d9b4fe-701e-4fd7-958f-9d98b25def65}</UniqueIdentifier>
+      <UniqueIdentifier>{c2c2e59c-51aa-4cc0-96e5-ac22570ca07a}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{c1215c1b-0e21-4a4c-8803-a580c8a64d29}</UniqueIdentifier>
+      <UniqueIdentifier>{2b700145-005f-4edf-a3df-373821826674}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer">
-      <UniqueIdentifier>{9eb1ab47-f0aa-43eb-ad14-eea050494c63}</UniqueIdentifier>
+      <UniqueIdentifier>{66c3fe46-2bc1-4422-8c6d-ebaf172c5b32}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Header Files">
-      <UniqueIdentifier>{138f8596-2f7e-41d1-8662-c10d77d68ec1}</UniqueIdentifier>
+      <UniqueIdentifier>{3337edd3-9252-431e-b839-5819f694d562}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSServer\Source Files">
-      <UniqueIdentifier>{69632e9e-ffdb-48f3-b801-7514e5256336}</UniqueIdentifier>
+      <UniqueIdentifier>{7510b0ee-cf49-49f9-8906-ea85e92996ae}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{cdbb8d7e-4c8b-42cf-8156-ad448afd21cb}</UniqueIdentifier>
+      <UniqueIdentifier>{49b597f9-9e0e-46e6-b8be-ddb2ac2584e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{11edffac-87b4-4b39-bb4a-54a408252b8e}</UniqueIdentifier>
+      <UniqueIdentifier>{f95ced76-35a2-436e-9e8f-35c46c337bd7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{7ad65925-00d1-469c-b73a-6d62a949709d}</UniqueIdentifier>
+      <UniqueIdentifier>{a3a304a4-6d5d-49a5-a031-a77b73e9b471}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{a685b348-f1f9-4aad-a457-ddfc74026ba8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{272d8be5-11d8-46ad-9475-4e5ab6176d46}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{b06e4a72-287b-429d-876e-a79120181962}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +90,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +128,11 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj
index 06a8971a1a..bf4642e2ac 100644
--- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj
+++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj
@@ -532,6 +532,23 @@
 					RelativePath=".\src\HTTPSStreamFactoryTest.cpp"/>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="WebSocket">
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\WebSocketTest.cpp"/>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.cpp"/>
+			</Filter>
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\src\WebSocketTest.h"/>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.h"/>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals/>
 </VisualStudioProject>
diff --git a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp
index 241a68dbd5..778f87d735 100644
--- a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp
+++ b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp
@@ -15,6 +15,7 @@
 #include "HTTPSClientTestSuite.h"
 #include "TCPServerTestSuite.h"
 #include "HTTPSServerTestSuite.h"
+#include "WebSocketTestSuite.h"
 
 
 CppUnit::Test* NetSSLTestSuite::suite()
@@ -25,6 +26,7 @@ CppUnit::Test* NetSSLTestSuite::suite()
 	pSuite->addTest(HTTPSClientTestSuite::suite());
 	pSuite->addTest(TCPServerTestSuite::suite());
 	pSuite->addTest(HTTPSServerTestSuite::suite());
+	pSuite->addTest(WebSocketTestSuite::suite());
 
 	return pSuite;
 }
diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp
new file mode 100644
index 0000000000..1555d687b6
--- /dev/null
+++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp
@@ -0,0 +1,231 @@
+//
+// WebSocketTest.cpp
+//
+// $Id: //poco/1.4/Net/testsuite/src/WebSocketTest.cpp#3 $
+//
+// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "WebSocketTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Net/WebSocket.h"
+#include "Poco/Net/SocketStream.h"
+#include "Poco/Net/HTTPSClientSession.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPServerParams.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/SecureServerSocket.h"
+#include "Poco/Net/NetException.h"
+#include "Poco/Thread.h"
+
+
+using Poco::Net::HTTPSClientSession;
+using Poco::Net::HTTPRequest;
+using Poco::Net::HTTPResponse;
+using Poco::Net::HTTPServerRequest;
+using Poco::Net::HTTPServerResponse;
+using Poco::Net::SocketStream;
+using Poco::Net::WebSocket;
+using Poco::Net::WebSocketException;
+
+
+namespace
+{
+	class WebSocketRequestHandler: public Poco::Net::HTTPRequestHandler
+	{
+	public:
+		WebSocketRequestHandler(std::size_t bufSize = 1024): _bufSize(bufSize)
+		{
+		}
+
+		void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
+		{
+			try
+			{
+				WebSocket ws(request, response);
+				std::auto_ptr<char> pBuffer(new char[_bufSize]);
+				int flags;
+				int n;
+				do
+				{
+					n = ws.receiveFrame(pBuffer.get(), _bufSize, flags);
+					ws.sendFrame(pBuffer.get(), n, flags);
+				}
+				while (n > 0 || (flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE);
+			}
+			catch (WebSocketException& exc)
+			{
+				switch (exc.code())
+				{
+				case WebSocket::WS_ERR_HANDSHAKE_UNSUPPORTED_VERSION:
+					response.set("Sec-WebSocket-Version", WebSocket::WEBSOCKET_VERSION);
+					// fallthrough
+				case WebSocket::WS_ERR_NO_HANDSHAKE:
+				case WebSocket::WS_ERR_HANDSHAKE_NO_VERSION:
+				case WebSocket::WS_ERR_HANDSHAKE_NO_KEY:
+					response.setStatusAndReason(HTTPResponse::HTTP_BAD_REQUEST);
+					response.setContentLength(0);
+					response.send();
+					break;
+				}
+			}
+		}
+
+	private:
+		std::size_t _bufSize;
+	};
+	
+	class WebSocketRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory
+	{
+	public:
+		WebSocketRequestHandlerFactory(std::size_t bufSize = 1024): _bufSize(bufSize)
+		{
+		}
+
+		Poco::Net::HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request)
+		{
+			return new WebSocketRequestHandler(_bufSize);
+		}
+
+	private:
+		std::size_t _bufSize;
+	};
+}
+
+
+WebSocketTest::WebSocketTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+WebSocketTest::~WebSocketTest()
+{
+}
+
+
+void WebSocketTest::testWebSocket()
+{
+	Poco::Net::SecureServerSocket ss(0);
+	Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory, ss, new Poco::Net::HTTPServerParams);
+	server.start();
+	
+	Poco::Thread::sleep(200);
+	
+	HTTPSClientSession cs("localhost", ss.address().port());
+	HTTPRequest request(HTTPRequest::HTTP_GET, "/ws");
+	HTTPResponse response;
+	WebSocket ws(cs, request, response);
+
+	std::string payload("x");
+	ws.sendFrame(payload.data(), (int) payload.size());
+	char buffer[1024];
+	int flags;
+	int n = ws.receiveFrame(buffer, sizeof(buffer), flags);
+	assert (n == payload.size());
+	assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
+	assert (flags == WebSocket::FRAME_TEXT);
+
+	for (int i = 2; i < 20; i++)
+	{
+		payload.assign(i, 'x');
+		ws.sendFrame(payload.data(), (int) payload.size());
+		n = ws.receiveFrame(buffer, sizeof(buffer), flags);
+		assert (n == payload.size());
+		assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
+		assert (flags == WebSocket::FRAME_TEXT);
+	}
+
+	for (int i = 125; i < 129; i++)
+	{
+		payload.assign(i, 'x');
+		ws.sendFrame(payload.data(), (int) payload.size());
+		n = ws.receiveFrame(buffer, sizeof(buffer), flags);
+		assert (n == payload.size());
+		assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
+		assert (flags == WebSocket::FRAME_TEXT);
+	}
+
+	payload = "Hello, world!";
+	ws.sendFrame(payload.data(), (int) payload.size());
+	n = ws.receiveFrame(buffer, sizeof(buffer), flags);
+	assert (n == payload.size());
+	assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
+	assert (flags == WebSocket::FRAME_TEXT);
+	
+	payload = "Hello, universe!";
+	ws.sendFrame(payload.data(), (int) payload.size(), WebSocket::FRAME_BINARY);
+	n = ws.receiveFrame(buffer, sizeof(buffer), flags);
+	assert (n == payload.size());
+	assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
+	assert (flags == WebSocket::FRAME_BINARY);	
+	
+	ws.shutdown();
+	n = ws.receiveFrame(buffer, sizeof(buffer), flags);
+	assert (n == 2);
+	assert ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE);
+	
+	server.stop();
+}
+
+
+void WebSocketTest::testWebSocketLarge()
+{
+	const int msgSize = 64000;
+
+	Poco::Net::SecureServerSocket ss(0);
+	Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory(msgSize), ss, new Poco::Net::HTTPServerParams);
+	server.start();
+	
+	Poco::Thread::sleep(200);
+	
+	HTTPSClientSession cs("localhost", ss.address().port());
+	HTTPRequest request(HTTPRequest::HTTP_GET, "/ws");
+	HTTPResponse response;
+	WebSocket ws(cs, request, response);
+	ws.setSendBufferSize(msgSize);
+	ws.setReceiveBufferSize(msgSize);
+	std::string payload(msgSize, 'x');
+	SocketStream sstr(ws);
+	sstr << payload;
+	sstr.flush();
+
+	char buffer[msgSize + 1];
+	int flags;
+	int n = 0;
+	do
+	{
+		n += ws.receiveFrame(buffer + n, sizeof(buffer) - n, flags);
+	} while (n > 0 && n < msgSize);
+
+	assert (n == payload.size());
+	assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
+}
+
+
+void WebSocketTest::setUp()
+{
+}
+
+
+void WebSocketTest::tearDown()
+{
+}
+
+
+CppUnit::Test* WebSocketTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("WebSocketTest");
+
+	CppUnit_addTest(pSuite, WebSocketTest, testWebSocket);
+	CppUnit_addTest(pSuite, WebSocketTest, testWebSocketLarge);
+
+	return pSuite;
+}
diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h
new file mode 100644
index 0000000000..939acf630c
--- /dev/null
+++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h
@@ -0,0 +1,41 @@
+//
+// WebSocketTest.h
+//
+// $Id: //poco/1.4/Net/testsuite/src/WebSocketTest.h#1 $
+//
+// Definition of the WebSocketTest class.
+//
+// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef WebSocketTest_INCLUDED
+#define WebSocketTest_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "CppUnit/TestCase.h"
+
+
+class WebSocketTest: public CppUnit::TestCase
+{
+public:
+	WebSocketTest(const std::string& name);
+	~WebSocketTest();
+
+	void testWebSocket();
+	void testWebSocketLarge();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // WebSocketTest_INCLUDED
diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.cpp b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.cpp
new file mode 100644
index 0000000000..162eb38aab
--- /dev/null
+++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.cpp
@@ -0,0 +1,24 @@
+//
+// WebSocketTestSuite.cpp
+//
+// $Id: //poco/1.4/Net/testsuite/src/WebSocketTestSuite.cpp#1 $
+//
+// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "WebSocketTestSuite.h"
+#include "WebSocketTest.h"
+
+
+CppUnit::Test* WebSocketTestSuite::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("WebSocketTestSuite");
+
+	pSuite->addTest(WebSocketTest::suite());
+
+	return pSuite;
+}
diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h
new file mode 100644
index 0000000000..83b5dbb81d
--- /dev/null
+++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTestSuite.h
@@ -0,0 +1,29 @@
+//
+// WebSocketTestSuite.h
+//
+// $Id: //poco/1.4/Net/testsuite/src/WebSocketTestSuite.h#1 $
+//
+// Definition of the WebSocketTestSuite class.
+//
+// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef WebSocketTestSuite_INCLUDED
+#define WebSocketTestSuite_INCLUDED
+
+
+#include "CppUnit/TestSuite.h"
+
+
+class WebSocketTestSuite
+{
+public:
+	static CppUnit::Test* suite();
+};
+
+
+#endif // WebSocketTestSuite_INCLUDED
diff --git a/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h b/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h
index 99e956e692..56bc96fd82 100644
--- a/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h
+++ b/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h
@@ -46,7 +46,7 @@ class NetSSL_Win_API HTTPSClientSession: public HTTPClientSession
 	/// specify the server's host name and port number.
 	///
 	/// Then create a HTTPRequest object, fill it accordingly,
-	/// and pass it as argument to the sendRequst() method.
+	/// and pass it as argument to the sendRequest() method.
 	///
 	/// sendRequest() will return an output stream that can
 	/// be used to send the request body, if there is any.
diff --git a/PageCompiler/src/CodeWriter.cpp b/PageCompiler/src/CodeWriter.cpp
index 13c0973ec1..442f38d84e 100644
--- a/PageCompiler/src/CodeWriter.cpp
+++ b/PageCompiler/src/CodeWriter.cpp
@@ -263,11 +263,11 @@ void CodeWriter::writeHandler(std::ostream& ostr)
 	ostr << "void " << _class << "::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response)\n";
 	ostr << "{\n";
 	writeResponse(ostr);
+	writeSession(ostr);
 	if (_page.has("page.precondition"))
 	{
 		ostr << "\tif (!(" << _page.get("page.precondition") << ")) return;\n\n";
 	}
-	writeSession(ostr);
 	writeForm(ostr);
 	ostr << _page.preHandler().str();
 	writeContent(ostr);
diff --git a/README.md b/README.md
index 8608a0a5f3..9b50063d0f 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ Build Status
 - Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=develop)](https://travis-ci.org/pocoproject/poco)
 - AppVeyor: [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae)](https://ci.appveyor.com/project/obiltschnig/poco)
 
+![alt text][logo]
 
 POrtable COmponents C++ Libraries are:
 --------------------------------------
@@ -16,7 +17,7 @@ POrtable COmponents C++ Libraries are:
 - Written in efficient, modern, 100% ANSI/ISO Standard C++.
 - Based on and complementing the C++ Standard Library/STL.
 - Highly portable and available on many different platforms.
-- Open Source, licensed under the Boost Software License.
+- Open Source, licensed under the [Boost Software License](https://spdx.org/licenses/BSL-1.0).
 
 ----
 To start using POCO, see the [Guided Tour](http://pocoproject.org/docs-1.5.3/00100-GuidedTour.html) and [Getting Started](http://pocoproject.org/docs-1.5.3/00200-GettingStarted.html) documents.
@@ -35,3 +36,5 @@ When contributing to POCO, please adhere to our [guidelines](https://github.com/
 
 All text file line endings in the repository must be Unix-style (LF).
 This includes Visual Studio project and solution files (.sln, .vcproj, .vcxproj, .vcxproj.filters).
+
+[logo]: https://raw.githubusercontent.com/pocoproject/poco/develop/doc/poco.png "Poco Layout"
diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h
index 301bc99f9f..7d2caafc17 100644
--- a/Util/include/Poco/Util/Application.h
+++ b/Util/include/Poco/Util/Application.h
@@ -389,6 +389,7 @@ class Util_API Application: public Subsystem
 	Poco::Logger*   _pLogger;
 	Poco::Timestamp _startTime;
 	bool            _stopOptionsProcessing;
+	int             _loadedConfigs;
 
 #if defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_VXWORKS)
 	std::string _workingDirAtLaunch;
diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h
index bcb23fa55b..d02c3e5cbf 100644
--- a/Util/include/Poco/Util/ServerApplication.h
+++ b/Util/include/Poco/Util/ServerApplication.h
@@ -168,6 +168,16 @@ class Util_API ServerApplication: public Application
 	void defineOptions(OptionSet& options);
 #endif
 
+#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(_WIN32_WCE)
+	static HDEVNOTIFY registerServiceDeviceNotification(LPVOID filter, DWORD flags);
+		/// Registers the ServerApplication to receive SERVICE_CONTROL_DEVICEEVENT
+		/// events via handleDeviceEvent().
+
+	virtual DWORD handleDeviceEvent(DWORD event_type, LPVOID event_data);
+		/// Handles the SERVICE_CONTROL_DEVICEEVENT event. The default
+		/// implementation does nothing and returns ERROR_CALL_NOT_IMPLEMENTED.
+#endif
+
 private:
 #if defined(POCO_VXWORKS)
 	static Poco::Event _terminate;
@@ -176,7 +186,7 @@ class Util_API ServerApplication: public Application
 	void handlePidFile(const std::string& name, const std::string& value);
 	bool isDaemon(int argc, char** argv);
 	void beDaemon();
-#if defined(POCO_ANDROID)
+#if defined(POCO_ANDROID) || defined(__NACL__)
 	static Poco::Event _terminate;
 #endif
 #elif defined(POCO_OS_FAMILY_WINDOWS)
@@ -188,7 +198,7 @@ class Util_API ServerApplication: public Application
 		SRV_UNREGISTER
 	};
 	static BOOL __stdcall ConsoleCtrlHandler(DWORD ctrlType);
-	static void __stdcall ServiceControlHandler(DWORD control);
+	static DWORD __stdcall ServiceControlHandler(DWORD control, DWORD event_type, LPVOID event_data, LPVOID context);
 #if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
 	static void __stdcall ServiceMain(DWORD argc, LPWSTR* argv);
 #else
diff --git a/Util/src/Application.cpp b/Util/src/Application.cpp
index aabedc1076..731c84da80 100644
--- a/Util/src/Application.cpp
+++ b/Util/src/Application.cpp
@@ -71,7 +71,8 @@ Application::Application():
 	_initialized(false),
 	_unixOptions(true),
 	_pLogger(&Logger::get("ApplicationStartup")),
-	_stopOptionsProcessing(false)
+	_stopOptionsProcessing(false),
+	_loadedConfigs(0)
 {
 	setup();
 }
@@ -82,7 +83,8 @@ Application::Application(int argc, char* argv[]):
 	_initialized(false),
 	_unixOptions(true),
 	_pLogger(&Logger::get("ApplicationStartup")),
-	_stopOptionsProcessing(false)
+	_stopOptionsProcessing(false),
+	_loadedConfigs(0)
 {
 	setup();
 	init(argc, argv);
@@ -253,13 +255,14 @@ int Application::loadConfiguration(int priority)
 		++n;
 	}
 #endif
-	if (n > 0)
+	if (n > 0 && _loadedConfigs == 0)
 	{
 		if (!confPath.isAbsolute())
 			_pConfig->setString("application.configDir", confPath.absolute().parent().toString());
 		else
 			_pConfig->setString("application.configDir", confPath.parent().toString());
 	}
+	_loadedConfigs += n;
 	return n;
 }
 
@@ -297,13 +300,14 @@ void Application::loadConfiguration(const std::string& path, int priority)
 #endif
 	else throw Poco::InvalidArgumentException("Unsupported configuration file type", ext);
 
-	if (n > 0 && !_pConfig->has("application.configDir"))
+	if (n > 0 && _loadedConfigs == 0)
 	{
 		if (!confPath.isAbsolute())
 			_pConfig->setString("application.configDir", confPath.absolute().parent().toString());
 		else
 			_pConfig->setString("application.configDir", confPath.parent().toString());
 	}
+	_loadedConfigs += n;
 }
 
 
@@ -434,7 +438,7 @@ void Application::getApplicationPath(Poco::Path& appPath) const
 	}
 	else
 	{
-		if (!Path::find(Environment::get("PATH"), _command, appPath))
+		if (!Environment::has("PATH") || !Path::find(Environment::get("PATH"), _command, appPath))
 			appPath = Path(_workingDirAtLaunch, _command);
 		appPath.makeAbsolute();
 	}
diff --git a/Util/src/ServerApplication.cpp b/Util/src/ServerApplication.cpp
index caee6eecd8..3070b0477f 100644
--- a/Util/src/ServerApplication.cpp
+++ b/Util/src/ServerApplication.cpp
@@ -64,7 +64,7 @@ SERVICE_STATUS        ServerApplication::_serviceStatus;
 SERVICE_STATUS_HANDLE ServerApplication::_serviceStatusHandle = 0; 
 #endif
 #endif
-#if defined(POCO_VXWORKS) || defined(POCO_ANDROID)
+#if defined(POCO_VXWORKS) || defined(POCO_ANDROID) || defined(__NACL__)
 Poco::Event ServerApplication::_terminate;
 #endif
 
@@ -102,7 +102,7 @@ void ServerApplication::terminate()
 {
 #if defined(POCO_OS_FAMILY_WINDOWS)
 	_terminate.set();
-#elif defined(POCO_VXWORKS) || defined(POCO_ANDROID)
+#elif defined(POCO_VXWORKS) || defined(POCO_ANDROID) || defined(__NACL__)
 	_terminate.set();
 #else
 	Poco::Process::requestTermination(Process::id());
@@ -132,8 +132,23 @@ BOOL ServerApplication::ConsoleCtrlHandler(DWORD ctrlType)
 }
 
 
-void ServerApplication::ServiceControlHandler(DWORD control)
+HDEVNOTIFY ServerApplication::registerServiceDeviceNotification(LPVOID filter, DWORD flags)
 {
+	return RegisterDeviceNotification(_serviceStatusHandle, filter, flags);
+}
+
+
+DWORD ServerApplication::handleDeviceEvent(DWORD /*event_type*/, LPVOID /*event_data*/)
+{
+	return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+
+DWORD ServerApplication::ServiceControlHandler(DWORD control, DWORD event_type, LPVOID event_data, LPVOID context)
+{
+	DWORD result = NO_ERROR;
+	ServerApplication* pThis = reinterpret_cast<ServerApplication*>(context);
+
 	switch (control) 
 	{ 
 	case SERVICE_CONTROL_STOP:
@@ -142,9 +157,16 @@ void ServerApplication::ServiceControlHandler(DWORD control)
 		_serviceStatus.dwCurrentState = SERVICE_STOP_PENDING;
 		break;
 	case SERVICE_CONTROL_INTERROGATE: 
-		break; 
+		break;
+	case SERVICE_CONTROL_DEVICEEVENT:
+		if (pThis)
+		{
+			result = pThis->handleDeviceEvent(event_type, event_data);
+		}
+		break;
 	} 
 	SetServiceStatus(_serviceStatusHandle,  &_serviceStatus);
+	return result;
 }
 
 
@@ -159,9 +181,9 @@ void ServerApplication::ServiceMain(DWORD argc, LPTSTR* argv)
 	app.config().setBool("application.runAsService", true);
 
 #if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
-	_serviceStatusHandle = RegisterServiceCtrlHandlerW(L"", ServiceControlHandler);
+	_serviceStatusHandle = RegisterServiceCtrlHandlerExW(L"", ServiceControlHandler, &app);
 #else
-	_serviceStatusHandle = RegisterServiceCtrlHandlerA("", ServiceControlHandler);
+	_serviceStatusHandle = RegisterServiceCtrlHandlerExA("", ServiceControlHandler, &app);
 #endif
 	if (!_serviceStatusHandle)
 		throw SystemException("cannot register service control handler");
@@ -570,7 +592,7 @@ void ServerApplication::defineOptions(OptionSet& options)
 //
 void ServerApplication::waitForTerminationRequest()
 {
-#ifndef POCO_ANDROID
+#if !defined(POCO_ANDROID) && !defined(__NACL__)
 	sigset_t sset;
 	sigemptyset(&sset);
 	if (!std::getenv("POCO_ENABLE_DEBUGGER"))
@@ -582,7 +604,7 @@ void ServerApplication::waitForTerminationRequest()
 	sigprocmask(SIG_BLOCK, &sset, NULL);
 	int sig;
 	sigwait(&sset, &sig);
-#else // POCO_ANDROID
+#else // POCO_ANDROID || __NACL__
 	_terminate.wait();
 #endif
 }
diff --git a/Util/testsuite/src/SystemConfigurationTest.cpp b/Util/testsuite/src/SystemConfigurationTest.cpp
index dc368a310e..f5d8d68c18 100644
--- a/Util/testsuite/src/SystemConfigurationTest.cpp
+++ b/Util/testsuite/src/SystemConfigurationTest.cpp
@@ -84,10 +84,11 @@ void SystemConfigurationTest::testKeys()
 
 	pConf->keys("system", keys);
 #if defined(POCO_VXWORKS)
-	assert (keys.size() == 10);
+	assert (keys.size() == 15);
 #else
-	assert (keys.size() == 11);
+	assert (keys.size() == 16);
 #endif
+
 	assert (std::find(keys.begin(), keys.end(), "osName") != keys.end());
 	assert (std::find(keys.begin(), keys.end(), "osVersion") != keys.end());
 	assert (std::find(keys.begin(), keys.end(), "osArchitecture") != keys.end());
@@ -95,7 +96,12 @@ void SystemConfigurationTest::testKeys()
 	assert (std::find(keys.begin(), keys.end(), "nodeId") != keys.end());
 	assert (std::find(keys.begin(), keys.end(), "currentDir") != keys.end());
 	assert (std::find(keys.begin(), keys.end(), "homeDir") != keys.end());
+	assert (std::find(keys.begin(), keys.end(), "configHomeDir") != keys.end());
+	assert (std::find(keys.begin(), keys.end(), "cacheHomeDir") != keys.end());
+	assert (std::find(keys.begin(), keys.end(), "dataHomeDir") != keys.end());
+	assert (std::find(keys.begin(), keys.end(), "tempHomeDir") != keys.end());
 	assert (std::find(keys.begin(), keys.end(), "tempDir") != keys.end());
+	assert (std::find(keys.begin(), keys.end(), "configDir") != keys.end());
 	assert (std::find(keys.begin(), keys.end(), "dateTime") != keys.end());
 #if !defined(POCO_VXWORKS)
 	assert (std::find(keys.begin(), keys.end(), "pid") != keys.end());
diff --git a/build/config/Linux-SolarisStudio b/build/config/Linux-SolarisStudio
new file mode 100644
index 0000000000..fd41480906
--- /dev/null
+++ b/build/config/Linux-SolarisStudio
@@ -0,0 +1,71 @@
+#
+# $Id$
+#
+# Linux
+#
+# Make settings for Linux/SolarisStudio/
+#
+#
+
+#
+# General Settings
+#
+LINKMODE ?= SHARED
+
+#
+# Define Tools
+#
+CC      = cc
+CXX     = CC
+LINK    = $(CXX)
+LIB     = $(CXX) -xar -o $@
+RANLIB  = ranlib
+SHLIB   = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
+SHLIBLN = $(POCO_BASE)/build/script/shlibln
+STRIP   = ${CROSS_COMPILE}strip
+DEP     = $(POCO_BASE)/build/script/makedepend.SunCC 
+SHELL   = sh
+RM      = rm -rf
+CP      = cp
+MKDIR   = mkdir -p
+
+#
+# Extension for Shared Libraries
+#
+SHAREDLIBEXT     = .so.$(target_version)
+SHAREDLIBLINKEXT = .so
+
+#
+# Compiler and Linker Flags
+#
+CFLAGS          = -mt
+CFLAGS32        =
+CFLAGS64        =
+CXXFLAGS        = -mt -std=c++11 -erroff=hidevf
+CXXFLAGS32      =
+CXXFLAGS64      =
+LINKFLAGS       =
+LINKFLAGS32     =
+LINKFLAGS64     =
+STATICOPT_CC    =
+STATICOPT_CXX   =
+STATICOPT_LINK  = -Bstatic
+SHAREDOPT_CC    = -KPIC
+SHAREDOPT_CXX   = -KPIC
+SHAREDOPT_LINK  = -Bdynamic
+DEBUGOPT_CC     = -g -D_DEBUG
+DEBUGOPT_CXX    = -g -D_DEBUG
+DEBUGOPT_LINK   = -g
+RELEASEOPT_CC   = -xO5 -DNDEBUG
+RELEASEOPT_CXX  = -xO5 -DNDEBUG
+RELEASEOPT_LINK = -xO5
+
+#
+# System Specific Flags
+#
+SYSFLAGS = -DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_FPENVIRONMENT -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL
+
+#
+# System Specific Libraries
+#
+SYSLIBS  = -lpthread -ldl -lrt
diff --git a/build/config/Linux-clang b/build/config/Linux-clang
new file mode 100644
index 0000000000..ab5122a421
--- /dev/null
+++ b/build/config/Linux-clang
@@ -0,0 +1,71 @@
+#
+# $Id$
+#
+# Linux
+#
+# Make settings for Linux/clang
+#
+#
+
+#
+# General Settings
+#
+LINKMODE ?= SHARED
+
+#
+# Define Tools
+#
+CC      = clang$(CLANG_VERSION)
+CXX     = clang++$(CLANG_VERSION)
+LINK    = $(CXX)
+LIB     = ${CROSS_COMPILE}ar -cr
+RANLIB  = ${CROSS_COMPILE}ranlib
+SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
+SHLIBLN = $(POCO_BASE)/build/script/shlibln
+STRIP   = ${CROSS_COMPILE}strip
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+SHELL   = sh
+RM      = rm -rf
+CP      = cp
+MKDIR   = mkdir -p
+
+#
+# Extension for Shared Libraries
+#
+SHAREDLIBEXT     = .so.$(target_version)
+SHAREDLIBLINKEXT = .so
+
+#
+# Compiler and Linker Flags
+#
+CFLAGS          = 
+CFLAGS32        =
+CFLAGS64        =
+CXXFLAGS        = -Wall -Wno-sign-compare
+CXXFLAGS32      =
+CXXFLAGS64      =
+LINKFLAGS       =
+LINKFLAGS32     =
+LINKFLAGS64     =
+STATICOPT_CC    =
+STATICOPT_CXX   =
+STATICOPT_LINK  = -static
+SHAREDOPT_CC    = -fPIC
+SHAREDOPT_CXX   = -fPIC
+SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)
+DEBUGOPT_CC     = -g -D_DEBUG
+DEBUGOPT_CXX    = -g -D_DEBUG
+DEBUGOPT_LINK   = -g
+RELEASEOPT_CC   = -O2 -DNDEBUG
+RELEASEOPT_CXX  = -O2 -DNDEBUG
+RELEASEOPT_LINK = -O2
+
+#
+# System Specific Flags
+#
+SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL
+
+#
+# System Specific Libraries
+#
+SYSLIBS  = -lpthread -ldl -lrt
diff --git a/build/config/NaCl-x86 b/build/config/NaCl-x86
new file mode 100644
index 0000000000..8430c0e46b
--- /dev/null
+++ b/build/config/NaCl-x86
@@ -0,0 +1,74 @@
+#
+# $Id: //poco/1.4/build/config/Linux#2 $
+#
+# Linux
+#
+# Make settings for Linux 2.6/gcc 3.3
+#
+#
+
+#
+# General Settings
+#
+LINKMODE ?= SHARED
+POCO_TARGET_OSNAME = NaCl
+POCO_TARGET_OSARCH = i686
+CROSS_COMPILE      = i686-nacl-
+
+#
+# Define Tools
+#
+CC      = ${CROSS_COMPILE}gcc
+CXX     = ${CROSS_COMPILE}g++
+LINK    = $(CXX)
+LIB     = ${AR} -cr
+RANLIB  = ${CROSS_COMPILE}ranlib
+SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
+SHLIBLN = $(POCO_BASE)/build/script/shlibln
+STRIP   = ${CROSS_COMPILE}strip
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+SHELL   = sh
+RM      = rm -rf
+CP      = cp
+MKDIR   = mkdir -p
+
+#
+# Extension for Shared Libraries
+#
+SHAREDLIBEXT     = .so.$(target_version)
+SHAREDLIBLINKEXT = .so
+
+#
+# Compiler and Linker Flags
+#
+CFLAGS          = 
+CFLAGS32        =
+CFLAGS64        =
+CXXFLAGS        = -Wall -Wno-sign-compare
+CXXFLAGS32      =
+CXXFLAGS64      =
+LINKFLAGS       =
+LINKFLAGS32     =
+LINKFLAGS64     =
+STATICOPT_CC    =
+STATICOPT_CXX   =
+STATICOPT_LINK  = -static
+SHAREDOPT_CC    = -fPIC
+SHAREDOPT_CXX   = -fPIC
+SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)
+DEBUGOPT_CC     = -g -D_DEBUG
+DEBUGOPT_CXX    = -g -D_DEBUG
+DEBUGOPT_LINK   = -g
+RELEASEOPT_CC   = -O2 -DNDEBUG
+RELEASEOPT_CXX  = -O2 -DNDEBUG
+RELEASEOPT_LINK = -O2
+
+#
+# System Specific Flags
+#
+SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL -D__NACL__
+
+#
+# System Specific Libraries
+#
+SYSLIBS  = -lpthread -ldl -lrt
diff --git a/build/config/NaCl-x86_64 b/build/config/NaCl-x86_64
new file mode 100644
index 0000000000..9aa8b50da8
--- /dev/null
+++ b/build/config/NaCl-x86_64
@@ -0,0 +1,74 @@
+#
+# $Id: //poco/1.4/build/config/Linux#2 $
+#
+# Linux
+#
+# Make settings for Linux 2.6/gcc 3.3
+#
+#
+
+#
+# General Settings
+#
+LINKMODE ?= SHARED
+POCO_TARGET_OSNAME = NaCl
+POCO_TARGET_OSARCH = x86_64
+CROSS_COMPILE      = x86_64-nacl-
+
+#
+# Define Tools
+#
+CC      = ${CROSS_COMPILE}gcc
+CXX     = ${CROSS_COMPILE}g++
+LINK    = $(CXX)
+LIB     = ${AR} -cr
+RANLIB  = ${CROSS_COMPILE}ranlib
+SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
+SHLIBLN = $(POCO_BASE)/build/script/shlibln
+STRIP   = ${CROSS_COMPILE}strip
+DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
+SHELL   = sh
+RM      = rm -rf
+CP      = cp
+MKDIR   = mkdir -p
+
+#
+# Extension for Shared Libraries
+#
+SHAREDLIBEXT     = .so.$(target_version)
+SHAREDLIBLINKEXT = .so
+
+#
+# Compiler and Linker Flags
+#
+CFLAGS          = 
+CFLAGS32        =
+CFLAGS64        =
+CXXFLAGS        = -Wall -Wno-sign-compare
+CXXFLAGS32      =
+CXXFLAGS64      =
+LINKFLAGS       =
+LINKFLAGS32     =
+LINKFLAGS64     =
+STATICOPT_CC    = -fPIC
+STATICOPT_CXX   = -fPIC
+STATICOPT_LINK  = -static
+SHAREDOPT_CC    = -fPIC
+SHAREDOPT_CXX   = -fPIC
+SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)
+DEBUGOPT_CC     = -g -D_DEBUG
+DEBUGOPT_CXX    = -g -D_DEBUG
+DEBUGOPT_LINK   = -g
+RELEASEOPT_CC   = -O2 -DNDEBUG
+RELEASEOPT_CXX  = -O2 -DNDEBUG
+RELEASEOPT_LINK = -O2
+
+#
+# System Specific Flags
+#
+SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL -D__NACL__
+
+#
+# System Specific Libraries
+#
+SYSLIBS  = -lpthread -ldl -lrt
diff --git a/build/rules/global b/build/rules/global
index 33c593a8e5..0a582a1c50 100644
--- a/build/rules/global
+++ b/build/rules/global
@@ -285,7 +285,9 @@ STRIPCMD = $(STRIP) $@$(BINEXT)
 endif
 
 #
-# Make CC and CXX environment vars
+# Make CC, CXX and LINK environment vars
 #
 export CC
 export CXX
+export LINK
+
diff --git a/build/script/runtests.sh b/build/script/runtests.sh
index f541cda494..c5fd939a8d 100755
--- a/build/script/runtests.sh
+++ b/build/script/runtests.sh
@@ -51,7 +51,7 @@ do
 				runs=`expr $runs + 1`
 				sh -c "cd $POCO_BASE/$comp/testsuite/$BINDIR && $TESTRUNNER $TESTRUNNERARGS"
 				if [ $? -ne 0 ] ; then
-					failues=`expr $failures + 1`
+					failures=`expr $failures + 1`
 					failedTests="$failedTests $comp"
 					status=1
 				fi
diff --git a/build_cmake.sh b/build_cmake.sh
index 70e4766d24..39e679c308 100755
--- a/build_cmake.sh
+++ b/build_cmake.sh
@@ -8,7 +8,7 @@ rm -rf cmake-build
 mkdir cmake-build
 cd cmake-build
 
-cmake ../. -DCMAKE_BUILD_TYPE=Debug  $1 $2 $3 $4 $5
+cmake ../. -DCMAKE_BUILD_TYPE=Debug $1 $2 $3 $4 $5
 make -j3
 make install
 
diff --git a/doc/99200-WinCEPlatformNotes.page b/doc/99200-WinCEPlatformNotes.page
index fb343e55e1..51e3bccb51 100644
--- a/doc/99200-WinCEPlatformNotes.page
+++ b/doc/99200-WinCEPlatformNotes.page
@@ -58,11 +58,18 @@ similar features. In this case, the calls to the wceex_* functions need to be re
 the wcecompat counterparts. The affected files are Random.cpp, LocalDateTime.cpp,
 Timezone_WINCE.cpp and ThreadPool.cpp.
 
+Starting with Windows Embedded Compact 2013 (Windows CE 8), WCELIBCEX or wcecompat
+are no longer required, as the C/C++ runtime libraries have all necessary features.
+
 To obtain the current date and time with millisecond resolution,
 the hack described in <http://community.opennetcf.com/articles/cf/archive/2007/11/20/getting-a-millisecond-resolution-datetime-under-windows-ce.aspx>
 is used. This means there will be a one second delay when starting up
 the application.
 
+In POCO version 1.6.1 or later, this hack is no longer enabled automatically. If
+required, it can be enabled by building the Foundation library with the
+POCO_WINCE_TIMESTAMP_HACK macro defined.
+
 
 !!Poco::Path
 
diff --git a/doc/poco.png b/doc/poco.png
new file mode 100644
index 0000000000..160e29d742
Binary files /dev/null and b/doc/poco.png differ
diff --git a/travis/runtests.sh b/travis/runtests.sh
new file mode 100755
index 0000000000..3600880eb9
--- /dev/null
+++ b/travis/runtests.sh
@@ -0,0 +1,14 @@
+set -ev
+export POCO_BASE=`pwd`
+export CPPUNIT_IGNORE="\
+  N7CppUnit10TestCallerI8PathTestEE.testExpand \
+  N7CppUnit10TestCallerI13RawSocketTestEE.testEchoIPv4 \
+  N7CppUnit10TestCallerI13RawSocketTestEE.testSendToReceiveFromIPv4 \
+  N7CppUnit10TestCallerI14ICMPClientTestEE.testPing \
+  N7CppUnit10TestCallerI22HTTPSClientSessionTestEE.testProxy \
+  N7CppUnit10TestCallerI22HTTPSStreamFactoryTestEE.testProxy \
+  N7CppUnit10TestCallerI19MulticastSocketTestEE.testMulticast"
+export EXCLUDE_TESTS="Data/MySQL Data/ODBC MongoDB PDF"
+export PATH=$PATH:.
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.
+build/script/runtests.sh