diff --git a/JSON/JSON.progen b/JSON/JSON.progen
index 0a001bf0d..c4006f24b 100644
--- a/JSON/JSON.progen
+++ b/JSON/JSON.progen
@@ -1,10 +1,10 @@
-vc.project.guid = 7BFB91BC-6003-43E6-BF91-AFB255C779E3
+vc.project.guid = A63135B8-0DFC-428C-AF90-BC020BE83D0C
 vc.project.name = JSON
 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.platforms = Win32, x64
 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}_vs100.vcxproj
 vc.project.compiler.include = ..\\Foundation\\include
diff --git a/JSON/JSON_vs100.sln b/JSON/JSON_vs100.sln
index 2fb072d2a..81f06553d 100644
--- a/JSON/JSON_vs100.sln
+++ b/JSON/JSON_vs100.sln
@@ -1,43 +1,58 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs100.vcxproj", "{7BFB91BC-6003-43E6-BF91-AFB255C779E3}"
+Project("{21853681-C2D5-40EB-927B-D41A4A01E14F}") = "JSON", "JSON_vs100.vcxproj", "{A63135B8-0DFC-428C-AF90-BC020BE83D0C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{57EC37F0-9E26-11E1-A8B0-0800200C9A66}"
+Project("{21853681-C2D5-40EB-927B-D41A4A01E14F}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C} = {A63135B8-0DFC-428C-AF90-BC020BE83D0C}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_shared|Win32 = debug_shared|Win32
-		debug_static_md|Win32 = debug_static_md|Win32
-		debug_static_mt|Win32 = debug_static_mt|Win32
 		release_shared|Win32 = release_shared|Win32
-		release_static_md|Win32 = release_static_md|Win32
+		debug_static_mt|Win32 = debug_static_mt|Win32
 		release_static_mt|Win32 = release_static_mt|Win32
+		debug_static_md|Win32 = debug_static_md|Win32
+		release_static_md|Win32 = release_static_md|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.release_shared|Win32.Build.0 = release_shared|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{7BFB91BC-6003-43E6-BF91-AFB255C779E3}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.release_shared|Win32.Build.0 = release_shared|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{57EC37F0-9E26-11E1-A8B0-0800200C9A66}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Build.0 = release_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Build.0 = release_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Deploy.0 = release_shared|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Build.0 = release_static_md|Win32
+		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/JSON/JSON_vs100.vcxproj b/JSON/JSON_vs100.vcxproj
index 3ec127909..e2c646c77 100644
--- a/JSON/JSON_vs100.vcxproj
+++ b/JSON/JSON_vs100.vcxproj
@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>JSON</ProjectName>
-    <ProjectGuid>{9E211743-85FE-4977-82F3-4F04B40C912D}</ProjectGuid>
+    <ProjectGuid>{A63135B8-0DFC-428C-AF90-BC020BE83D0C}</ProjectGuid>
     <RootNamespace>XML</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj b/JSON/testsuite/TestSuite_vs100.vcxproj
index 7ee64eb4f..7d53c7f02 100644
--- a/JSON/testsuite/TestSuite_vs100.vcxproj
+++ b/JSON/testsuite/TestSuite_vs100.vcxproj
@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{C9ACF028-17A1-44C2-8C09-DFD3BD9E7D45}</ProjectGuid>
+    <ProjectGuid>{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}</ProjectGuid>
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>