From e889183fc5f320493cd209e745135aab8b76195c Mon Sep 17 00:00:00 2001
From: Tom Ritchford <tom@swirly.com>
Date: Tue, 12 Aug 2014 12:41:42 -0400
Subject: [PATCH] JSON cleanups: * Fix Json headers to include what they use. *
 Get rid of ripple/json/api directory.

---
 Builds/VisualStudio2013/RippleD.vcxproj       | 156 +++++++-------
 .../VisualStudio2013/RippleD.vcxproj.filters  | 201 +++++++++---------
 .../json/{api => }/JsonPropertyStream.h       |   0
 src/ripple/json/{api => }/json_config.h       |   0
 src/ripple/json/{api => }/json_features.h     |   0
 src/ripple/json/{api => }/json_forwards.h     |   0
 src/ripple/json/{api => }/json_reader.h       |   7 +
 src/ripple/json/{api => }/json_value.h        |   3 +
 src/ripple/json/{api => }/json_writer.h       |   0
 src/ripple/unity/json.h                       |  14 +-
 10 files changed, 194 insertions(+), 187 deletions(-)
 rename src/ripple/json/{api => }/JsonPropertyStream.h (100%)
 rename src/ripple/json/{api => }/json_config.h (100%)
 rename src/ripple/json/{api => }/json_features.h (100%)
 rename src/ripple/json/{api => }/json_forwards.h (100%)
 rename src/ripple/json/{api => }/json_reader.h (97%)
 rename src/ripple/json/{api => }/json_value.h (99%)
 rename src/ripple/json/{api => }/json_writer.h (100%)

diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index afa7c791f..e7c35e9ba 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -126,8 +126,6 @@
     </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">
@@ -304,14 +302,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>
@@ -825,14 +823,6 @@
     </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>
@@ -845,6 +835,14 @@
     </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>
@@ -1187,6 +1185,8 @@
     </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>
@@ -1942,20 +1942,6 @@
     </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">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_features.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_forwards.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_reader.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_value.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_writer.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\json\impl\JsonPropertyStream.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1979,6 +1965,20 @@
     <ClCompile Include="..\..\src\ripple\json\impl\Tests.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\json\JsonPropertyStream.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_config.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_features.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_forwards.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_reader.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_value.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_writer.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\app\book\Amount.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\app\book\Amounts.h">
@@ -3940,57 +3940,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\rocksdb\third-party\rapidjson\reader.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\backupable\backupable_db.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\document\document_db.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\document\json_document.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\put.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\uint64add.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\redis\redis_lists.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_lists.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_exception.h">
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_iterator.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\spatialdb\spatial_db.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\spatialdb\utils.h">
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\ttl\db_ttl_impl.cc">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\ttl\db_ttl_impl.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\arena.cc">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -4164,6 +4113,57 @@
     </ClCompile>
     <ClInclude Include="..\..\src\rocksdb\util\xxhash.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\backupable\backupable_db.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\document\document_db.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\document\json_document.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\put.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\uint64add.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\redis\redis_lists.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_lists.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_exception.h">
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_iterator.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\spatialdb\spatial_db.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\spatialdb\utils.h">
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\ttl\db_ttl_impl.cc">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\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 8107db994..2801473b9 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -340,9 +340,6 @@
     <Filter Include="ripple\json">
       <UniqueIdentifier>{BEDCC703-A2C8-FF25-7E1E-3471BD39ED98}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ripple\json\api">
-      <UniqueIdentifier>{BCFF300C-4C39-3ADA-76C0-9A9AC2EAC7DE}</UniqueIdentifier>
-    </Filter>
     <Filter Include="ripple\json\impl">
       <UniqueIdentifier>{32043215-B959-04E5-00FF-F97C7F597235}</UniqueIdentifier>
     </Filter>
@@ -666,9 +663,6 @@
     <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>
@@ -900,15 +894,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,18 +1545,6 @@
     <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>
@@ -1578,6 +1560,18 @@
     <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,6 +2010,9 @@
     <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>
@@ -2952,27 +2949,6 @@
     <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>
-    <ClInclude Include="..\..\src\ripple\json\api\json_config.h">
-      <Filter>ripple\json\api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_features.h">
-      <Filter>ripple\json\api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_forwards.h">
-      <Filter>ripple\json\api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_reader.h">
-      <Filter>ripple\json\api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_value.h">
-      <Filter>ripple\json\api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\ripple\json\api\json_writer.h">
-      <Filter>ripple\json\api</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\json\impl\JsonPropertyStream.cpp">
       <Filter>ripple\json\impl</Filter>
     </ClCompile>
@@ -3000,6 +2976,27 @@
     <ClCompile Include="..\..\src\ripple\json\impl\Tests.cpp">
       <Filter>ripple\json\impl</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\json\JsonPropertyStream.h">
+      <Filter>ripple\json</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_config.h">
+      <Filter>ripple\json</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_features.h">
+      <Filter>ripple\json</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_forwards.h">
+      <Filter>ripple\json</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_reader.h">
+      <Filter>ripple\json</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_value.h">
+      <Filter>ripple\json</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\json\json_writer.h">
+      <Filter>ripple\json</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\module\app\book\Amount.h">
       <Filter>ripple\module\app\book</Filter>
     </ClInclude>
@@ -5409,66 +5406,6 @@
     <ClInclude Include="..\..\src\rocksdb\third-party\rapidjson\reader.h">
       <Filter>rocksdb\third-party\rapidjson</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\backupable\backupable_db.cc">
-      <Filter>rocksdb\utilities\backupable</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\document\document_db.cc">
-      <Filter>rocksdb\utilities\document</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\document\json_document.cc">
-      <Filter>rocksdb\utilities\document</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.cc">
-      <Filter>rocksdb\utilities\geodb</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.h">
-      <Filter>rocksdb\utilities\geodb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators.h">
-      <Filter>rocksdb\utilities</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\put.cc">
-      <Filter>rocksdb\utilities\merge_operators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.cc">
-      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.h">
-      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.cc">
-      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.h">
-      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\uint64add.cc">
-      <Filter>rocksdb\utilities\merge_operators</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rocksdb\utilities\redis\redis_lists.cc">
-      <Filter>rocksdb\utilities\redis</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_lists.h">
-      <Filter>rocksdb\utilities\redis</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_exception.h">
-      <Filter>rocksdb\utilities\redis</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_iterator.h">
-      <Filter>rocksdb\utilities\redis</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\spatialdb\spatial_db.cc">
-      <Filter>rocksdb\utilities\spatialdb</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\spatialdb\utils.h">
-      <Filter>rocksdb\utilities\spatialdb</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\rocksdb\utilities\ttl\db_ttl_impl.cc">
-      <Filter>rocksdb\utilities\ttl</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\rocksdb\utilities\ttl\db_ttl_impl.h">
-      <Filter>rocksdb\utilities\ttl</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\rocksdb\util\arena.cc">
       <Filter>rocksdb\util</Filter>
     </ClCompile>
@@ -5673,6 +5610,66 @@
     <ClInclude Include="..\..\src\rocksdb\util\xxhash.h">
       <Filter>rocksdb\util</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\backupable\backupable_db.cc">
+      <Filter>rocksdb\utilities\backupable</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\document\document_db.cc">
+      <Filter>rocksdb\utilities\document</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\document\json_document.cc">
+      <Filter>rocksdb\utilities\document</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.cc">
+      <Filter>rocksdb\utilities\geodb</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\geodb\geodb_impl.h">
+      <Filter>rocksdb\utilities\geodb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators.h">
+      <Filter>rocksdb\utilities</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\put.cc">
+      <Filter>rocksdb\utilities\merge_operators</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.cc">
+      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend.h">
+      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.cc">
+      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\merge_operators\string_append\stringappend2.h">
+      <Filter>rocksdb\utilities\merge_operators\string_append</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\merge_operators\uint64add.cc">
+      <Filter>rocksdb\utilities\merge_operators</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rocksdb\utilities\redis\redis_lists.cc">
+      <Filter>rocksdb\utilities\redis</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_lists.h">
+      <Filter>rocksdb\utilities\redis</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_exception.h">
+      <Filter>rocksdb\utilities\redis</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rocksdb\utilities\redis\redis_list_iterator.h">
+      <Filter>rocksdb\utilities\redis</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\spatialdb\spatial_db.cc">
+      <Filter>rocksdb\utilities\spatialdb</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\spatialdb\utils.h">
+      <Filter>rocksdb\utilities\spatialdb</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\rocksdb\utilities\ttl\db_ttl_impl.cc">
+      <Filter>rocksdb\utilities\ttl</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\rocksdb\utilities\ttl\db_ttl_impl.h">
+      <Filter>rocksdb\utilities\ttl</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\snappy\config\snappy-stubs-public.h">
       <Filter>snappy\config</Filter>
     </ClInclude>
diff --git a/src/ripple/json/api/JsonPropertyStream.h b/src/ripple/json/JsonPropertyStream.h
similarity index 100%
rename from src/ripple/json/api/JsonPropertyStream.h
rename to src/ripple/json/JsonPropertyStream.h
diff --git a/src/ripple/json/api/json_config.h b/src/ripple/json/json_config.h
similarity index 100%
rename from src/ripple/json/api/json_config.h
rename to src/ripple/json/json_config.h
diff --git a/src/ripple/json/api/json_features.h b/src/ripple/json/json_features.h
similarity index 100%
rename from src/ripple/json/api/json_features.h
rename to src/ripple/json/json_features.h
diff --git a/src/ripple/json/api/json_forwards.h b/src/ripple/json/json_forwards.h
similarity index 100%
rename from src/ripple/json/api/json_forwards.h
rename to src/ripple/json/json_forwards.h
diff --git a/src/ripple/json/api/json_reader.h b/src/ripple/json/json_reader.h
similarity index 97%
rename from src/ripple/json/api/json_reader.h
rename to src/ripple/json/json_reader.h
index 0379a74d0..61a55fa29 100644
--- a/src/ripple/json/api/json_reader.h
+++ b/src/ripple/json/json_reader.h
@@ -20,6 +20,13 @@
 #ifndef CPPTL_JSON_READER_H_INCLUDED
 # define CPPTL_JSON_READER_H_INCLUDED
 
+#include <ripple/json/json_config.h>
+#include <ripple/json/json_features.h>
+#include <ripple/json/json_forwards.h>
+#include <ripple/json/json_value.h>
+
+#include <stack>
+
 namespace Json
 {
 
diff --git a/src/ripple/json/api/json_value.h b/src/ripple/json/json_value.h
similarity index 99%
rename from src/ripple/json/api/json_value.h
rename to src/ripple/json/json_value.h
index c43044cae..e82e02532 100644
--- a/src/ripple/json/api/json_value.h
+++ b/src/ripple/json/json_value.h
@@ -20,6 +20,9 @@
 #ifndef CPPTL_JSON_H_INCLUDED
 #define CPPTL_JSON_H_INCLUDED
 
+#include <ripple/json/json_config.h>
+#include <ripple/json/json_forwards.h>
+
 /** \brief JSON (JavaScript Object Notation).
  */
 namespace Json
diff --git a/src/ripple/json/api/json_writer.h b/src/ripple/json/json_writer.h
similarity index 100%
rename from src/ripple/json/api/json_writer.h
rename to src/ripple/json/json_writer.h
diff --git a/src/ripple/unity/json.h b/src/ripple/unity/json.h
index b9aaf7690..1034e01ba 100644
--- a/src/ripple/unity/json.h
+++ b/src/ripple/unity/json.h
@@ -32,7 +32,7 @@
 // For json/
 //
 // VFALCO TODO Clean up these one-offs
-#include <ripple/json/api/json_config.h> // Needed before these cpptl includes
+#include <ripple/json/json_config.h> // Needed before these cpptl includes
 #ifndef JSON_USE_CPPTL_SMALLMAP
 #include <map>
 #else
@@ -42,12 +42,12 @@
 #include <cpptl/forwards.h>
 #endif
 
-#include <ripple/json/api/json_forwards.h>
-#include <ripple/json/api/json_features.h>
-#include <ripple/json/api/json_value.h>
-#include <ripple/json/api/json_reader.h>
-#include <ripple/json/api/json_writer.h>
+#include <ripple/json/json_forwards.h>
+#include <ripple/json/json_features.h>
+#include <ripple/json/json_value.h>
+#include <ripple/json/json_reader.h>
+#include <ripple/json/json_writer.h>
 
-#include <ripple/json/api/JsonPropertyStream.h>
+#include <ripple/json/JsonPropertyStream.h>
 
 #endif