From 9eb34f542c55632f5df96996dd2cbcd6184627b6 Mon Sep 17 00:00:00 2001
From: evhub <evanjhub@gmail.com>
Date: Mon, 28 Jul 2014 10:42:22 -0700
Subject: [PATCH] More fixes to VSProject sorting algorithm

---
 Builds/VisualStudio2013/RippleD.vcxproj       | 824 +++++++--------
 .../VisualStudio2013/RippleD.vcxproj.filters  | 936 +++++++++---------
 src/beast/site_scons/site_tools/VSProject.py  |  39 +-
 3 files changed, 901 insertions(+), 898 deletions(-)

diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index 57070d1745..7457615ce5 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -7,27 +7,16 @@
     <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="release|x64">
-      <Configuration>release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="debug|x64">
       <Configuration>debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="release|x64">
+      <Configuration>release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <LinkIncremental>False</LinkIncremental>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <UseOfMfc>False</UseOfMfc>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <IntDir>..\..\build\msvc.release\src\</IntDir>
-    <OutDir>..\..\build\msvc.release\</OutDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
     <CharacterSet>MultiByte</CharacterSet>
     <ConfigurationType>Application</ConfigurationType>
@@ -39,50 +28,26 @@
     <IntDir>..\..\build\msvc.debug\src\</IntDir>
     <OutDir>..\..\build\msvc.debug\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
+    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <LinkIncremental>False</LinkIncremental>
+    <UseDebugLibraries>False</UseDebugLibraries>
+    <UseOfMfc>False</UseOfMfc>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <IntDir>..\..\build\msvc.release\src\</IntDir>
+    <OutDir>..\..\build\msvc.release\</OutDir>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|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|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|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x6000;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <MinimalRebuild>False</MinimalRebuild>
-      <ErrorReporting>None</ErrorReporting>
-      <RuntimeTypeInfo>True</RuntimeTypeInfo>
-      <MultiProcessorCompilation>True</MultiProcessorCompilation>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>False</FunctionLevelLinking>
-      <SuppressStartupBanner>True</SuppressStartupBanner>
-      <OpenMPSupport>False</OpenMPSupport>
-      <TreatWarningAsError>False</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <ForceConformanceInForLoopScope>True</ForceConformanceInForLoopScope>
-      <Optimization>Full</Optimization>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalOptions>/bigobj /FS %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;comdlg32.lib;gdi32.lib;kernel32.lib;libeay32MT.lib;odbc32.lib;odbccp32.lib;ole32.lib;oleaut32.lib;shell32.lib;Shlwapi.lib;ssleay32MT.lib;user32.lib;uuid.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>True</SuppressStartupBanner>
-      <ErrorReporting>NoErrorReport</ErrorReporting>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>True</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <GenerateDebugInformation>True</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalOptions>/MANIFEST /TLBID:1 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>_WIN32_WINNT=0x6000;DEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -120,6 +85,41 @@
       <AdditionalOptions>/MANIFEST /TLBID:1 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x6000;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <FloatingPointModel>Precise</FloatingPointModel>
+      <MinimalRebuild>False</MinimalRebuild>
+      <ErrorReporting>None</ErrorReporting>
+      <RuntimeTypeInfo>True</RuntimeTypeInfo>
+      <MultiProcessorCompilation>True</MultiProcessorCompilation>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>False</FunctionLevelLinking>
+      <SuppressStartupBanner>True</SuppressStartupBanner>
+      <OpenMPSupport>False</OpenMPSupport>
+      <TreatWarningAsError>False</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <ForceConformanceInForLoopScope>True</ForceConformanceInForLoopScope>
+      <Optimization>Full</Optimization>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalOptions>/bigobj /FS %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;comdlg32.lib;gdi32.lib;kernel32.lib;libeay32MT.lib;odbc32.lib;odbccp32.lib;ole32.lib;oleaut32.lib;shell32.lib;Shlwapi.lib;ssleay32MT.lib;user32.lib;uuid.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>True</SuppressStartupBanner>
+      <ErrorReporting>NoErrorReport</ErrorReporting>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>True</RandomizedBaseAddress>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
+      <GenerateDebugInformation>True</GenerateDebugInformation>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>/MANIFEST /TLBID:1 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\build\proto\ripple.pb.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -130,44 +130,14 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\Arithmetic.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Atomic.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\ByteOrder.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Config.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Crypto.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\HeapBlock.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Insight.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Intrusive.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Memory.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\SmartPtr.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\StaticAssert.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Strings.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Threads.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Uncopyable.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Version.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\asio\Asio.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\asio\IPAddressConversion.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\asio\abstract_socket.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\asio\abstract_socket.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\asio\Asio.unity.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\asio\bind_handler.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\asio\buffer_sequence.h">
@@ -179,6 +149,8 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\asio\io_latency_probe.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\asio\IPAddressConversion.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\asio\memory_buffer.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\asio\placeholders.h">
@@ -201,6 +173,8 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\asio\wrap_handler.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Atomic.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\boost\Boost.unity.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -208,10 +182,7 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\boost\get_pointer.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\chrono\Chrono.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\chrono\RelativeTime.h">
+    <ClInclude Include="..\..\src\beast\beast\ByteOrder.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\chrono\abstract_clock.h">
     </ClInclude>
@@ -219,26 +190,33 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\chrono\basic_seconds_clock.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\chrono\Chrono.unity.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\chrono\chrono_io.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\chrono\chrono_util.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\chrono\impl\RelativeTime.cpp">
+    <ClCompile Include="..\..\src\beast\beast\chrono\impl\chrono_io.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\chrono\impl\chrono_io.cpp">
+    <ClCompile Include="..\..\src\beast\beast\chrono\impl\RelativeTime.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\chrono\manual_clock.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\chrono\ratio_io.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\chrono\RelativeTime.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\chrono\tests\abstract_clock.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\chrono\tests\basic_seconds_clock.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\Config.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\config\CompilerConfig.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\config\ConfigCheck.h">
@@ -255,9 +233,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\config\Suffix.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\container\Container.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\container\aged_container.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\container\aged_container_utility.h">
@@ -282,6 +257,9 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\container\const_container.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\container\Container.unity.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\container\detail\aged_associative_container.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\container\detail\aged_container_iterator.h">
@@ -316,39 +294,41 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\container\tests\hash_metrics.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Crypto.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\crypto\BinaryEncoding.h">
     </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\crypto\Crypto.unity.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\crypto\MurmurHash.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\crypto\Sha256.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedInteger.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedIntegerCalc.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\MurmurHash.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\Sha256.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\crypto\impl\UnsignedInteger.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\sha2\sha2.c">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\crypto\impl\sha2\sha2.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\crypto\impl\UnsignedInteger.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\crypto\MurmurHash.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\crypto\Sha256.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\crypto\tests\BinaryEncoding.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\tests\UnsignedInteger.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedInteger.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedIntegerCalc.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\cxx14\algorithm.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\cxx14\config.h">
@@ -369,12 +349,7 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\cxx14\utility.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\http\HTTP.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\http\ParsedURL.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\http\URL.h">
+    <ClInclude Include="..\..\src\beast\beast\HeapBlock.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\http\basic_url.h">
     </ClInclude>
@@ -384,10 +359,7 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\http\get.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\http\impl\ParsedURL.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\http\impl\URL.cpp">
+    <ClCompile Include="..\..\src\beast\beast\http\HTTP.unity.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\impl\basic_url.cpp">
@@ -409,29 +381,41 @@
     <ClCompile Include="..\..\src\beast\beast\http\impl\message_parser.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\http\impl\ParsedURL.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\impl\raw_parser.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\http\impl\URL.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\http\message_parser.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\http\method.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\http\ParsedURL.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\http\raw_parser.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\http\tests\ParsedURL.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\tests\basic_url.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\tests\client_session.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\http\tests\ParsedURL.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\tests\urls_large_data.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\http\tests\urls_large_data.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\http\URL.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Insight.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\insight\Base.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\insight\BaseImpl.h">
@@ -458,17 +442,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\insight\HookImpl.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\insight\Insight.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\insight\Meter.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\insight\MeterImpl.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\insight\NullCollector.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\insight\StatsDCollector.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\insight\impl\Collector.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -490,10 +463,25 @@
     <ClCompile Include="..\..\src\beast\beast\insight\impl\StatsDCollector.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\insight\Insight.unity.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\insight\Meter.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\insight\MeterImpl.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\insight\NullCollector.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\insight\StatsDCollector.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Intrusive.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\intrusive\List.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\intrusive\LockFreeStack.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Memory.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\module\asio\asio.h">
     </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\asio\asio.unity.cpp">
@@ -508,13 +496,13 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\module\asio\basics\PeerRole.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\asio\basics\SharedArg.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\asio\basics\SSLContext.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\module\asio\basics\SSLContext.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\asio\basics\SharedArg.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\asio\http\HTTPClientType.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -824,6 +812,14 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\module\core\text\StringPairArray.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\CriticalSection.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\DynamicLibrary.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\Process.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\ScopedLock.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\core\thread\DeadlineTimer.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -836,14 +832,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\module\core\thread\Workers.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\CriticalSection.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\DynamicLibrary.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\Process.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\ScopedLock.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\core\time\AtExitHook.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -943,21 +931,10 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\module\sqlite\sqlite\sqlite3.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\net\DynamicBuffer.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\net\IPAddress.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\net\IPAddressV4.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\net\IPAddressV6.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\net\IPEndpoint.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\net\Net.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\net\detail\Parse.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\net\DynamicBuffer.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\net\impl\DynamicBuffer.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -970,13 +947,28 @@
     <ClCompile Include="..\..\src\beast\beast\net\impl\IPEndpoint.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\net\IPAddress.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\net\IPAddressV4.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\net\IPAddressV6.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\net\IPEndpoint.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\net\Net.unity.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\net\tests\IPEndpoint.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\SmartPtr.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\smart_ptr\SharedObject.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\smart_ptr\SharedPtr.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\StaticAssert.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\streams\abstract_ostream.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\streams\basic_abstract_ostream.h">
@@ -993,6 +985,10 @@
     <ClCompile Include="..\..\src\beast\beast\streams\tests\basic_abstract_ostream.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\Strings.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\strings\CharacterFunctions.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\strings\CharPointer_ASCII.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\strings\CharPointer_UTF16.h">
@@ -1001,8 +997,12 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\strings\CharPointer_UTF8.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\strings\CharacterFunctions.h">
-    </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\strings\impl\CharacterFunctions.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\strings\impl\String.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\strings\NewLine.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\strings\String.h">
@@ -1014,40 +1014,7 @@
     <ClCompile Include="..\..\src\beast\beast\strings\Strings.unity.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\strings\impl\CharacterFunctions.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\strings\impl\String.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\threads\RecursiveMutex.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\ScopedWrapperContext.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\ServiceQueue.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SharedData.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SharedLockGuard.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SharedMutexAdapter.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SpinLock.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\Stoppable.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\Thread.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\ThreadLocalValue.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\threads\Threads.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\threads\TryLockGuard.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\UnlockGuard.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\WaitableEvent.h">
+    <ClInclude Include="..\..\src\beast\beast\Threads.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\threads\detail\BindHandler.h">
     </ClInclude>
@@ -1068,14 +1035,45 @@
     <ClCompile Include="..\..\src\beast\beast\threads\impl\WaitableEvent.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\threads\RecursiveMutex.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\ScopedWrapperContext.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\threads\semaphore.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\ServiceQueue.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SharedData.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SharedLockGuard.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SharedMutexAdapter.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SpinLock.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\Stoppable.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\threads\tests\Atomic.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\threads\tests\ServiceQueue.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\threads\Thread.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\ThreadLocalValue.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\threads\Threads.unity.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\threads\TryLockGuard.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\UnlockGuard.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\WaitableEvent.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Uncopyable.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\unit_test.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\unit_test\amount.h">
@@ -1103,27 +1101,14 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\unit_test\suite_list.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\Debug.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\Error.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\Journal.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\LeakChecked.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\PropertyStream.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\StaticObject.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\utility\Utility.unity.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\utility\Zero.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\ci_char_traits.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\Debug.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\empty_base_optimization.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\Error.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\utility\impl\Debug.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1144,41 +1129,61 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\utility\is_call_possible.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\Journal.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\LeakChecked.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\maybe_const.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\meta.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\noexcept.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\PropertyStream.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\StaticObject.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\static_initializer.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\tagged_integer.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\utility\tests\Journal.test.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\utility\tests\Zero.test.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\bassert.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\empty_base_optimization.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\utility\tests\Journal.test.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\static_initializer.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\tagged_integer.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\utility\tests\Zero.test.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\utility\type_name.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\utility\Utility.unity.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\utility\Zero.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Version.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\builder.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\hyperleveldb\db\builder.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\hyperleveldb\db\dbformat.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\hyperleveldb\db\dbformat.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\db_impl.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1189,11 +1194,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\hyperleveldb\db\db_iter.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\hyperleveldb\db\dbformat.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\hyperleveldb\db\dbformat.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\filename.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1391,6 +1391,11 @@
     </ClCompile>
     <ClInclude Include="..\..\src\leveldb\db\builder.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\leveldb\db\dbformat.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\leveldb\db\dbformat.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\leveldb\db\db_impl.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1401,11 +1406,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\leveldb\db\db_iter.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\leveldb\db\dbformat.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\leveldb\db\dbformat.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\leveldb\db\filename.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1861,20 +1861,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\basics\utility\UptimeTimer.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\KeyCache.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\MultiSocket.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\Resolver.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\ResolverAsio.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\RippleSSLContext.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\TaggedCache.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\UnorderedContainers.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\common\byte_view.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\common\impl\KeyCache.cpp">
@@ -1896,14 +1882,24 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\common\jsonrpc_fields.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\KeyCache.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\MultiSocket.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\Resolver.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\ResolverAsio.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\RippleSSLContext.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\common\seconds_clock.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\TaggedCache.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\common\tests\cross_offer.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\ripple\http\Server.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\http\Session.h">
+    <ClInclude Include="..\..\src\ripple\common\UnorderedContainers.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\http\impl\Door.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
@@ -1931,6 +1927,10 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\http\impl\Types.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\http\Server.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\http\Session.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\json\api\JsonPropertyStream.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\json\api\json_config.h">
@@ -1948,9 +1948,6 @@
     <ClCompile Include="..\..\src\ripple\json\impl\JsonPropertyStream.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\json\impl\Tests.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\ripple\json\impl\json_batchallocator.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\json\impl\json_internalarray.inl">
@@ -1968,22 +1965,15 @@
     <ClCompile Include="..\..\src\ripple\json\impl\json_writer.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\json\impl\Tests.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\app\book\Amount.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\app\book\Amounts.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\app\book\BookTip.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Offer.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\OfferStream.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Quality.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Taker.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Types.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\book\impl\BookTip.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1996,12 +1986,22 @@
     <ClCompile Include="..\..\src\ripple\module\app\book\impl\Taker.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Offer.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\book\OfferStream.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Quality.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Taker.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\book\tests\OfferStream.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\module\app\book\tests\Quality.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Types.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\consensus\DisputedTx.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2012,11 +2012,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\app\consensus\LedgerConsensus.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\data\DBInit.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\data\DBInit.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\data\Database.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2027,6 +2022,11 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\app\data\DatabaseCon.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\data\DBInit.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\data\DBInit.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\data\SqliteDatabase.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2250,52 +2250,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\app\node\SqliteFactory.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\Node.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Node.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\NodeDirectory.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequest.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequest.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequests.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequests.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\PathState.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\PathState.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\Pathfinder.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Pathfinder.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleCalc.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleCalc.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleLineCache.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleLineCache.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleState.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleState.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Tuning.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Types.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\paths\cursor\AdvanceNode.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2330,6 +2284,52 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\app\paths\cursor\RippleLiquidity.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\Node.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Node.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\NodeDirectory.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\Pathfinder.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Pathfinder.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequest.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequest.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequests.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequests.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\PathState.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\PathState.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleCalc.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleCalc.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleLineCache.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleLineCache.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleState.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleState.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Tuning.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Types.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\app\peers\ClusterNodeStatus.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\peers\PeerSet.cpp">
@@ -2595,26 +2595,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\RippleSystem.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmount.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STAmount.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmountRound.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STBitString.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STInteger.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STInteger.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STParsedJSON.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STParsedJSON.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\SerializeDeclarations.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\SerializedObject.cpp">
@@ -2639,6 +2619,26 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\Serializer.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmount.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STAmount.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmountRound.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STBitString.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STInteger.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STInteger.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STParsedJSON.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STParsedJSON.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\TER.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2663,6 +2663,8 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\net\basics\HTTPRequest.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\net\basics\impl\RPCServerImp.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\net\basics\RPCDoor.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2675,8 +2677,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\net\basics\SNTPClient.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\net\basics\impl\RPCServerImp.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\net\rpc\InfoSub.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2704,16 +2704,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\rpc\ErrorCodes.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\Manager.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\RPCHandler.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\RPCServerHandler.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\Request.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\Tuning.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\AccountCurrencies.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2827,9 +2817,6 @@
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\RipplePathFind.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\module\rpc\handlers\SMS.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\ServerInfo.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2839,6 +2826,9 @@
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\Sign.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\module\rpc\handlers\SMS.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\Stop.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2957,6 +2947,16 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\rpc\impl\TransactionSign.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\Manager.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\Request.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\RPCHandler.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\RPCServerHandler.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\Tuning.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\websocket\autosocket\AutoSocket.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2967,22 +2967,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\nodestore\Backend.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Database.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\DummyScheduler.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Factory.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\NodeObject.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Scheduler.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Task.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\nodestore\backend\HyperDBFactory.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3008,6 +2992,12 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\nodestore\backend\RocksDBFactory.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Database.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\DummyScheduler.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Factory.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\nodestore\impl\Backend.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3051,6 +3041,14 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\NodeObject.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Scheduler.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Task.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\nodestore\tests\BackendTests.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3065,17 +3063,22 @@
     <ClCompile Include="..\..\src\ripple\nodestore\tests\TimingTests.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\ripple\overlay\Message.h">
+    <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\Overlay.h">
+    <ClInclude Include="..\..\src\ripple\overlay\impl\abstract_protocol_handler.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\Peer.h">
+    <ClInclude Include="..\..\src\ripple\overlay\impl\basic_message.h">
     </ClInclude>
-    <None Include="..\..\src\ripple\overlay\README.md">
-    </None>
     <ClCompile Include="..\..\src\ripple\overlay\impl\Message.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\overlay\impl\message_name.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\message_name.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\message_stream.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\overlay\impl\OverlayImpl.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3091,25 +3094,22 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\overlay\impl\PeerImp.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\Tuning.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\abstract_protocol_handler.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\basic_message.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\overlay\impl\message_name.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\message_name.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\message_stream.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\impl\peer_protocol_detector.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\Tuning.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\make_Overlay.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\Message.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\Overlay.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\Peer.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\predicates.h">
     </ClInclude>
+    <None Include="..\..\src\ripple\overlay\README.md">
+    </None>
     <ClInclude Include="..\..\src\ripple\peerfinder\api\Callback.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\peerfinder\api\Config.h">
@@ -3149,6 +3149,10 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\peerfinder\impl\Fixed.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\peerfinder\impl\handout.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\peerfinder\impl\iosformat.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\peerfinder\impl\Livecache.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3191,10 +3195,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\peerfinder\impl\Tuning.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\peerfinder\impl\handout.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\peerfinder\impl\iosformat.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\peerfinder\sim\FunctionQueue.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\peerfinder\sim\GraphAlgorithms.h">
@@ -3213,16 +3213,16 @@
     <ClInclude Include="..\..\src\ripple\peerfinder\sim\WrappedSink.h">
     </ClInclude>
     <CustomBuild Include="..\..\src\ripple\proto\ripple.proto">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='release|x64'">protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\build\proto\ripple.pb.h;..\..\build\proto\ripple.pb.cc</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='release|x64'">protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity)</Message>
-      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</LinkObjects>
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='debug|x64'">protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\build\proto\ripple.pb.h;..\..\build\proto\ripple.pb.cc</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='debug|x64'">protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity)</Message>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</LinkObjects>
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='release|x64'">protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\build\proto\ripple.pb.h;..\..\build\proto\ripple.pb.cc</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='release|x64'">protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity)</Message>
+      <LinkObjects Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</LinkObjects>
     </CustomBuild>
     <ClInclude Include="..\..\src\ripple\radmap\api\BasicFullBelowCache.h">
     </ClInclude>
@@ -3298,6 +3298,8 @@
     <ClCompile Include="..\..\src\ripple\sitefiles\impl\SiteFile.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\sslutil\api\bignum_error.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\sslutil\api\CAutoBN_CTX.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\sslutil\api\CBigNum.h">
@@ -3308,8 +3310,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\sslutil\api\HashUtilities.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\sslutil\api\bignum_error.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\sslutil\impl\CBigNum.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3349,6 +3349,8 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\Base58.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\types\api\base_uint.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\Blob.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\Book.h">
@@ -3383,14 +3385,12 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\SimpleIdentifier.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\types\api\strHex.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\UInt160.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\UintTypes.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\types\api\base_uint.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\types\api\strHex.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\types\impl\Base58.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3406,10 +3406,10 @@
     <ClCompile Include="..\..\src\ripple\types\impl\RippleIdentifierTests.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\types\impl\UintTypes.cpp">
+    <ClCompile Include="..\..\src\ripple\types\impl\strHex.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\types\impl\strHex.cpp">
+    <ClCompile Include="..\..\src\ripple\types\impl\UintTypes.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\app.cpp">
@@ -3455,8 +3455,8 @@
     <ClCompile Include="..\..\src\ripple\unity\http.cpp">
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\hyperleveldb.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\hyperleveldb;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\hyperleveldb;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\hyperleveldb;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\unity\hyperleveldb.h">
     </ClInclude>
@@ -3465,8 +3465,8 @@
     <ClInclude Include="..\..\src\ripple\unity\json.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\leveldb.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\unity\leveldb.h">
     </ClInclude>
@@ -3475,8 +3475,8 @@
     <ClInclude Include="..\..\src\ripple\unity\net.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\nodestore.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\overlay.cpp">
     </ClCompile>
@@ -3497,8 +3497,8 @@
     <ClCompile Include="..\..\src\ripple\unity\ripple.proto.cpp">
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\rocksdb.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\rocksdb;..\..\src\rocksdb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\rocksdb;..\..\src\rocksdb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\rocksdb;..\..\src\rocksdb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\unity\rocksdb.h">
     </ClInclude>
@@ -3511,8 +3511,8 @@
     <ClInclude Include="..\..\src\ripple\unity\sitefiles.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\snappy.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\sslutil.cpp">
     </ClCompile>
@@ -3610,6 +3610,11 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\db\compaction_picker.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\db\dbformat.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\db\dbformat.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\db\db_filesnapshot.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3634,21 +3639,16 @@
     <ClCompile Include="..\..\src\rocksdb\db\db_stats_logger.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\db\dbformat.cc">
+    <ClCompile Include="..\..\src\rocksdb\db\filename.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\db\dbformat.h">
+    <ClInclude Include="..\..\src\rocksdb\db\filename.h">
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\db\file_indexer.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\db\file_indexer.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\db\filename.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\db\filename.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\db\forward_iterator.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3840,13 +3840,13 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\table\format.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\table\iter_heap.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\table\iterator.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\table\iterator_wrapper.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\table\iter_heap.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\table\merger.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3894,13 +3894,13 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\util\arena.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\util\autovector.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\auto_roll_logger.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\util\auto_roll_logger.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\util\autovector.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\blob_store.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3971,16 +3971,16 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\util\iostats_context_imp.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\util\log_buffer.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\util\log_buffer.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\logging.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\util\logging.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\util\log_buffer.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\util\log_buffer.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\murmurhash.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -4136,10 +4136,10 @@
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\utf8_validator\utf8_validator.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\websocket\src\websocket_frame.hpp">
-    </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\websocketpp.hpp">
     </ClInclude>
+    <ClInclude Include="..\..\src\websocket\src\websocket_frame.hpp">
+    </ClInclude>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 9fb5998699..f5fb75f2a8 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -627,60 +627,15 @@
     <ClInclude Include="..\..\src\beast\beast\Arithmetic.h">
       <Filter>beast</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Atomic.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\ByteOrder.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Config.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Crypto.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\HeapBlock.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Insight.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Intrusive.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Memory.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\SmartPtr.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\StaticAssert.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Strings.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Threads.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Uncopyable.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\Version.h">
-      <Filter>beast</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\asio\Asio.unity.cpp">
-      <Filter>beast\asio</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\asio\IPAddressConversion.h">
-      <Filter>beast\asio</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\asio\abstract_socket.cpp">
       <Filter>beast\asio</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\asio\abstract_socket.h">
       <Filter>beast\asio</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\asio\Asio.unity.cpp">
+      <Filter>beast\asio</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\asio\bind_handler.h">
       <Filter>beast\asio</Filter>
     </ClInclude>
@@ -696,6 +651,9 @@
     <ClInclude Include="..\..\src\beast\beast\asio\io_latency_probe.h">
       <Filter>beast\asio</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\asio\IPAddressConversion.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\asio\memory_buffer.h">
       <Filter>beast\asio</Filter>
     </ClInclude>
@@ -723,6 +681,9 @@
     <ClInclude Include="..\..\src\beast\beast\asio\wrap_handler.h">
       <Filter>beast\asio</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Atomic.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\boost\Boost.unity.cpp">
       <Filter>beast\boost</Filter>
     </ClCompile>
@@ -732,11 +693,8 @@
     <ClInclude Include="..\..\src\beast\beast\boost\get_pointer.h">
       <Filter>beast\boost</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\chrono\Chrono.unity.cpp">
-      <Filter>beast\chrono</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\chrono\RelativeTime.h">
-      <Filter>beast\chrono</Filter>
+    <ClInclude Include="..\..\src\beast\beast\ByteOrder.h">
+      <Filter>beast</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\chrono\abstract_clock.h">
       <Filter>beast\chrono</Filter>
@@ -747,16 +705,19 @@
     <ClInclude Include="..\..\src\beast\beast\chrono\basic_seconds_clock.h">
       <Filter>beast\chrono</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\chrono\Chrono.unity.cpp">
+      <Filter>beast\chrono</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\chrono\chrono_io.h">
       <Filter>beast\chrono</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\chrono\chrono_util.h">
       <Filter>beast\chrono</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\chrono\impl\RelativeTime.cpp">
+    <ClCompile Include="..\..\src\beast\beast\chrono\impl\chrono_io.cpp">
       <Filter>beast\chrono\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\chrono\impl\chrono_io.cpp">
+    <ClCompile Include="..\..\src\beast\beast\chrono\impl\RelativeTime.cpp">
       <Filter>beast\chrono\impl</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\chrono\manual_clock.h">
@@ -765,12 +726,18 @@
     <ClInclude Include="..\..\src\beast\beast\chrono\ratio_io.h">
       <Filter>beast\chrono</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\chrono\RelativeTime.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\chrono\tests\abstract_clock.test.cpp">
       <Filter>beast\chrono\tests</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\chrono\tests\basic_seconds_clock.test.cpp">
       <Filter>beast\chrono\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\Config.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\config\CompilerConfig.h">
       <Filter>beast\config</Filter>
     </ClInclude>
@@ -795,9 +762,6 @@
     <ClInclude Include="..\..\src\beast\beast\config\Suffix.h">
       <Filter>beast\config</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\container\Container.unity.cpp">
-      <Filter>beast\container</Filter>
-    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\container\aged_container.h">
       <Filter>beast\container</Filter>
     </ClInclude>
@@ -834,6 +798,9 @@
     <ClInclude Include="..\..\src\beast\beast\container\const_container.h">
       <Filter>beast\container</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\container\Container.unity.cpp">
+      <Filter>beast\container</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\container\detail\aged_associative_container.h">
       <Filter>beast\container\detail</Filter>
     </ClInclude>
@@ -876,45 +843,48 @@
     <ClInclude Include="..\..\src\beast\beast\container\tests\hash_metrics.h">
       <Filter>beast\container\tests</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Crypto.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\crypto\BinaryEncoding.h">
       <Filter>beast\crypto</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\crypto\Crypto.unity.cpp">
       <Filter>beast\crypto</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\crypto\MurmurHash.h">
-      <Filter>beast\crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\crypto\Sha256.h">
-      <Filter>beast\crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedInteger.h">
-      <Filter>beast\crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedIntegerCalc.h">
-      <Filter>beast\crypto</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\MurmurHash.cpp">
       <Filter>beast\crypto\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\Sha256.cpp">
       <Filter>beast\crypto\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\crypto\impl\UnsignedInteger.cpp">
-      <Filter>beast\crypto\impl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\sha2\sha2.c">
       <Filter>beast\crypto\impl\sha2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\crypto\impl\sha2\sha2.h">
       <Filter>beast\crypto\impl\sha2</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\crypto\impl\UnsignedInteger.cpp">
+      <Filter>beast\crypto\impl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\crypto\MurmurHash.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\crypto\Sha256.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\crypto\tests\BinaryEncoding.cpp">
       <Filter>beast\crypto\tests</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\tests\UnsignedInteger.test.cpp">
       <Filter>beast\crypto\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedInteger.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\crypto\UnsignedIntegerCalc.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\cxx14\algorithm.h">
       <Filter>beast\cxx14</Filter>
     </ClInclude>
@@ -942,14 +912,8 @@
     <ClInclude Include="..\..\src\beast\beast\cxx14\utility.h">
       <Filter>beast\cxx14</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\http\HTTP.unity.cpp">
-      <Filter>beast\http</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\http\ParsedURL.h">
-      <Filter>beast\http</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\http\URL.h">
-      <Filter>beast\http</Filter>
+    <ClInclude Include="..\..\src\beast\beast\HeapBlock.h">
+      <Filter>beast</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\http\basic_url.h">
       <Filter>beast\http</Filter>
@@ -963,11 +927,8 @@
     <ClInclude Include="..\..\src\beast\beast\http\get.h">
       <Filter>beast\http</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\http\impl\ParsedURL.cpp">
-      <Filter>beast\http\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\http\impl\URL.cpp">
-      <Filter>beast\http\impl</Filter>
+    <ClCompile Include="..\..\src\beast\beast\http\HTTP.unity.cpp">
+      <Filter>beast\http</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\impl\basic_url.cpp">
       <Filter>beast\http\impl</Filter>
@@ -990,33 +951,48 @@
     <ClCompile Include="..\..\src\beast\beast\http\impl\message_parser.cpp">
       <Filter>beast\http\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\http\impl\ParsedURL.cpp">
+      <Filter>beast\http\impl</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\impl\raw_parser.cpp">
       <Filter>beast\http\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\http\impl\URL.cpp">
+      <Filter>beast\http\impl</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\http\message_parser.h">
       <Filter>beast\http</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\http\method.h">
       <Filter>beast\http</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\http\ParsedURL.h">
+      <Filter>beast\http</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\http\raw_parser.h">
       <Filter>beast\http</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\http\tests\ParsedURL.cpp">
-      <Filter>beast\http\tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\tests\basic_url.test.cpp">
       <Filter>beast\http\tests</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\tests\client_session.test.cpp">
       <Filter>beast\http\tests</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\http\tests\ParsedURL.cpp">
+      <Filter>beast\http\tests</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\http\tests\urls_large_data.cpp">
       <Filter>beast\http\tests</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\http\tests\urls_large_data.h">
       <Filter>beast\http\tests</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\http\URL.h">
+      <Filter>beast\http</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Insight.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\insight\Base.h">
       <Filter>beast\insight</Filter>
     </ClInclude>
@@ -1056,21 +1032,6 @@
     <ClInclude Include="..\..\src\beast\beast\insight\HookImpl.h">
       <Filter>beast\insight</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\insight\Insight.unity.cpp">
-      <Filter>beast\insight</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\insight\Meter.h">
-      <Filter>beast\insight</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\insight\MeterImpl.h">
-      <Filter>beast\insight</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\insight\NullCollector.h">
-      <Filter>beast\insight</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\insight\StatsDCollector.h">
-      <Filter>beast\insight</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\insight\impl\Collector.cpp">
       <Filter>beast\insight\impl</Filter>
     </ClCompile>
@@ -1092,12 +1053,33 @@
     <ClCompile Include="..\..\src\beast\beast\insight\impl\StatsDCollector.cpp">
       <Filter>beast\insight\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\insight\Insight.unity.cpp">
+      <Filter>beast\insight</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\insight\Meter.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\insight\MeterImpl.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\insight\NullCollector.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\insight\StatsDCollector.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Intrusive.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\intrusive\List.h">
       <Filter>beast\intrusive</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\intrusive\LockFreeStack.h">
       <Filter>beast\intrusive</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Memory.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\module\asio\asio.h">
       <Filter>beast\module\asio</Filter>
     </ClInclude>
@@ -1116,15 +1098,15 @@
     <ClInclude Include="..\..\src\beast\beast\module\asio\basics\PeerRole.h">
       <Filter>beast\module\asio\basics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\asio\basics\SharedArg.h">
+      <Filter>beast\module\asio\basics</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\asio\basics\SSLContext.cpp">
       <Filter>beast\module\asio\basics</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\module\asio\basics\SSLContext.h">
       <Filter>beast\module\asio\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\asio\basics\SharedArg.h">
-      <Filter>beast\module\asio\basics</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\asio\http\HTTPClientType.cpp">
       <Filter>beast\module\asio\http</Filter>
     </ClCompile>
@@ -1509,6 +1491,18 @@
     <ClInclude Include="..\..\src\beast\beast\module\core\text\StringPairArray.h">
       <Filter>beast\module\core\text</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\CriticalSection.h">
+      <Filter>beast\module\core\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\DynamicLibrary.h">
+      <Filter>beast\module\core\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\Process.h">
+      <Filter>beast\module\core\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\module\core\threads\ScopedLock.h">
+      <Filter>beast\module\core\threads</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\core\thread\DeadlineTimer.cpp">
       <Filter>beast\module\core\thread</Filter>
     </ClCompile>
@@ -1524,18 +1518,6 @@
     <ClInclude Include="..\..\src\beast\beast\module\core\thread\Workers.h">
       <Filter>beast\module\core\thread</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\CriticalSection.h">
-      <Filter>beast\module\core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\DynamicLibrary.h">
-      <Filter>beast\module\core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\Process.h">
-      <Filter>beast\module\core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\threads\ScopedLock.h">
-      <Filter>beast\module\core\threads</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\core\time\AtExitHook.cpp">
       <Filter>beast\module\core\time</Filter>
     </ClCompile>
@@ -1659,9 +1641,24 @@
     <ClInclude Include="..\..\src\beast\beast\module\sqlite\sqlite\sqlite3.h">
       <Filter>beast\module\sqlite\sqlite</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\net\detail\Parse.h">
+      <Filter>beast\net\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\net\DynamicBuffer.h">
       <Filter>beast\net</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\net\impl\DynamicBuffer.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\net\impl\IPAddressV4.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\net\impl\IPAddressV6.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\net\impl\IPEndpoint.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\net\IPAddress.h">
       <Filter>beast\net</Filter>
     </ClInclude>
@@ -1677,30 +1674,21 @@
     <ClCompile Include="..\..\src\beast\beast\net\Net.unity.cpp">
       <Filter>beast\net</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\net\detail\Parse.h">
-      <Filter>beast\net\detail</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\net\impl\DynamicBuffer.cpp">
-      <Filter>beast\net\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\net\impl\IPAddressV4.cpp">
-      <Filter>beast\net\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\net\impl\IPAddressV6.cpp">
-      <Filter>beast\net\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\net\impl\IPEndpoint.cpp">
-      <Filter>beast\net\impl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\net\tests\IPEndpoint.test.cpp">
       <Filter>beast\net\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\SmartPtr.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\smart_ptr\SharedObject.h">
       <Filter>beast\smart_ptr</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\smart_ptr\SharedPtr.h">
       <Filter>beast\smart_ptr</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\StaticAssert.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\streams\abstract_ostream.h">
       <Filter>beast\streams</Filter>
     </ClInclude>
@@ -1722,6 +1710,12 @@
     <ClCompile Include="..\..\src\beast\beast\streams\tests\basic_abstract_ostream.test.cpp">
       <Filter>beast\streams\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\Strings.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\strings\CharacterFunctions.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\strings\CharPointer_ASCII.h">
       <Filter>beast\strings</Filter>
     </ClInclude>
@@ -1734,9 +1728,12 @@
     <ClInclude Include="..\..\src\beast\beast\strings\CharPointer_UTF8.h">
       <Filter>beast\strings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\strings\CharacterFunctions.h">
-      <Filter>beast\strings</Filter>
-    </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\strings\impl\CharacterFunctions.cpp">
+      <Filter>beast\strings\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\strings\impl\String.cpp">
+      <Filter>beast\strings\impl</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\strings\NewLine.h">
       <Filter>beast\strings</Filter>
     </ClInclude>
@@ -1752,53 +1749,8 @@
     <ClCompile Include="..\..\src\beast\beast\strings\Strings.unity.cpp">
       <Filter>beast\strings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\strings\impl\CharacterFunctions.cpp">
-      <Filter>beast\strings\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\strings\impl\String.cpp">
-      <Filter>beast\strings\impl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\threads\RecursiveMutex.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\ScopedWrapperContext.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\ServiceQueue.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SharedData.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SharedLockGuard.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SharedMutexAdapter.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\SpinLock.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\Stoppable.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\Thread.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\ThreadLocalValue.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\threads\Threads.unity.cpp">
-      <Filter>beast\threads</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\threads\TryLockGuard.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\UnlockGuard.h">
-      <Filter>beast\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\threads\WaitableEvent.h">
-      <Filter>beast\threads</Filter>
+    <ClInclude Include="..\..\src\beast\beast\Threads.h">
+      <Filter>beast</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\threads\detail\BindHandler.h">
       <Filter>beast\threads\detail</Filter>
@@ -1821,15 +1773,60 @@
     <ClCompile Include="..\..\src\beast\beast\threads\impl\WaitableEvent.cpp">
       <Filter>beast\threads\impl</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\threads\RecursiveMutex.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\ScopedWrapperContext.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\threads\semaphore.h">
       <Filter>beast\threads</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\ServiceQueue.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SharedData.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SharedLockGuard.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SharedMutexAdapter.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\SpinLock.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\Stoppable.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\threads\tests\Atomic.test.cpp">
       <Filter>beast\threads\tests</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\threads\tests\ServiceQueue.cpp">
       <Filter>beast\threads\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\threads\Thread.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\ThreadLocalValue.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\threads\Threads.unity.cpp">
+      <Filter>beast\threads</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\threads\TryLockGuard.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\UnlockGuard.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\threads\WaitableEvent.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Uncopyable.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\unit_test.h">
       <Filter>beast</Filter>
     </ClInclude>
@@ -1869,36 +1866,18 @@
     <ClInclude Include="..\..\src\beast\beast\unit_test\suite_list.h">
       <Filter>beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\Debug.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\Error.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\Journal.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\LeakChecked.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\PropertyStream.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\StaticObject.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\utility\Utility.unity.cpp">
-      <Filter>beast\utility</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\beast\utility\Zero.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\ci_char_traits.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\Debug.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\empty_base_optimization.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\Error.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\utility\impl\Debug.cpp">
       <Filter>beast\utility\impl</Filter>
     </ClCompile>
@@ -1920,6 +1899,12 @@
     <ClInclude Include="..\..\src\beast\beast\utility\is_call_possible.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\Journal.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\LeakChecked.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\maybe_const.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
@@ -1929,39 +1914,60 @@
     <ClInclude Include="..\..\src\beast\beast\utility\noexcept.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\PropertyStream.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\utility\StaticObject.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\static_initializer.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\tagged_integer.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\beast\utility\tests\Journal.test.cpp">
-      <Filter>beast\utility\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\utility\tests\Zero.test.cpp">
-      <Filter>beast\utility\tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\bassert.test.cpp">
       <Filter>beast\utility\tests</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\empty_base_optimization.test.cpp">
       <Filter>beast\utility\tests</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\utility\tests\Journal.test.cpp">
+      <Filter>beast\utility\tests</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\static_initializer.test.cpp">
       <Filter>beast\utility\tests</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\tests\tagged_integer.test.cpp">
       <Filter>beast\utility\tests</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\beast\beast\utility\tests\Zero.test.cpp">
+      <Filter>beast\utility\tests</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\utility\type_name.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\beast\beast\utility\Utility.unity.cpp">
+      <Filter>beast\utility</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\beast\beast\utility\Zero.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\beast\Version.h">
+      <Filter>beast</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\builder.cc">
       <Filter>hyperleveldb\db</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\hyperleveldb\db\builder.h">
       <Filter>hyperleveldb\db</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\hyperleveldb\db\dbformat.cc">
+      <Filter>hyperleveldb\db</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\hyperleveldb\db\dbformat.h">
+      <Filter>hyperleveldb\db</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\db_impl.cc">
       <Filter>hyperleveldb\db</Filter>
     </ClCompile>
@@ -1974,12 +1980,6 @@
     <ClInclude Include="..\..\src\hyperleveldb\db\db_iter.h">
       <Filter>hyperleveldb\db</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\hyperleveldb\db\dbformat.cc">
-      <Filter>hyperleveldb\db</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\hyperleveldb\db\dbformat.h">
-      <Filter>hyperleveldb\db</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\filename.cc">
       <Filter>hyperleveldb\db</Filter>
     </ClCompile>
@@ -2223,6 +2223,12 @@
     <ClInclude Include="..\..\src\leveldb\db\builder.h">
       <Filter>leveldb\db</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\leveldb\db\dbformat.cc">
+      <Filter>leveldb\db</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\leveldb\db\dbformat.h">
+      <Filter>leveldb\db</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\leveldb\db\db_impl.cc">
       <Filter>leveldb\db</Filter>
     </ClCompile>
@@ -2235,12 +2241,6 @@
     <ClInclude Include="..\..\src\leveldb\db\db_iter.h">
       <Filter>leveldb\db</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\leveldb\db\dbformat.cc">
-      <Filter>leveldb\db</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\leveldb\db\dbformat.h">
-      <Filter>leveldb\db</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\leveldb\db\filename.cc">
       <Filter>leveldb\db</Filter>
     </ClCompile>
@@ -2808,27 +2808,6 @@
     <ClInclude Include="..\..\src\ripple\basics\utility\UptimeTimer.h">
       <Filter>ripple\basics\utility</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\KeyCache.h">
-      <Filter>ripple\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\MultiSocket.h">
-      <Filter>ripple\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\Resolver.h">
-      <Filter>ripple\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\ResolverAsio.h">
-      <Filter>ripple\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\RippleSSLContext.h">
-      <Filter>ripple\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\TaggedCache.h">
-      <Filter>ripple\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\common\UnorderedContainers.h">
-      <Filter>ripple\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\common\byte_view.h">
       <Filter>ripple\common</Filter>
     </ClInclude>
@@ -2853,17 +2832,32 @@
     <ClInclude Include="..\..\src\ripple\common\jsonrpc_fields.h">
       <Filter>ripple\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\KeyCache.h">
+      <Filter>ripple\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\MultiSocket.h">
+      <Filter>ripple\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\Resolver.h">
+      <Filter>ripple\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\ResolverAsio.h">
+      <Filter>ripple\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\RippleSSLContext.h">
+      <Filter>ripple\common</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\common\seconds_clock.h">
       <Filter>ripple\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\common\TaggedCache.h">
+      <Filter>ripple\common</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\common\tests\cross_offer.test.cpp">
       <Filter>ripple\common\tests</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\ripple\http\Server.h">
-      <Filter>ripple\http</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\http\Session.h">
-      <Filter>ripple\http</Filter>
+    <ClInclude Include="..\..\src\ripple\common\UnorderedContainers.h">
+      <Filter>ripple\common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\http\impl\Door.cpp">
       <Filter>ripple\http\impl</Filter>
@@ -2895,6 +2889,12 @@
     <ClInclude Include="..\..\src\ripple\http\impl\Types.h">
       <Filter>ripple\http\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\http\Server.h">
+      <Filter>ripple\http</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\http\Session.h">
+      <Filter>ripple\http</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\json\api\JsonPropertyStream.h">
       <Filter>ripple\json\api</Filter>
     </ClInclude>
@@ -2919,9 +2919,6 @@
     <ClCompile Include="..\..\src\ripple\json\impl\JsonPropertyStream.cpp">
       <Filter>ripple\json\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\json\impl\Tests.cpp">
-      <Filter>ripple\json\impl</Filter>
-    </ClCompile>
     <ClInclude Include="..\..\src\ripple\json\impl\json_batchallocator.h">
       <Filter>ripple\json\impl</Filter>
     </ClInclude>
@@ -2943,6 +2940,9 @@
     <ClCompile Include="..\..\src\ripple\json\impl\json_writer.cpp">
       <Filter>ripple\json\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\json\impl\Tests.cpp">
+      <Filter>ripple\json\impl</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\app\book\Amount.h">
       <Filter>ripple\module\app\book</Filter>
     </ClInclude>
@@ -2952,21 +2952,6 @@
     <ClInclude Include="..\..\src\ripple\module\app\book\BookTip.h">
       <Filter>ripple\module\app\book</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Offer.h">
-      <Filter>ripple\module\app\book</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\OfferStream.h">
-      <Filter>ripple\module\app\book</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Quality.h">
-      <Filter>ripple\module\app\book</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Taker.h">
-      <Filter>ripple\module\app\book</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\book\Types.h">
-      <Filter>ripple\module\app\book</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\book\impl\BookTip.cpp">
       <Filter>ripple\module\app\book\impl</Filter>
     </ClCompile>
@@ -2979,12 +2964,27 @@
     <ClCompile Include="..\..\src\ripple\module\app\book\impl\Taker.cpp">
       <Filter>ripple\module\app\book\impl</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Offer.h">
+      <Filter>ripple\module\app\book</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\book\OfferStream.h">
+      <Filter>ripple\module\app\book</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Quality.h">
+      <Filter>ripple\module\app\book</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Taker.h">
+      <Filter>ripple\module\app\book</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\book\tests\OfferStream.test.cpp">
       <Filter>ripple\module\app\book\tests</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\module\app\book\tests\Quality.test.cpp">
       <Filter>ripple\module\app\book\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\book\Types.h">
+      <Filter>ripple\module\app\book</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\consensus\DisputedTx.cpp">
       <Filter>ripple\module\app\consensus</Filter>
     </ClCompile>
@@ -2997,12 +2997,6 @@
     <ClInclude Include="..\..\src\ripple\module\app\consensus\LedgerConsensus.h">
       <Filter>ripple\module\app\consensus</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\data\DBInit.cpp">
-      <Filter>ripple\module\app\data</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\data\DBInit.h">
-      <Filter>ripple\module\app\data</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\data\Database.cpp">
       <Filter>ripple\module\app\data</Filter>
     </ClCompile>
@@ -3015,6 +3009,12 @@
     <ClInclude Include="..\..\src\ripple\module\app\data\DatabaseCon.h">
       <Filter>ripple\module\app\data</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\data\DBInit.cpp">
+      <Filter>ripple\module\app\data</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\data\DBInit.h">
+      <Filter>ripple\module\app\data</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\data\SqliteDatabase.cpp">
       <Filter>ripple\module\app\data</Filter>
     </ClCompile>
@@ -3285,63 +3285,6 @@
     <ClInclude Include="..\..\src\ripple\module\app\node\SqliteFactory.h">
       <Filter>ripple\module\app\node</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\Node.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Node.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\NodeDirectory.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequest.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequest.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequests.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequests.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\PathState.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\PathState.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\Pathfinder.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Pathfinder.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleCalc.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleCalc.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleLineCache.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleLineCache.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleState.cpp">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleState.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Tuning.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\app\paths\Types.h">
-      <Filter>ripple\module\app\paths</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\app\paths\cursor\AdvanceNode.cpp">
       <Filter>ripple\module\app\paths\cursor</Filter>
     </ClCompile>
@@ -3378,6 +3321,63 @@
     <ClInclude Include="..\..\src\ripple\module\app\paths\cursor\RippleLiquidity.h">
       <Filter>ripple\module\app\paths\cursor</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\Node.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Node.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\NodeDirectory.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\Pathfinder.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Pathfinder.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequest.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequest.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\PathRequests.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\PathRequests.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\PathState.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\PathState.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleCalc.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleCalc.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleLineCache.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleLineCache.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\app\paths\RippleState.cpp">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\RippleState.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Tuning.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\app\paths\Types.h">
+      <Filter>ripple\module\app\paths</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\app\peers\ClusterNodeStatus.h">
       <Filter>ripple\module\app\peers</Filter>
     </ClInclude>
@@ -3699,30 +3699,6 @@
     <ClInclude Include="..\..\src\ripple\module\data\protocol\RippleSystem.h">
       <Filter>ripple\module\data\protocol</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmount.cpp">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STAmount.h">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmountRound.cpp">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STBitString.h">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STInteger.cpp">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STInteger.h">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\STParsedJSON.cpp">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\STParsedJSON.h">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\SerializeDeclarations.h">
       <Filter>ripple\module\data\protocol</Filter>
     </ClInclude>
@@ -3753,6 +3729,30 @@
     <ClInclude Include="..\..\src\ripple\module\data\protocol\Serializer.h">
       <Filter>ripple\module\data\protocol</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmount.cpp">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STAmount.h">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmountRound.cpp">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STBitString.h">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STInteger.cpp">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STInteger.h">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STParsedJSON.cpp">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STParsedJSON.h">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\TER.cpp">
       <Filter>ripple\module\data\protocol</Filter>
     </ClCompile>
@@ -3783,6 +3783,9 @@
     <ClInclude Include="..\..\src\ripple\module\net\basics\HTTPRequest.h">
       <Filter>ripple\module\net\basics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\net\basics\impl\RPCServerImp.h">
+      <Filter>ripple\module\net\basics\impl</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\net\basics\RPCDoor.cpp">
       <Filter>ripple\module\net\basics</Filter>
     </ClCompile>
@@ -3798,9 +3801,6 @@
     <ClInclude Include="..\..\src\ripple\module\net\basics\SNTPClient.h">
       <Filter>ripple\module\net\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\net\basics\impl\RPCServerImp.h">
-      <Filter>ripple\module\net\basics\impl</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\net\rpc\InfoSub.cpp">
       <Filter>ripple\module\net\rpc</Filter>
     </ClCompile>
@@ -3834,21 +3834,6 @@
     <ClInclude Include="..\..\src\ripple\module\rpc\ErrorCodes.h">
       <Filter>ripple\module\rpc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\Manager.h">
-      <Filter>ripple\module\rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\RPCHandler.h">
-      <Filter>ripple\module\rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\RPCServerHandler.h">
-      <Filter>ripple\module\rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\Request.h">
-      <Filter>ripple\module\rpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\module\rpc\Tuning.h">
-      <Filter>ripple\module\rpc</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\AccountCurrencies.cpp">
       <Filter>ripple\module\rpc\handlers</Filter>
     </ClCompile>
@@ -3963,9 +3948,6 @@
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\RipplePathFind.cpp">
       <Filter>ripple\module\rpc\handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\module\rpc\handlers\SMS.cpp">
-      <Filter>ripple\module\rpc\handlers</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\ServerInfo.cpp">
       <Filter>ripple\module\rpc\handlers</Filter>
     </ClCompile>
@@ -3975,6 +3957,9 @@
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\Sign.cpp">
       <Filter>ripple\module\rpc\handlers</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\module\rpc\handlers\SMS.cpp">
+      <Filter>ripple\module\rpc\handlers</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\ripple\module\rpc\handlers\Stop.cpp">
       <Filter>ripple\module\rpc\handlers</Filter>
     </ClCompile>
@@ -4104,6 +4089,21 @@
     <ClInclude Include="..\..\src\ripple\module\rpc\impl\TransactionSign.h">
       <Filter>ripple\module\rpc\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\Manager.h">
+      <Filter>ripple\module\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\Request.h">
+      <Filter>ripple\module\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\RPCHandler.h">
+      <Filter>ripple\module\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\RPCServerHandler.h">
+      <Filter>ripple\module\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\module\rpc\Tuning.h">
+      <Filter>ripple\module\rpc</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\websocket\autosocket\AutoSocket.cpp">
       <Filter>ripple\module\websocket\autosocket</Filter>
     </ClCompile>
@@ -4116,30 +4116,6 @@
     <ClInclude Include="..\..\src\ripple\nodestore\Backend.h">
       <Filter>ripple\nodestore</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Database.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\DummyScheduler.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Factory.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\NodeObject.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Scheduler.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Task.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
-      <Filter>ripple\nodestore</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\nodestore\backend\HyperDBFactory.cpp">
       <Filter>ripple\nodestore\backend</Filter>
     </ClCompile>
@@ -4170,6 +4146,15 @@
     <ClInclude Include="..\..\src\ripple\nodestore\backend\RocksDBFactory.h">
       <Filter>ripple\nodestore\backend</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Database.h">
+      <Filter>ripple\nodestore</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\DummyScheduler.h">
+      <Filter>ripple\nodestore</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Factory.h">
+      <Filter>ripple\nodestore</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\nodestore\impl\Backend.cpp">
       <Filter>ripple\nodestore\impl</Filter>
     </ClCompile>
@@ -4218,6 +4203,18 @@
     <ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h">
       <Filter>ripple\nodestore\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
+      <Filter>ripple\nodestore</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\NodeObject.h">
+      <Filter>ripple\nodestore</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Scheduler.h">
+      <Filter>ripple\nodestore</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\Task.h">
+      <Filter>ripple\nodestore</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\nodestore\tests\BackendTests.cpp">
       <Filter>ripple\nodestore\tests</Filter>
     </ClCompile>
@@ -4233,21 +4230,27 @@
     <ClCompile Include="..\..\src\ripple\nodestore\tests\TimingTests.cpp">
       <Filter>ripple\nodestore\tests</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\ripple\overlay\Message.h">
-      <Filter>ripple\overlay</Filter>
+    <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
+      <Filter>ripple\nodestore</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\Overlay.h">
-      <Filter>ripple\overlay</Filter>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\abstract_protocol_handler.h">
+      <Filter>ripple\overlay\impl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\Peer.h">
-      <Filter>ripple\overlay</Filter>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\basic_message.h">
+      <Filter>ripple\overlay\impl</Filter>
     </ClInclude>
-    <None Include="..\..\src\ripple\overlay\README.md">
-      <Filter>ripple\overlay</Filter>
-    </None>
     <ClCompile Include="..\..\src\ripple\overlay\impl\Message.cpp">
       <Filter>ripple\overlay\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\overlay\impl\message_name.cpp">
+      <Filter>ripple\overlay\impl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\message_name.h">
+      <Filter>ripple\overlay\impl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\message_stream.h">
+      <Filter>ripple\overlay\impl</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\overlay\impl\OverlayImpl.cpp">
       <Filter>ripple\overlay\impl</Filter>
     </ClCompile>
@@ -4266,33 +4269,30 @@
     <ClInclude Include="..\..\src\ripple\overlay\impl\PeerImp.h">
       <Filter>ripple\overlay\impl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\Tuning.h">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\abstract_protocol_handler.h">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\basic_message.h">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\ripple\overlay\impl\message_name.cpp">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\message_name.h">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\overlay\impl\message_stream.h">
-      <Filter>ripple\overlay\impl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\impl\peer_protocol_detector.h">
       <Filter>ripple\overlay\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\impl\Tuning.h">
+      <Filter>ripple\overlay\impl</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\make_Overlay.h">
       <Filter>ripple\overlay</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\Message.h">
+      <Filter>ripple\overlay</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\Overlay.h">
+      <Filter>ripple\overlay</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\overlay\Peer.h">
+      <Filter>ripple\overlay</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\predicates.h">
       <Filter>ripple\overlay</Filter>
     </ClInclude>
+    <None Include="..\..\src\ripple\overlay\README.md">
+      <Filter>ripple\overlay</Filter>
+    </None>
     <ClInclude Include="..\..\src\ripple\peerfinder\api\Callback.h">
       <Filter>ripple\peerfinder\api</Filter>
     </ClInclude>
@@ -4344,6 +4344,12 @@
     <ClInclude Include="..\..\src\ripple\peerfinder\impl\Fixed.h">
       <Filter>ripple\peerfinder\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\peerfinder\impl\handout.h">
+      <Filter>ripple\peerfinder\impl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\peerfinder\impl\iosformat.h">
+      <Filter>ripple\peerfinder\impl</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\peerfinder\impl\Livecache.cpp">
       <Filter>ripple\peerfinder\impl</Filter>
     </ClCompile>
@@ -4398,12 +4404,6 @@
     <ClInclude Include="..\..\src\ripple\peerfinder\impl\Tuning.h">
       <Filter>ripple\peerfinder\impl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\peerfinder\impl\handout.h">
-      <Filter>ripple\peerfinder\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\peerfinder\impl\iosformat.h">
-      <Filter>ripple\peerfinder\impl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\peerfinder\sim\FunctionQueue.h">
       <Filter>ripple\peerfinder\sim</Filter>
     </ClInclude>
@@ -4527,6 +4527,9 @@
     <ClCompile Include="..\..\src\ripple\sitefiles\impl\SiteFile.cpp">
       <Filter>ripple\sitefiles\impl</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\sslutil\api\bignum_error.h">
+      <Filter>ripple\sslutil\api</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\sslutil\api\CAutoBN_CTX.h">
       <Filter>ripple\sslutil\api</Filter>
     </ClInclude>
@@ -4542,9 +4545,6 @@
     <ClInclude Include="..\..\src\ripple\sslutil\api\HashUtilities.h">
       <Filter>ripple\sslutil\api</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\sslutil\api\bignum_error.h">
-      <Filter>ripple\sslutil\api</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\sslutil\impl\CBigNum.cpp">
       <Filter>ripple\sslutil\impl</Filter>
     </ClCompile>
@@ -4596,6 +4596,9 @@
     <ClInclude Include="..\..\src\ripple\types\api\Base58.h">
       <Filter>ripple\types\api</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\types\api\base_uint.h">
+      <Filter>ripple\types\api</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\Blob.h">
       <Filter>ripple\types\api</Filter>
     </ClInclude>
@@ -4647,18 +4650,15 @@
     <ClInclude Include="..\..\src\ripple\types\api\SimpleIdentifier.h">
       <Filter>ripple\types\api</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\types\api\strHex.h">
+      <Filter>ripple\types\api</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\UInt160.h">
       <Filter>ripple\types\api</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\types\api\UintTypes.h">
       <Filter>ripple\types\api</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\types\api\base_uint.h">
-      <Filter>ripple\types\api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\types\api\strHex.h">
-      <Filter>ripple\types\api</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\types\impl\Base58.cpp">
       <Filter>ripple\types\impl</Filter>
     </ClCompile>
@@ -4674,10 +4674,10 @@
     <ClCompile Include="..\..\src\ripple\types\impl\RippleIdentifierTests.cpp">
       <Filter>ripple\types\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\types\impl\UintTypes.cpp">
+    <ClCompile Include="..\..\src\ripple\types\impl\strHex.cpp">
       <Filter>ripple\types\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\types\impl\strHex.cpp">
+    <ClCompile Include="..\..\src\ripple\types\impl\UintTypes.cpp">
       <Filter>ripple\types\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\app.cpp">
@@ -4944,6 +4944,12 @@
     <ClInclude Include="..\..\src\rocksdb\db\compaction_picker.h">
       <Filter>rocksdb\db</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\db\dbformat.cc">
+      <Filter>rocksdb\db</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\db\dbformat.h">
+      <Filter>rocksdb\db</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\db\db_filesnapshot.cc">
       <Filter>rocksdb\db</Filter>
     </ClCompile>
@@ -4971,10 +4977,10 @@
     <ClCompile Include="..\..\src\rocksdb\db\db_stats_logger.cc">
       <Filter>rocksdb\db</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\db\dbformat.cc">
+    <ClCompile Include="..\..\src\rocksdb\db\filename.cc">
       <Filter>rocksdb\db</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\db\dbformat.h">
+    <ClInclude Include="..\..\src\rocksdb\db\filename.h">
       <Filter>rocksdb\db</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\db\file_indexer.cc">
@@ -4983,12 +4989,6 @@
     <ClInclude Include="..\..\src\rocksdb\db\file_indexer.h">
       <Filter>rocksdb\db</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\db\filename.cc">
-      <Filter>rocksdb\db</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\db\filename.h">
-      <Filter>rocksdb\db</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\db\forward_iterator.cc">
       <Filter>rocksdb\db</Filter>
     </ClCompile>
@@ -5235,15 +5235,15 @@
     <ClInclude Include="..\..\src\rocksdb\table\format.h">
       <Filter>rocksdb\table</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\table\iter_heap.h">
-      <Filter>rocksdb\table</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\table\iterator.cc">
       <Filter>rocksdb\table</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\table\iterator_wrapper.h">
       <Filter>rocksdb\table</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\table\iter_heap.h">
+      <Filter>rocksdb\table</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\table\merger.cc">
       <Filter>rocksdb\table</Filter>
     </ClCompile>
@@ -5301,15 +5301,15 @@
     <ClInclude Include="..\..\src\rocksdb\util\arena.h">
       <Filter>rocksdb\util</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\util\autovector.h">
+      <Filter>rocksdb\util</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\auto_roll_logger.cc">
       <Filter>rocksdb\util</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\util\auto_roll_logger.h">
       <Filter>rocksdb\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\util\autovector.h">
-      <Filter>rocksdb\util</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\blob_store.cc">
       <Filter>rocksdb\util</Filter>
     </ClCompile>
@@ -5391,18 +5391,18 @@
     <ClInclude Include="..\..\src\rocksdb\util\iostats_context_imp.h">
       <Filter>rocksdb\util</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\util\log_buffer.cc">
-      <Filter>rocksdb\util</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\util\log_buffer.h">
-      <Filter>rocksdb\util</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\logging.cc">
       <Filter>rocksdb\util</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\util\logging.h">
       <Filter>rocksdb\util</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\util\log_buffer.cc">
+      <Filter>rocksdb\util</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\util\log_buffer.h">
+      <Filter>rocksdb\util</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\murmurhash.cc">
       <Filter>rocksdb\util</Filter>
     </ClCompile>
@@ -5601,10 +5601,10 @@
     <ClInclude Include="..\..\src\websocket\src\utf8_validator\utf8_validator.hpp">
       <Filter>websocket\src\utf8_validator</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\websocket\src\websocket_frame.hpp">
+    <ClInclude Include="..\..\src\websocket\src\websocketpp.hpp">
       <Filter>websocket\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\websocket\src\websocketpp.hpp">
+    <ClInclude Include="..\..\src\websocket\src\websocket_frame.hpp">
       <Filter>websocket\src</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/src/beast/site_scons/site_tools/VSProject.py b/src/beast/site_scons/site_tools/VSProject.py
index 7a83a4b1f8..099d2f5ddf 100644
--- a/src/beast/site_scons/site_tools/VSProject.py
+++ b/src/beast/site_scons/site_tools/VSProject.py
@@ -94,25 +94,28 @@ def is_subdir(child, parent):
     '''Determine if child is a subdirectory of parent'''
     return os.path.commonprefix([parent, child]) == parent
 
+def _key(item):
+    if isinstance(item, (str, unicode)):
+        return ('s', item.upper(), item)
+    elif isinstance(item, (int, long, float)):
+        return ('n', item)
+    elif isinstance(item, (list, tuple)):
+        return ('l', map(_key, item))
+    elif isinstance(item, dict):
+        return ('d', xsorted(item.keys()), xsorted(item.values()))
+    elif isinstance(item, Configuration):
+        return ('c', _key(item.name), _key(item.target), _key(item.variant), _key(item.platform))
+    elif isinstance(item, Item):
+        return ('i', _key(item.path()), _key(item.is_compiled()), _key(item.builder()), _key(item.tag()), _key(item.is_excluded()))
+    elif isinstance(item, SCons.Node.FS.File):
+        return ('f', _key(item.name), _key(item.suffix))
+    else:
+        return ('x', item)
+
 def xsorted(tosort, **kwargs):
     '''Performs sorted in a deterministic manner.'''
     if 'key' in kwargs:
         map(kwargs['key'], tosort)
-    def _key(item):
-        if isinstance(item, (str, unicode)):
-            return ("s", item.upper(), item)
-        elif isinstance(item, (list, tuple)):
-            return ("l", map(_key, item))
-        elif isinstance(item, dict):
-            return ("d", xsorted(item.keys()), xsorted(item.values()))
-        elif isinstance(item, Configuration):
-            return ("c", item.target, item.platform, item.variant)
-        elif isinstance(item, Item):
-            return ("i", item._path, item._builder)
-        elif isinstance(item, SCons.Node.FS.File):
-            return ("f", item.name, item.suffix)
-        else:
-            return ("x", item)
     kwargs['key'] = _key
     return sorted(tosort, **kwargs)
 
@@ -582,7 +585,7 @@ class _ProjectGenerator(object):
 
     def __init__(self, project_node, filters_node, env):
         try:
-            self.configs = xsorted(env['VSPROJECT_CONFIGS'], key=lambda x: x.name)
+            self.configs = xsorted(env['VSPROJECT_CONFIGS'])
         except KeyError:
             raise ValueError ('Missing VSPROJECT_CONFIGS')
         self.root_dir = os.getcwd()
@@ -620,7 +623,7 @@ class _ProjectGenerator(object):
             targets = config.target
             for target in targets:
                 _walk(target, items)
-        self.items = xsorted(items.values(), key=lambda x: x.path())
+        self.items = xsorted(items.values())
 
     def makeListTag(self, items, prefix, tag, attrs, inherit=True):
         '''Builds an XML tag string from a list of items. If items is
@@ -662,7 +665,7 @@ class _ProjectGenerator(object):
         f.write('  <ItemGroup Label="ProjectConfigurations">\r\n')
         for config in self.configs:
             variant = config.variant
-            platform = config.platform            
+            platform = config.platform           
             f.write(V12DSPProjectConfiguration % locals())
         f.write('  </ItemGroup>\r\n')