diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index 0e4476a2f..da7eedc4a 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -126,6 +126,8 @@
     </ClCompile>
     <ClInclude Include="..\..\build\proto\ripple.pb.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\BeastConfig.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\Arithmetic.h">
     </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\asio\abstract_socket.cpp">
@@ -302,14 +304,14 @@
     <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\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\Sha256.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\UnsignedInteger.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -824,6 +826,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 +846,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>
@@ -1186,8 +1188,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\Version.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\BeastConfig.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\builder.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2569,11 +2569,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\RippleSystem.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\SerializedObject.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\SerializedObject.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\SerializedObjectTemplate.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2604,6 +2599,11 @@
     <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmountRound.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STArray.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STArray.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\STBitString.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\STInteger.cpp">
@@ -2611,6 +2611,11 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\STInteger.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STObject.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STObject.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\STParsedJSON.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3931,6 +3936,57 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb2\third-party\rapidjson\reader.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\backupable\backupable_db.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\document\document_db.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\document\json_document.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\put.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\uint64add.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\redis\redis_lists.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_lists.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_exception.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_iterator.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\spatialdb\spatial_db.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\spatialdb\utils.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\arena.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -4104,57 +4160,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb2\util\xxhash.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\backupable\backupable_db.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\document\document_db.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\document\json_document.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\put.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\uint64add.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\redis\redis_lists.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_lists.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_exception.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_iterator.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\spatialdb\spatial_db.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\spatialdb\utils.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\snappy\config\snappy-stubs-public.h">
     </ClInclude>
     <ClInclude Include="..\..\src\snappy\snappy\snappy-internal.h">
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 2dd6a7939..3b59524a1 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -666,6 +666,9 @@
     <ClInclude Include="..\..\build\proto\ripple.pb.h">
       <Filter>build\proto</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\BeastConfig.h">
+      <Filter>.</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\Arithmetic.h">
       <Filter>beast</Filter>
     </ClInclude>
@@ -897,15 +900,15 @@
     <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\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\Sha256.cpp">
-      <Filter>beast\crypto\impl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\crypto\impl\UnsignedInteger.cpp">
       <Filter>beast\crypto\impl</Filter>
     </ClCompile>
@@ -1551,6 +1554,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>
@@ -1566,18 +1581,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>
@@ -2016,9 +2019,6 @@
     <ClInclude Include="..\..\src\beast\beast\Version.h">
       <Filter>beast</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\BeastConfig.h">
-      <Filter>.</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\hyperleveldb\db\builder.cc">
       <Filter>hyperleveldb\db</Filter>
     </ClCompile>
@@ -3705,12 +3705,6 @@
     <ClInclude Include="..\..\src\ripple\module\data\protocol\RippleSystem.h">
       <Filter>ripple\module\data\protocol</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\module\data\protocol\SerializedObject.cpp">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\module\data\protocol\SerializedObject.h">
-      <Filter>ripple\module\data\protocol</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\SerializedObjectTemplate.cpp">
       <Filter>ripple\module\data\protocol</Filter>
     </ClCompile>
@@ -3747,6 +3741,12 @@
     <ClCompile Include="..\..\src\ripple\module\data\protocol\STAmountRound.cpp">
       <Filter>ripple\module\data\protocol</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STArray.cpp">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STArray.h">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\data\protocol\STBitString.h">
       <Filter>ripple\module\data\protocol</Filter>
     </ClInclude>
@@ -3756,6 +3756,12 @@
     <ClInclude Include="..\..\src\ripple\module\data\protocol\STInteger.h">
       <Filter>ripple\module\data\protocol</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\module\data\protocol\STObject.cpp">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\ripple\module\data\protocol\STObject.h">
+      <Filter>ripple\module\data\protocol</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\module\data\protocol\STParsedJSON.cpp">
       <Filter>ripple\module\data\protocol</Filter>
     </ClCompile>
@@ -5391,6 +5397,66 @@
     <ClInclude Include="..\..\src\rocksdb2\third-party\rapidjson\reader.h">
       <Filter>rocksdb2\third-party\rapidjson</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\backupable\backupable_db.cc">
+      <Filter>rocksdb2\utilities\backupable</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\document\document_db.cc">
+      <Filter>rocksdb2\utilities\document</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\document\json_document.cc">
+      <Filter>rocksdb2\utilities\document</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.cc">
+      <Filter>rocksdb2\utilities\geodb</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.h">
+      <Filter>rocksdb2\utilities\geodb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators.h">
+      <Filter>rocksdb2\utilities</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\put.cc">
+      <Filter>rocksdb2\utilities\merge_operators</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.cc">
+      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.h">
+      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.cc">
+      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.h">
+      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\uint64add.cc">
+      <Filter>rocksdb2\utilities\merge_operators</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\redis\redis_lists.cc">
+      <Filter>rocksdb2\utilities\redis</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_lists.h">
+      <Filter>rocksdb2\utilities\redis</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_exception.h">
+      <Filter>rocksdb2\utilities\redis</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_iterator.h">
+      <Filter>rocksdb2\utilities\redis</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\spatialdb\spatial_db.cc">
+      <Filter>rocksdb2\utilities\spatialdb</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\spatialdb\utils.h">
+      <Filter>rocksdb2\utilities\spatialdb</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.cc">
+      <Filter>rocksdb2\utilities\ttl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.h">
+      <Filter>rocksdb2\utilities\ttl</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb2\util\arena.cc">
       <Filter>rocksdb2\util</Filter>
     </ClCompile>
@@ -5595,66 +5661,6 @@
     <ClInclude Include="..\..\src\rocksdb2\util\xxhash.h">
       <Filter>rocksdb2\util</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\backupable\backupable_db.cc">
-      <Filter>rocksdb2\utilities\backupable</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\document\document_db.cc">
-      <Filter>rocksdb2\utilities\document</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\document\json_document.cc">
-      <Filter>rocksdb2\utilities\document</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.cc">
-      <Filter>rocksdb2\utilities\geodb</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\geodb\geodb_impl.h">
-      <Filter>rocksdb2\utilities\geodb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators.h">
-      <Filter>rocksdb2\utilities</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\put.cc">
-      <Filter>rocksdb2\utilities\merge_operators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.cc">
-      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend.h">
-      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.cc">
-      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\merge_operators\string_append\stringappend2.h">
-      <Filter>rocksdb2\utilities\merge_operators\string_append</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\merge_operators\uint64add.cc">
-      <Filter>rocksdb2\utilities\merge_operators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\redis\redis_lists.cc">
-      <Filter>rocksdb2\utilities\redis</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_lists.h">
-      <Filter>rocksdb2\utilities\redis</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_exception.h">
-      <Filter>rocksdb2\utilities\redis</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\redis\redis_list_iterator.h">
-      <Filter>rocksdb2\utilities\redis</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\spatialdb\spatial_db.cc">
-      <Filter>rocksdb2\utilities\spatialdb</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\spatialdb\utils.h">
-      <Filter>rocksdb2\utilities\spatialdb</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.cc">
-      <Filter>rocksdb2\utilities\ttl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb2\utilities\ttl\db_ttl_impl.h">
-      <Filter>rocksdb2\utilities\ttl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\snappy\config\snappy-stubs-public.h">
       <Filter>snappy\config</Filter>
     </ClInclude>
diff --git a/src/beast/site_scons/site_tools/VSProject.py b/src/beast/site_scons/site_tools/VSProject.py
index 099d2f5dd..724dfb5bc 100644
--- a/src/beast/site_scons/site_tools/VSProject.py
+++ b/src/beast/site_scons/site_tools/VSProject.py
@@ -106,7 +106,7 @@ def _key(item):
     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()))
+        return ('i', _key(winpath(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: