diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index afa7c791f4..e7c35e9ba7 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -126,8 +126,6 @@
-
-
@@ -304,14 +302,14 @@
True
-
- True
-
True
+
+ True
+
True
@@ -825,14 +823,6 @@
-
-
-
-
-
-
-
-
True
@@ -845,6 +835,14 @@
+
+
+
+
+
+
+
+
True
@@ -1187,6 +1185,8 @@
+
+
True
@@ -1942,20 +1942,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
True
@@ -1979,6 +1965,20 @@
True
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3940,57 +3940,6 @@
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
-
-
-
-
- True
-
-
- True
-
-
-
-
- True
-
-
-
-
- True
-
-
- True
-
-
-
-
-
-
-
-
- True
-
-
-
-
- True
-
-
-
True
@@ -4164,6 +4113,57 @@
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+
+
+
+
+ True
+
+
+ True
+
+
+
+
+ True
+
+
+
+
+ True
+
+
+ True
+
+
+
+
+
+
+
+
+ True
+
+
+
+
+ True
+
+
+
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 8107db9946..2801473b98 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -340,9 +340,6 @@
{BEDCC703-A2C8-FF25-7E1E-3471BD39ED98}
-
- {BCFF300C-4C39-3ADA-76C0-9A9AC2EAC7DE}
-
{32043215-B959-04E5-00FF-F97C7F597235}
@@ -666,9 +663,6 @@
build\proto
-
- .
-
beast
@@ -900,15 +894,15 @@
beast\crypto\impl
-
- beast\crypto\impl
-
beast\crypto\impl\sha2
beast\crypto\impl\sha2
+
+ beast\crypto\impl
+
beast\crypto\impl
@@ -1551,18 +1545,6 @@
beast\module\core\text
-
- beast\module\core\threads
-
-
- beast\module\core\threads
-
-
- beast\module\core\threads
-
-
- beast\module\core\threads
-
beast\module\core\thread
@@ -1578,6 +1560,18 @@
beast\module\core\thread
+
+ beast\module\core\threads
+
+
+ beast\module\core\threads
+
+
+ beast\module\core\threads
+
+
+ beast\module\core\threads
+
beast\module\core\time
@@ -2016,6 +2010,9 @@
beast
+
+ .
+
hyperleveldb\db
@@ -2952,27 +2949,6 @@
ripple\http
-
- ripple\json\api
-
-
- ripple\json\api
-
-
- ripple\json\api
-
-
- ripple\json\api
-
-
- ripple\json\api
-
-
- ripple\json\api
-
-
- ripple\json\api
-
ripple\json\impl
@@ -3000,6 +2976,27 @@
ripple\json\impl
+
+ ripple\json
+
+
+ ripple\json
+
+
+ ripple\json
+
+
+ ripple\json
+
+
+ ripple\json
+
+
+ ripple\json
+
+
+ ripple\json
+
ripple\module\app\book
@@ -5409,66 +5406,6 @@
rocksdb\third-party\rapidjson
-
- rocksdb\utilities\backupable
-
-
- rocksdb\utilities\document
-
-
- rocksdb\utilities\document
-
-
- rocksdb\utilities\geodb
-
-
- rocksdb\utilities\geodb
-
-
- rocksdb\utilities
-
-
- rocksdb\utilities\merge_operators
-
-
- rocksdb\utilities\merge_operators\string_append
-
-
- rocksdb\utilities\merge_operators\string_append
-
-
- rocksdb\utilities\merge_operators\string_append
-
-
- rocksdb\utilities\merge_operators\string_append
-
-
- rocksdb\utilities\merge_operators
-
-
- rocksdb\utilities\redis
-
-
- rocksdb\utilities\redis
-
-
- rocksdb\utilities\redis
-
-
- rocksdb\utilities\redis
-
-
- rocksdb\utilities\spatialdb
-
-
- rocksdb\utilities\spatialdb
-
-
- rocksdb\utilities\ttl
-
-
- rocksdb\utilities\ttl
-
rocksdb\util
@@ -5673,6 +5610,66 @@
rocksdb\util
+
+ rocksdb\utilities\backupable
+
+
+ rocksdb\utilities\document
+
+
+ rocksdb\utilities\document
+
+
+ rocksdb\utilities\geodb
+
+
+ rocksdb\utilities\geodb
+
+
+ rocksdb\utilities
+
+
+ rocksdb\utilities\merge_operators
+
+
+ rocksdb\utilities\merge_operators\string_append
+
+
+ rocksdb\utilities\merge_operators\string_append
+
+
+ rocksdb\utilities\merge_operators\string_append
+
+
+ rocksdb\utilities\merge_operators\string_append
+
+
+ rocksdb\utilities\merge_operators
+
+
+ rocksdb\utilities\redis
+
+
+ rocksdb\utilities\redis
+
+
+ rocksdb\utilities\redis
+
+
+ rocksdb\utilities\redis
+
+
+ rocksdb\utilities\spatialdb
+
+
+ rocksdb\utilities\spatialdb
+
+
+ rocksdb\utilities\ttl
+
+
+ rocksdb\utilities\ttl
+
snappy\config
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 0379a74d04..61a55fa295 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
+#include
+#include
+#include
+
+#include
+
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 c43044cae9..e82e025321 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
+#include
+
/** \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 b9aaf76907..1034e01bae 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 // Needed before these cpptl includes
+#include // Needed before these cpptl includes
#ifndef JSON_USE_CPPTL_SMALLMAP
#include