diff --git a/Util/Util_CE_vs90.vcproj b/Util/Util_CE_vs90.vcproj
index 6aa047877..c21ee1711 100644
--- a/Util/Util_CE_vs90.vcproj
+++ b/Util/Util_CE_vs90.vcproj
@@ -1,39 +1,49 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	Name="Util"
-	Version="9.00"
 	ProjectType="Visual C++"
+	Version="9.00"
+	Name="Util"
 	ProjectGUID="{6FF56CDB-787A-4714-A28C-919003F9FA6C}"
 	RootNamespace="Util"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
 	<Platforms>
 		<Platform
-			Name="Digi JumpStart (ARMV4I)"/>
+			Name="Digi JumpStart (ARMV4I)"
+		/>
 	</Platforms>
-	<ToolFiles/>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="debug_shared|Digi JumpStart (ARMV4I)"
 			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;..\Foundation\include;..\XML\include"
+				AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\JSON\include"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Util_EXPORTS"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -44,14 +54,18 @@
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
-				InterworkCalls="false"/>
+				InterworkCalls="false"
+			/>
 			<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"
@@ -69,50 +83,65 @@
 				EnableCOMDATFolding="0"
 				RandomizedBaseAddress="1"
 				ImportLibrary="..\lib\$(PlatformName)\PocoUtild.lib"
-				TargetMachine="0"/>
+				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\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="obj\$(PlatformName)\$(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"
-				TargetEnvironment="1"/>
+				TargetEnvironment="1"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="4"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include"
+				AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\JSON\include"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Util_EXPORTS"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -123,14 +152,18 @@
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
-				InterworkCalls="false"/>
+				InterworkCalls="false"
+			/>
 			<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"
@@ -147,48 +180,63 @@
 				OptimizeReferences="0"
 				EnableCOMDATFolding="0"
 				ImportLibrary="..\lib\$(PlatformName)\PocoUtil.lib"
-				TargetMachine="0"/>
+				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\$(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;..\Foundation\include;..\XML\include"
+				AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\JSON\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"
@@ -202,59 +250,78 @@
 				CompileAs="0"
 				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
-				InterworkCalls="false"/>
+				InterworkCalls="false"
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoUtilmtd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoUtilmtd.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\$(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;..\Foundation\include;..\XML\include"
+				AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\JSON\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"
@@ -267,57 +334,76 @@
 				CompileAs="0"
 				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
-				InterworkCalls="false"/>
+				InterworkCalls="false"
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoUtilmt.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoUtilmt.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\$(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;..\Foundation\include;..\XML\include"
+				AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\JSON\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"
@@ -331,59 +417,78 @@
 				CompileAs="0"
 				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
-				InterworkCalls="false"/>
+				InterworkCalls="false"
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoUtilmdd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoUtilmdd.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\$(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;..\Foundation\include;..\XML\include"
+				AdditionalIncludeDirectories=".\include;..\Foundation\include;..\XML\include;..\JSON\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"
@@ -396,248 +501,409 @@
 				CompileAs="0"
 				DisableSpecificWarnings="4800;"
 				CompileForArchitecture="2"
-				InterworkCalls="false"/>
+				InterworkCalls="false"
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoUtilmd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoUtilmd.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="Application">
+			Name="Application"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\include\Poco\Util\Application.h"/>
+					RelativePath=".\include\Poco\Util\Application.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\LoggingSubsystem.h"/>
+					RelativePath=".\include\Poco\Util\LoggingSubsystem.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\ServerApplication.h"/>
+					RelativePath=".\include\Poco\Util\ServerApplication.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\Subsystem.h"/>
+					RelativePath=".\include\Poco\Util\Subsystem.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\Application.cpp"/>
+					RelativePath=".\src\Application.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\LoggingSubsystem.cpp"/>
+					RelativePath=".\src\LoggingSubsystem.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\ServerApplication.cpp"/>
+					RelativePath=".\src\ServerApplication.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\Subsystem.cpp"/>
+					RelativePath=".\src\Subsystem.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Configuration">
+			Name="Configuration"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\include\Poco\Util\AbstractConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\AbstractConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\ConfigurationMapper.h"/>
+					RelativePath=".\include\Poco\Util\ConfigurationMapper.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\ConfigurationView.h"/>
+					RelativePath=".\include\Poco\Util\ConfigurationView.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\FilesystemConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\FilesystemConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\IniFileConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\IniFileConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\LayeredConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\JSONConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\LoggingConfigurator.h"/>
+					RelativePath=".\include\Poco\Util\LayeredConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\MapConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\LoggingConfigurator.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\PropertyFileConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\MapConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\SystemConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\PropertyFileConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\XMLConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\SystemConfiguration.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\Util\XMLConfiguration.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\AbstractConfiguration.cpp"/>
+					RelativePath=".\src\AbstractConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\ConfigurationMapper.cpp"/>
+					RelativePath=".\src\ConfigurationMapper.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\ConfigurationView.cpp"/>
+					RelativePath=".\src\ConfigurationView.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\FilesystemConfiguration.cpp"/>
+					RelativePath=".\src\FilesystemConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\IniFileConfiguration.cpp"/>
+					RelativePath=".\src\IniFileConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\LayeredConfiguration.cpp"/>
+					RelativePath=".\src\JSONConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\LoggingConfigurator.cpp"/>
+					RelativePath=".\src\LayeredConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\MapConfiguration.cpp"/>
+					RelativePath=".\src\LoggingConfigurator.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\PropertyFileConfiguration.cpp"/>
+					RelativePath=".\src\MapConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\SystemConfiguration.cpp"/>
+					RelativePath=".\src\PropertyFileConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\XMLConfiguration.cpp"/>
+					RelativePath=".\src\SystemConfiguration.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\XMLConfiguration.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Options">
+			Name="Options"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\include\Poco\Util\HelpFormatter.h"/>
+					RelativePath=".\include\Poco\Util\HelpFormatter.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\IntValidator.h"/>
+					RelativePath=".\include\Poco\Util\IntValidator.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\Option.h"/>
+					RelativePath=".\include\Poco\Util\Option.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\OptionCallback.h"/>
+					RelativePath=".\include\Poco\Util\OptionCallback.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\OptionException.h"/>
+					RelativePath=".\include\Poco\Util\OptionException.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\OptionProcessor.h"/>
+					RelativePath=".\include\Poco\Util\OptionProcessor.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\OptionSet.h"/>
+					RelativePath=".\include\Poco\Util\OptionSet.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\RegExpValidator.h"/>
+					RelativePath=".\include\Poco\Util\RegExpValidator.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\Validator.h"/>
+					RelativePath=".\include\Poco\Util\Validator.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\HelpFormatter.cpp"/>
+					RelativePath=".\src\HelpFormatter.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\IntValidator.cpp"/>
+					RelativePath=".\src\IntValidator.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\Option.cpp"/>
+					RelativePath=".\src\Option.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\OptionCallback.cpp"/>
+					RelativePath=".\src\OptionCallback.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\OptionException.cpp"/>
+					RelativePath=".\src\OptionException.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\OptionProcessor.cpp"/>
+					RelativePath=".\src\OptionProcessor.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\OptionSet.cpp"/>
+					RelativePath=".\src\OptionSet.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\RegExpValidator.cpp"/>
+					RelativePath=".\src\RegExpValidator.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\Validator.cpp"/>
+					RelativePath=".\src\Validator.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Windows">
+			Name="Windows"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\include\Poco\Util\WinRegistryConfiguration.h"/>
+					RelativePath=".\include\Poco\Util\WinRegistryConfiguration.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\WinRegistryKey.h"/>
+					RelativePath=".\include\Poco\Util\WinRegistryKey.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\WinService.h"/>
+					RelativePath=".\include\Poco\Util\WinService.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\WinRegistryConfiguration.cpp"/>
+					RelativePath=".\src\WinRegistryConfiguration.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\WinRegistryKey.cpp"/>
+					RelativePath=".\src\WinRegistryKey.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\WinService.cpp"/>
+					RelativePath=".\src\WinService.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Util">
+			Name="Util"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\include\Poco\Util\Util.h"/>
+					RelativePath=".\include\Poco\Util\Util.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files"/>
+				Name="Source Files"
+				>
+			</Filter>
 		</Filter>
 		<Filter
-			Name="Timer">
+			Name="Timer"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\include\Poco\Util\Timer.h"/>
+					RelativePath=".\include\Poco\Util\Timer.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\TimerTask.h"/>
+					RelativePath=".\include\Poco\Util\TimerTask.h"
+					>
+				</File>
 				<File
-					RelativePath=".\include\Poco\Util\TimerTaskAdapter.h"/>
+					RelativePath=".\include\Poco\Util\TimerTaskAdapter.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\Timer.cpp"/>
+					RelativePath=".\src\Timer.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\TimerTask.cpp"/>
+					RelativePath=".\src\TimerTask.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<File
-			RelativePath="..\DLLVersion.rc">
-			<FileConfiguration
-				Name="debug_shared|Digi JumpStart (ARMV4I)">
-				<Tool
-					Name="VCResourceCompilerTool"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="release_shared|Digi JumpStart (ARMV4I)">
-				<Tool
-					Name="VCResourceCompilerTool"/>
-			</FileConfiguration>
+			RelativePath="..\DLLVersion.rc"
+			>
 			<FileConfiguration
 				Name="debug_static_mt|Digi JumpStart (ARMV4I)"
-				ExcludedFromBuild="true">
+				ExcludedFromBuild="true"
+				>
 				<Tool
-					Name="VCResourceCompilerTool"/>
+					Name="VCResourceCompilerTool"
+				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_mt|Digi JumpStart (ARMV4I)"
-				ExcludedFromBuild="true">
+				ExcludedFromBuild="true"
+				>
 				<Tool
-					Name="VCResourceCompilerTool"/>
+					Name="VCResourceCompilerTool"
+				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_md|Digi JumpStart (ARMV4I)"
-				ExcludedFromBuild="true">
+				ExcludedFromBuild="true"
+				>
 				<Tool
-					Name="VCResourceCompilerTool"/>
+					Name="VCResourceCompilerTool"
+				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_md|Digi JumpStart (ARMV4I)"
-				ExcludedFromBuild="true">
+				ExcludedFromBuild="true"
+				>
 				<Tool
-					Name="VCResourceCompilerTool"/>
+					Name="VCResourceCompilerTool"
+				/>
 			</FileConfiguration>
 		</File>
 	</Files>
-	<Globals/>
+	<Globals>
+	</Globals>
 </VisualStudioProject>
diff --git a/Util/testsuite/src/WinConfigurationTest.cpp b/Util/testsuite/src/WinConfigurationTest.cpp
index 022239cc5..c9eedb053 100644
--- a/Util/testsuite/src/WinConfigurationTest.cpp
+++ b/Util/testsuite/src/WinConfigurationTest.cpp
@@ -30,6 +30,9 @@
 //
 
 
+#if !defined(_WIN32_WCE)
+
+
 #include "WinConfigurationTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
@@ -147,3 +150,6 @@ CppUnit::Test* WinConfigurationTest::suite()
 
 	return pSuite;
 }
+
+
+#endif // _WIN32_WCE
\ No newline at end of file
diff --git a/Util/testsuite/src/WinRegistryTest.cpp b/Util/testsuite/src/WinRegistryTest.cpp
index 561e0fa3a..1537554fa 100644
--- a/Util/testsuite/src/WinRegistryTest.cpp
+++ b/Util/testsuite/src/WinRegistryTest.cpp
@@ -30,6 +30,9 @@
 //
 
 
+#if !defined(_WIN32_WCE)
+
+
 #include "WinRegistryTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
@@ -121,3 +124,6 @@ CppUnit::Test* WinRegistryTest::suite()
 
 	return pSuite;
 }
+
+
+#endif // _WIN32_WCE
\ No newline at end of file
diff --git a/Util/testsuite/src/WindowsTestSuite.cpp b/Util/testsuite/src/WindowsTestSuite.cpp
index 209754814..125002b03 100644
--- a/Util/testsuite/src/WindowsTestSuite.cpp
+++ b/Util/testsuite/src/WindowsTestSuite.cpp
@@ -31,16 +31,20 @@
 
 
 #include "WindowsTestSuite.h"
+#ifndef _WIN32_WCE
 #include "WinRegistryTest.h"
 #include "WinConfigurationTest.h"
+#endif
 
 
 CppUnit::Test* WindowsTestSuite::suite()
 {
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("WindowsTestSuite");
 
+#ifndef _WIN32_WCE
 	pSuite->addTest(WinRegistryTest::suite());
 	pSuite->addTest(WinConfigurationTest::suite());
+#endif
 
 	return pSuite;
 }