From cd38492ceb584515acde63f4fc8418bd6baa9c99 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sat, 7 May 2016 06:21:09 -0400
Subject: [PATCH] Changes for Beast

---
 Builds/VisualStudio2015/RippleD.vcxproj       | 154 +++++-----
 .../VisualStudio2015/RippleD.vcxproj.filters  | 282 +++++++++---------
 SConstruct                                    |   3 +-
 src/ripple/app/main/Application.cpp           |   2 +-
 src/ripple/app/main/Main.cpp                  |   4 +-
 src/ripple/app/tests/DeliverMin.test.cpp      |   2 +-
 src/ripple/app/tests/HashRouter_test.cpp      |   2 +-
 src/ripple/app/tests/Offer.test.cpp           |   2 +-
 src/ripple/app/tests/Path_test.cpp            |   2 +-
 src/ripple/basics/BasicConfig.h               |   6 +-
 src/ripple/basics/Log.h                       |   2 +-
 src/ripple/basics/impl/ResolverAsio.cpp       |   2 +-
 src/ripple/basics/random.h                    |   2 +-
 .../container/detail/aged_ordered_container.h |   2 +-
 .../detail/aged_unordered_container.h         |   2 +-
 src/ripple/beast/define_print.cpp             |  84 ++++++
 .../beast/insight/impl/StatsDCollector.cpp    |   2 +-
 .../nudb/test/beast_nudb_callgrind_test.cpp   |   2 +-
 .../nudb/test/beast_nudb_recover_test.cpp     |   2 +-
 .../beast/nudb/test/beast_nudb_store_test.cpp |   2 +-
 src/ripple/beast/unit_test.h                  |  28 +-
 src/ripple/beast/utility/weak_fn.h            |   2 +-
 src/ripple/core/Config.h                      |   2 +-
 src/ripple/core/impl/Config.cpp               |   2 +-
 src/ripple/core/impl/SNTPClock.cpp            |   2 +-
 src/ripple/ledger/tests/View_test.cpp         |   2 +-
 src/ripple/net/impl/HTTPClient.cpp            |   2 +-
 src/ripple/net/impl/RPCCall.cpp               |   2 +-
 .../nodestore/backend/MemoryFactory.cpp       |   2 +-
 src/ripple/nodestore/impl/ManagerImp.cpp      |   2 +-
 src/ripple/nodestore/tests/Backend.test.cpp   |   2 +-
 src/ripple/nodestore/tests/Database.test.cpp  |   2 +-
 src/ripple/nodestore/tests/Timing.test.cpp    |   4 +-
 src/ripple/nodestore/tests/import_test.cpp    |   2 +-
 src/ripple/overlay/impl/ConnectAttempt.cpp    |   2 +-
 src/ripple/overlay/impl/ConnectAttempt.h      |   4 +-
 src/ripple/overlay/impl/OverlayImpl.cpp       |   4 +-
 src/ripple/overlay/impl/PeerImp.h             |   4 +-
 src/ripple/overlay/impl/PeerSet.cpp           |   2 +-
 src/ripple/overlay/impl/TMHello.cpp           |   2 +-
 src/ripple/overlay/tests/short_read.test.cpp  |   2 +-
 src/ripple/peerfinder/impl/Checker.h          |   2 +-
 src/ripple/server/Port.h                      |   2 +-
 src/ripple/server/SimpleWriter.h              |   4 +-
 src/ripple/server/impl/BaseHTTPPeer.h         |   2 +-
 src/ripple/server/impl/BaseWSPeer.h           |   2 +-
 src/ripple/server/impl/Door.cpp               |   2 +-
 src/ripple/server/impl/Door.h                 |   2 +-
 src/ripple/server/impl/SSLWSPeer.h            |   2 +-
 src/ripple/server/impl/ServerHandlerImp.cpp   |   2 +-
 src/ripple/server/json_body.h                 |   6 +-
 src/ripple/test/impl/BasicNetwork_test.cpp    |   2 +-
 src/ripple/test/impl/WSClient.cpp             |   4 +-
 src/ripple/test/impl/WSClient_test.cpp        |   2 +-
 src/ripple/test/jtx/Env.h                     |   2 +-
 src/ripple/test/jtx/impl/Env_test.cpp         |   2 +-
 src/ripple/unity/beast.cpp                    |   2 +-
 src/ripple/websocket/AutoSocket.h             |   4 +-
 src/ripple/websocket/Connection.h             |   2 +-
 src/websocketpp_02/src/sockets/autotls.hpp    |   2 +-
 60 files changed, 389 insertions(+), 296 deletions(-)
 create mode 100644 src/ripple/beast/define_print.cpp

diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
index 94223fea72..beab4783de 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj
+++ b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -87,7 +87,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">
     <ClCompile>
       <PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;BOOST_NO_AUTO_PTR;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NOMINMAX;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\extras;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -124,7 +124,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;BOOST_NO_AUTO_PTR;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NOMINMAX;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\extras;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -161,7 +161,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">
     <ClCompile>
       <PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;BOOST_NO_AUTO_PTR;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;NOMINMAX;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\extras;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
       <ExceptionHandling>Async</ExceptionHandling>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -196,7 +196,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;BOOST_NO_AUTO_PTR;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;NOMINMAX;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\beast\extras;..\..\src\beast\include;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
       <ExceptionHandling>Async</ExceptionHandling>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -236,86 +236,113 @@
     </ClInclude>
     <ClInclude Include="..\..\src\BeastConfig.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\async_completion.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\abstract_ostream.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\basic_streambuf.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\amount.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\bind_handler.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_abstract_ostream.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\buffer_cat.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_scoped_ostream.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\buffer_concepts.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_std_ostream.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\consuming_buffers.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\debug_ostream.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\base64.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\bind_handler.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\global_suites.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\buffer_cat.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\match.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\buffer_concepts.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\print.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\ci_char_traits.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\recorder.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\const_container.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\reporter.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\empty_base_optimization.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\results.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\get_lowest_layer.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\runner.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\integer_sequence.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\suite.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\is_call_possible.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\suite_info.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\sha1.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\suite_list.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\abstract_ostream.hpp">
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\thread.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\basic_abstract_ostream.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\async_completion.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\basic_scoped_ostream.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\basic_streambuf.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\basic_std_ostream.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\debug_ostream.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\buffer_cat.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream_concepts.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\buffer_concepts.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\temp_dir.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\consuming_buffers.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\amount.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\base64.hpp">
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\include\beast\detail\unit_test\define_print.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\global_suites.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\bind_handler.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\match.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_cat.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\print.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_concepts.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\recorder.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\ci_char_traits.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\reporter.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\empty_base_optimization.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\results.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\get_lowest_layer.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\runner.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\integer_sequence.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\suite.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\is_call_possible.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\suite_info.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\sha1.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\suite_list.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\stream_concepts.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\thread.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\temp_dir.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\write_streambuf.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\write_streambuf.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\handler_alloc.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\error.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\handler_concepts.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\core\handler_alloc.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\handler_concepts.hpp">
+    </ClInclude>
+    <None Include="..\..\src\beast\include\beast\core\impl\basic_streambuf.ipp">
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp">
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\prepare_buffers.ipp">
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\static_streambuf.ipp">
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\streambuf_readstream.ipp">
+    </None>
+    <ClInclude Include="..\..\src\beast\include\beast\core\placeholders.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\prepare_buffers.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\static_streambuf.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\static_string.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\streambuf.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\streambuf_readstream.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\stream_concepts.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\to_string.hpp">
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\write_streambuf.hpp">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\http.hpp">
     </ClInclude>
@@ -333,8 +360,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\http\empty_body.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\http\error.hpp">
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\http\headers.hpp">
     </ClInclude>
     <None Include="..\..\src\beast\include\beast\http\impl\basic_headers.ipp">
@@ -369,34 +394,10 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp">
     </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\http\type_check.hpp">
+    </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\http\write.hpp">
     </ClInclude>
-    <None Include="..\..\src\beast\include\beast\impl\basic_streambuf.ipp">
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\consuming_buffers.ipp">
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\prepare_buffers.ipp">
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\static_streambuf.ipp">
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\streambuf_readstream.ipp">
-    </None>
-    <ClInclude Include="..\..\src\beast\include\beast\placeholders.hpp">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\prepare_buffers.hpp">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\static_streambuf.hpp">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\static_string.hpp">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\streambuf.hpp">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\streambuf_readstream.hpp">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\stream_concepts.hpp">
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\to_string.hpp">
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\websocket.hpp">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\websocket\detail\decorator.hpp">
@@ -453,8 +454,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\websocket\teardown.hpp">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\write_streambuf.hpp">
-    </ClInclude>
     <ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-32bit.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-64bit.h">
@@ -1638,6 +1637,9 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\beast\cxx17\type_traits.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\beast\define_print.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\beast\hash\endian.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\beast\hash\fnv1a.h">
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
index c3177ee2be..d6031d5408 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -13,20 +13,32 @@
     <Filter Include="ed25519-donna">
       <UniqueIdentifier>{9DEED977-2072-A182-5BD9-CEBF206E8C91}</UniqueIdentifier>
     </Filter>
+    <Filter Include="extras">
+      <UniqueIdentifier>{477971A7-4031-9D7E-C153-2FC390C183F6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="extras\beast">
+      <UniqueIdentifier>{F8A3CFB1-5785-C83C-4338-5F27773F327D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="extras\beast\unit_test">
+      <UniqueIdentifier>{8F81A840-0F90-3664-FE3C-4EAF71864EA3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="extras\beast\unit_test\detail">
+      <UniqueIdentifier>{C4E6332D-1115-85EB-D574-A18E70A03124}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{BFB5FB0D-E563-77CD-68EA-A6E186D6240D}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\beast">
       <UniqueIdentifier>{0959FCA5-589F-980F-57AF-AB859F5A61AA}</UniqueIdentifier>
     </Filter>
-    <Filter Include="include\beast\detail">
-      <UniqueIdentifier>{42B1E98B-3FD0-CA4B-41E1-1BF2B5548847}</UniqueIdentifier>
+    <Filter Include="include\beast\core">
+      <UniqueIdentifier>{0E36C1CA-6BDD-2413-4E69-64ED5F44F9D5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="include\beast\detail\stream">
-      <UniqueIdentifier>{111F5668-0DD0-400E-97B7-0B01809D8BF2}</UniqueIdentifier>
+    <Filter Include="include\beast\core\detail">
+      <UniqueIdentifier>{A37B2E28-7A35-B699-8B09-D51004D302FA}</UniqueIdentifier>
     </Filter>
-    <Filter Include="include\beast\detail\unit_test">
-      <UniqueIdentifier>{7A85C6E8-9F03-F94D-4302-A43773BF7E61}</UniqueIdentifier>
+    <Filter Include="include\beast\core\impl">
+      <UniqueIdentifier>{9EFA48D3-D5FA-A645-5DD5-ED6EBAF39EF6}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\beast\http">
       <UniqueIdentifier>{78230F53-2814-6C7D-1558-87709A2F6090}</UniqueIdentifier>
@@ -37,9 +49,6 @@
     <Filter Include="include\beast\http\impl">
       <UniqueIdentifier>{DDE347C4-F990-B1A8-1D36-357D36685D1F}</UniqueIdentifier>
     </Filter>
-    <Filter Include="include\beast\impl">
-      <UniqueIdentifier>{3CFD7EE6-5D12-16E4-B83A-B16BA89B931D}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include\beast\websocket">
       <UniqueIdentifier>{A3314CD5-8DAB-E905-89CA-0DBAEF8A4FFF}</UniqueIdentifier>
     </Filter>
@@ -528,125 +537,167 @@
     <ClInclude Include="..\..\src\BeastConfig.h">
       <Filter>.</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\async_completion.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\abstract_ostream.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\basic_streambuf.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\amount.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\bind_handler.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_abstract_ostream.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\buffer_cat.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_scoped_ostream.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\buffer_concepts.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_std_ostream.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\consuming_buffers.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\debug_ostream.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\base64.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp">
+      <Filter>extras\beast\unit_test\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\bind_handler.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\global_suites.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\buffer_cat.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\match.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\buffer_concepts.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\print.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\ci_char_traits.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\recorder.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\const_container.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\reporter.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\empty_base_optimization.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\results.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\get_lowest_layer.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\runner.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\integer_sequence.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\suite.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\is_call_possible.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\suite_info.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\sha1.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\suite_list.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\abstract_ostream.hpp">
-      <Filter>include\beast\detail\stream</Filter>
+    <ClInclude Include="..\..\src\beast\extras\beast\unit_test\thread.hpp">
+      <Filter>extras\beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\basic_abstract_ostream.hpp">
-      <Filter>include\beast\detail\stream</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\async_completion.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\basic_scoped_ostream.hpp">
-      <Filter>include\beast\detail\stream</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\basic_streambuf.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\basic_std_ostream.hpp">
-      <Filter>include\beast\detail\stream</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\bind_handler.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream\debug_ostream.hpp">
-      <Filter>include\beast\detail\stream</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\buffer_cat.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\stream_concepts.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\buffer_concepts.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\temp_dir.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\consuming_buffers.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\amount.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\base64.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\beast\include\beast\detail\unit_test\define_print.cpp">
-      <Filter>include\beast\detail\unit_test</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\global_suites.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\bind_handler.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\match.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_cat.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\print.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\buffer_concepts.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\recorder.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\ci_char_traits.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\reporter.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\empty_base_optimization.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\results.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\get_lowest_layer.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\runner.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\integer_sequence.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\suite.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\is_call_possible.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\suite_info.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\sha1.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\suite_list.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\stream_concepts.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\unit_test\thread.hpp">
-      <Filter>include\beast\detail\unit_test</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\temp_dir.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\detail\write_streambuf.hpp">
-      <Filter>include\beast\detail</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\detail\write_streambuf.hpp">
+      <Filter>include\beast\core\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\handler_alloc.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\error.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\handler_concepts.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\core\handler_alloc.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\handler_concepts.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <None Include="..\..\src\beast\include\beast\core\impl\basic_streambuf.ipp">
+      <Filter>include\beast\core\impl</Filter>
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\consuming_buffers.ipp">
+      <Filter>include\beast\core\impl</Filter>
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\prepare_buffers.ipp">
+      <Filter>include\beast\core\impl</Filter>
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\static_streambuf.ipp">
+      <Filter>include\beast\core\impl</Filter>
+    </None>
+    <None Include="..\..\src\beast\include\beast\core\impl\streambuf_readstream.ipp">
+      <Filter>include\beast\core\impl</Filter>
+    </None>
+    <ClInclude Include="..\..\src\beast\include\beast\core\placeholders.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\prepare_buffers.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\static_streambuf.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\static_string.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\streambuf.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\streambuf_readstream.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\stream_concepts.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\to_string.hpp">
+      <Filter>include\beast\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\beast\include\beast\core\write_streambuf.hpp">
+      <Filter>include\beast\core</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\http.hpp">
       <Filter>include\beast</Filter>
@@ -672,9 +723,6 @@
     <ClInclude Include="..\..\src\beast\include\beast\http\empty_body.hpp">
       <Filter>include\beast\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\http\error.hpp">
-      <Filter>include\beast\http</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\http\headers.hpp">
       <Filter>include\beast\http</Filter>
     </ClInclude>
@@ -726,47 +774,11 @@
     <ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp">
       <Filter>include\beast\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\http\write.hpp">
+    <ClInclude Include="..\..\src\beast\include\beast\http\type_check.hpp">
       <Filter>include\beast\http</Filter>
     </ClInclude>
-    <None Include="..\..\src\beast\include\beast\impl\basic_streambuf.ipp">
-      <Filter>include\beast\impl</Filter>
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\consuming_buffers.ipp">
-      <Filter>include\beast\impl</Filter>
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\prepare_buffers.ipp">
-      <Filter>include\beast\impl</Filter>
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\static_streambuf.ipp">
-      <Filter>include\beast\impl</Filter>
-    </None>
-    <None Include="..\..\src\beast\include\beast\impl\streambuf_readstream.ipp">
-      <Filter>include\beast\impl</Filter>
-    </None>
-    <ClInclude Include="..\..\src\beast\include\beast\placeholders.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\prepare_buffers.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\static_streambuf.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\static_string.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\streambuf.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\streambuf_readstream.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\stream_concepts.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\to_string.hpp">
-      <Filter>include\beast</Filter>
+    <ClInclude Include="..\..\src\beast\include\beast\http\write.hpp">
+      <Filter>include\beast\http</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\beast\include\beast\websocket.hpp">
       <Filter>include\beast</Filter>
@@ -852,9 +864,6 @@
     <ClInclude Include="..\..\src\beast\include\beast\websocket\teardown.hpp">
       <Filter>include\beast\websocket</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\include\beast\write_streambuf.hpp">
-      <Filter>include\beast</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-32bit.h">
       <Filter>ed25519-donna</Filter>
     </ClInclude>
@@ -2157,6 +2166,9 @@
     <ClInclude Include="..\..\src\ripple\beast\cxx17\type_traits.h">
       <Filter>ripple\beast\cxx17</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\beast\define_print.cpp">
+      <Filter>ripple\beast</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\beast\hash\endian.h">
       <Filter>ripple\beast\hash</Filter>
     </ClInclude>
diff --git a/SConstruct b/SConstruct
index 4d49f816ce..c337f93a35 100644
--- a/SConstruct
+++ b/SConstruct
@@ -769,6 +769,7 @@ base.Append(CPPPATH=[
     'src',
     os.path.join('src', 'beast'),
     os.path.join('src', 'beast', 'include'),
+    os.path.join('src', 'beast', 'extras'),
     os.path.join(build_dir, 'proto'),
     os.path.join('src','soci','src'),
     os.path.join('src','soci','include'),
@@ -1201,7 +1202,7 @@ for key, value in aliases.iteritems():
 vcxproj = base.VSProject(
     os.path.join('Builds', 'VisualStudio2015', 'RippleD'),
     source = [],
-    VSPROJECT_ROOT_DIRS = ['src/beast', 'src/beast/include', 'src', '.'],
+    VSPROJECT_ROOT_DIRS = ['src/beast', 'src/beast/include', 'src/beast/extras', 'src', '.'],
     VSPROJECT_CONFIGS = msvc_configs)
 base.Alias('vcxproj', vcxproj)
 
diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index 19b91d9d86..134e653bbf 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -74,7 +74,7 @@
 #include <ripple/crypto/csprng.h>
 #include <ripple/beast/asio/io_latency_probe.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/asio/signal_set.hpp>
 #include <boost/optional.hpp>
 #include <fstream>
diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
index 2ff1aba86f..764748a0be 100644
--- a/src/ripple/app/main/Main.cpp
+++ b/src/ripple/app/main/Main.cpp
@@ -40,7 +40,7 @@
 #include <ripple/beast/core/Time.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/beast/utility/Debug.h>
-#include <beast/detail/stream/debug_ostream.hpp>
+#include <beast/unit_test/debug_ostream.hpp>
 #include <google/protobuf/stubs/common.h>
 #include <boost/program_options.hpp>
 #include <cstdlib>
@@ -201,7 +201,7 @@ static int runUnitTests(
     std::string const& argument)
 {
     using namespace beast::unit_test;
-    beast::detail::debug_ostream stream;
+    beast::debug_ostream stream;
     reporter r (stream);
     r.arg(argument);
     bool const failed (r.run_each_if (
diff --git a/src/ripple/app/tests/DeliverMin.test.cpp b/src/ripple/app/tests/DeliverMin.test.cpp
index e37ab6a1d8..bb74ea290c 100644
--- a/src/ripple/app/tests/DeliverMin.test.cpp
+++ b/src/ripple/app/tests/DeliverMin.test.cpp
@@ -114,7 +114,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(DeliverMin,app,ripple)
+BEAST_DEFINE_TESTSUITE(DeliverMin,app,ripple);
 
 } // test
 } // ripple
diff --git a/src/ripple/app/tests/HashRouter_test.cpp b/src/ripple/app/tests/HashRouter_test.cpp
index 9e5e6ca4c6..f92fe48cc6 100644
--- a/src/ripple/app/tests/HashRouter_test.cpp
+++ b/src/ripple/app/tests/HashRouter_test.cpp
@@ -225,7 +225,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(HashRouter, app, ripple)
+BEAST_DEFINE_TESTSUITE(HashRouter, app, ripple);
 
 }
 }
diff --git a/src/ripple/app/tests/Offer.test.cpp b/src/ripple/app/tests/Offer.test.cpp
index 9bcc96041e..0057afcd40 100644
--- a/src/ripple/app/tests/Offer.test.cpp
+++ b/src/ripple/app/tests/Offer.test.cpp
@@ -810,7 +810,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE (Offer, tx, ripple)
+BEAST_DEFINE_TESTSUITE (Offer, tx, ripple);
 
 }  // test
 }  // ripple
diff --git a/src/ripple/app/tests/Path_test.cpp b/src/ripple/app/tests/Path_test.cpp
index cff523126b..9565a6b7da 100644
--- a/src/ripple/app/tests/Path_test.cpp
+++ b/src/ripple/app/tests/Path_test.cpp
@@ -863,7 +863,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(Path,app,ripple)
+BEAST_DEFINE_TESTSUITE(Path,app,ripple);
 
 } // test
 } // ripple
diff --git a/src/ripple/basics/BasicConfig.h b/src/ripple/basics/BasicConfig.h
index dfc45fe921..6e3a688f31 100644
--- a/src/ripple/basics/BasicConfig.h
+++ b/src/ripple/basics/BasicConfig.h
@@ -21,8 +21,8 @@
 #define RIPPLE_BASICS_BASICCONFIG_H_INCLUDED
 
 #include <ripple/basics/contract.h>
-#include <beast/detail/const_container.hpp>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/unit_test/detail/const_container.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 #include <map>
@@ -40,7 +40,7 @@ using IniFileSections = std::map<std::string, std::vector<std::string>>;
     A configuration file contains zero or more sections.
 */
 class Section
-    : public beast::detail::const_container <
+    : public beast::unit_test::detail::const_container <
         std::map <std::string, std::string, beast::detail::ci_less>>
 {
 private:
diff --git a/src/ripple/basics/Log.h b/src/ripple/basics/Log.h
index 12701af98e..131ebe72e7 100644
--- a/src/ripple/basics/Log.h
+++ b/src/ripple/basics/Log.h
@@ -21,7 +21,7 @@
 #define RIPPLE_BASICS_LOG_H_INCLUDED
 
 #include <ripple/basics/UnorderedContainers.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <ripple/beast/utility/Journal.h>
 #include <boost/filesystem.hpp>
 #include <map>
diff --git a/src/ripple/basics/impl/ResolverAsio.cpp b/src/ripple/basics/impl/ResolverAsio.cpp
index 71544665e8..da5fd9dde8 100644
--- a/src/ripple/basics/impl/ResolverAsio.cpp
+++ b/src/ripple/basics/impl/ResolverAsio.cpp
@@ -21,7 +21,7 @@
 #include <ripple/basics/ResolverAsio.h>
 #include <ripple/basics/Log.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/WaitableEvent.h>
 #include <boost/asio.hpp>
 #include <atomic>
diff --git a/src/ripple/basics/random.h b/src/ripple/basics/random.h
index b78b0b868c..49c430521f 100644
--- a/src/ripple/basics/random.h
+++ b/src/ripple/basics/random.h
@@ -22,7 +22,7 @@
 
 #include <ripple/basics/win32_workaround.h>
 #include <ripple/beast/xor_shift_engine.h>
-#include <beast/detail/is_call_possible.hpp>
+#include <beast/core/detail/is_call_possible.hpp>
 #include <boost/thread/tss.hpp>
 #include <cassert>
 #include <cstddef>
diff --git a/src/ripple/beast/container/detail/aged_ordered_container.h b/src/ripple/beast/container/detail/aged_ordered_container.h
index 4eb78666a2..08149e61e9 100644
--- a/src/ripple/beast/container/detail/aged_ordered_container.h
+++ b/src/ripple/beast/container/detail/aged_ordered_container.h
@@ -24,7 +24,7 @@
 #include <ripple/beast/container/detail/aged_associative_container.h>
 #include <ripple/beast/container/aged_container.h>
 #include <ripple/beast/clock/abstract_clock.h>
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/version.hpp>
diff --git a/src/ripple/beast/container/detail/aged_unordered_container.h b/src/ripple/beast/container/detail/aged_unordered_container.h
index ee4d34bd71..91d4046170 100644
--- a/src/ripple/beast/container/detail/aged_unordered_container.h
+++ b/src/ripple/beast/container/detail/aged_unordered_container.h
@@ -24,7 +24,7 @@
 #include <ripple/beast/container/detail/aged_associative_container.h>
 #include <ripple/beast/container/aged_container.h>
 #include <ripple/beast/clock/abstract_clock.h>
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 #include <algorithm>
diff --git a/src/ripple/beast/define_print.cpp b/src/ripple/beast/define_print.cpp
new file mode 100644
index 0000000000..9a1c2e34fa
--- /dev/null
+++ b/src/ripple/beast/define_print.cpp
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <beast/unit_test/amount.hpp>
+#include <beast/unit_test/global_suites.hpp>
+#include <beast/unit_test/suite.hpp>
+#include <string>
+
+// Include this .cpp in your project to gain access to the printing suite
+
+namespace beast {
+namespace unit_test {
+
+/** A suite that prints the list of globally defined suites. */
+class print_test : public suite
+{
+private:
+    template <class = void>
+    void
+    do_run();
+
+public:
+    template <class = void>
+    static
+    std::string
+    prefix (suite_info const& s);
+
+    template <class = void>
+    void
+    print (suite_list const& c);
+
+    void
+    run()
+    {
+        do_run();
+    }
+};
+
+template <class>
+void
+print_test::do_run()
+{
+    log << "------------------------------------------";
+    print (global_suites());
+    log << "------------------------------------------";
+    pass();
+}
+
+template <class>
+std::string
+print_test::prefix (suite_info const& s)
+{
+    if (s.manual())
+        return "|M| ";
+    return "    ";
+}
+
+template <class>
+void
+print_test::print (suite_list const& c)
+{
+    std::size_t manual (0);
+    for (auto const& s : c)
+    {
+        log <<
+            prefix (s) <<
+            s.full_name();
+        if (s.manual())
+            ++manual;
+    }
+    log <<
+        amount (c.size(), "suite") << " total, " <<
+        amount (manual, "manual suite")
+        ;
+}
+
+BEAST_DEFINE_TESTSUITE_MANUAL(print,unit_test,beast);
+
+} // unit_test
+} // beast
diff --git a/src/ripple/beast/insight/impl/StatsDCollector.cpp b/src/ripple/beast/insight/impl/StatsDCollector.cpp
index e8a0cd6c1c..90c5dca61b 100644
--- a/src/ripple/beast/insight/impl/StatsDCollector.cpp
+++ b/src/ripple/beast/insight/impl/StatsDCollector.cpp
@@ -24,7 +24,7 @@
 #include <ripple/beast/insight/GaugeImpl.h>
 #include <ripple/beast/insight/MeterImpl.h>
 #include <ripple/beast/insight/StatsDCollector.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/List.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/optional.hpp>
diff --git a/src/ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp b/src/ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp
index f0cab45590..2ef9c4cc35 100644
--- a/src/ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp
+++ b/src/ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/beast/nudb/test/common.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
 #include <cmath>
diff --git a/src/ripple/beast/nudb/test/beast_nudb_recover_test.cpp b/src/ripple/beast/nudb/test/beast_nudb_recover_test.cpp
index c497f31021..b9e7ea00b4 100644
--- a/src/ripple/beast/nudb/test/beast_nudb_recover_test.cpp
+++ b/src/ripple/beast/nudb/test/beast_nudb_recover_test.cpp
@@ -20,7 +20,7 @@
 #include <ripple/beast/nudb/test/common.h>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <cmath>
 #include <cstring>
 #include <memory>
diff --git a/src/ripple/beast/nudb/test/beast_nudb_store_test.cpp b/src/ripple/beast/nudb/test/beast_nudb_store_test.cpp
index 31f6f8da67..f226aed938 100644
--- a/src/ripple/beast/nudb/test/beast_nudb_store_test.cpp
+++ b/src/ripple/beast/nudb/test/beast_nudb_store_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/beast/nudb/test/common.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
 #include <cmath>
diff --git a/src/ripple/beast/unit_test.h b/src/ripple/beast/unit_test.h
index 23e929ac81..06b02c9bba 100644
--- a/src/ripple/beast/unit_test.h
+++ b/src/ripple/beast/unit_test.h
@@ -20,22 +20,16 @@
 #ifndef BEAST_UNIT_TEST_H_INCLUDED
 #define BEAST_UNIT_TEST_H_INCLUDED
 
-#include <beast/detail/unit_test/amount.hpp>
-#include <beast/detail/unit_test/print.hpp>
-#include <beast/detail/unit_test/global_suites.hpp>
-#include <beast/detail/unit_test/match.hpp>
-#include <beast/detail/unit_test/recorder.hpp>
-#include <beast/detail/unit_test/reporter.hpp>
-#include <beast/detail/unit_test/results.hpp>
-#include <beast/detail/unit_test/runner.hpp>
-#include <beast/detail/unit_test/suite.hpp>
-#include <beast/detail/unit_test/suite_info.hpp>
-#include <beast/detail/unit_test/suite_list.hpp>
-
-namespace beast {
-namespace unit_test {
-using namespace beast::detail::unit_test;
-} // unit_test
-} // beast
+#include <beast/unit_test/amount.hpp>
+#include <beast/unit_test/print.hpp>
+#include <beast/unit_test/global_suites.hpp>
+#include <beast/unit_test/match.hpp>
+#include <beast/unit_test/recorder.hpp>
+#include <beast/unit_test/reporter.hpp>
+#include <beast/unit_test/results.hpp>
+#include <beast/unit_test/runner.hpp>
+#include <beast/unit_test/suite.hpp>
+#include <beast/unit_test/suite_info.hpp>
+#include <beast/unit_test/suite_list.hpp>
 
 #endif
diff --git a/src/ripple/beast/utility/weak_fn.h b/src/ripple/beast/utility/weak_fn.h
index e6f0b7aed0..d52bf92f1e 100644
--- a/src/ripple/beast/utility/weak_fn.h
+++ b/src/ripple/beast/utility/weak_fn.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_WEAK_FN_H_INCLUDED
 #define BEAST_WEAK_FN_H_INCLUDED
 
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <memory>
 
 // Original version:
diff --git a/src/ripple/core/Config.h b/src/ripple/core/Config.h
index 5fd0de9c69..8703dbc0cf 100644
--- a/src/ripple/core/Config.h
+++ b/src/ripple/core/Config.h
@@ -27,7 +27,7 @@
 #include <ripple/protocol/SecretKey.h> // NIKB Breaks levelization (TEMP)
 #include <ripple/json/json_value.h>
 #include <ripple/beast/net/IPEndpoint.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <ripple/beast/utility/Journal.h>
 #include <boost/asio/ip/tcp.hpp> // VFALCO FIX: This include should not be here
 #include <boost/filesystem.hpp> // VFALCO FIX: This include should not be here
diff --git a/src/ripple/core/impl/Config.cpp b/src/ripple/core/impl/Config.cpp
index 261d64f8a3..80dada5b7f 100644
--- a/src/ripple/core/impl/Config.cpp
+++ b/src/ripple/core/impl/Config.cpp
@@ -27,7 +27,7 @@
 #include <ripple/protocol/SystemParameters.h>
 #include <ripple/net/HTTPClient.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 #include <boost/regex.hpp>
diff --git a/src/ripple/core/impl/SNTPClock.cpp b/src/ripple/core/impl/SNTPClock.cpp
index d0ca946b83..2772f58ccc 100644
--- a/src/ripple/core/impl/SNTPClock.cpp
+++ b/src/ripple/core/impl/SNTPClock.cpp
@@ -22,7 +22,7 @@
 #include <ripple/basics/ThreadName.h>
 #include <ripple/basics/random.h>
 #include <ripple/core/impl/SNTPClock.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/Thread.h>
 #include <boost/asio.hpp>
 #include <boost/optional.hpp>
diff --git a/src/ripple/ledger/tests/View_test.cpp b/src/ripple/ledger/tests/View_test.cpp
index cb70efcdf1..88744f54b9 100644
--- a/src/ripple/ledger/tests/View_test.cpp
+++ b/src/ripple/ledger/tests/View_test.cpp
@@ -974,7 +974,7 @@ class DirIsEmpty_test
 
 BEAST_DEFINE_TESTSUITE(View,ledger,ripple);
 BEAST_DEFINE_TESTSUITE(GetAmendments,ledger,ripple);
-BEAST_DEFINE_TESTSUITE(DirIsEmpty, ledger,ripple)
+BEAST_DEFINE_TESTSUITE(DirIsEmpty, ledger,ripple);
 
 }  // test
 }  // ripple
diff --git a/src/ripple/net/impl/HTTPClient.cpp b/src/ripple/net/impl/HTTPClient.cpp
index 6797d70c12..f5e51f2591 100644
--- a/src/ripple/net/impl/HTTPClient.cpp
+++ b/src/ripple/net/impl/HTTPClient.cpp
@@ -23,7 +23,7 @@
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/net/HTTPClient.h>
 #include <ripple/websocket/AutoSocket.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/LexicalCast.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp
index 57d7d624c8..184cbaa95f 100644
--- a/src/ripple/net/impl/RPCCall.cpp
+++ b/src/ripple/net/impl/RPCCall.cpp
@@ -35,7 +35,7 @@
 #include <ripple/protocol/types.h>
 #include <ripple/server/ServerHandler.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/asio/streambuf.hpp>
 #include <boost/regex.hpp>
 #include <iostream>
diff --git a/src/ripple/nodestore/backend/MemoryFactory.cpp b/src/ripple/nodestore/backend/MemoryFactory.cpp
index 396bd259f9..9bb3c419a9 100644
--- a/src/ripple/nodestore/backend/MemoryFactory.cpp
+++ b/src/ripple/nodestore/backend/MemoryFactory.cpp
@@ -21,7 +21,7 @@
 #include <ripple/basics/contract.h>
 #include <ripple/nodestore/Factory.h>
 #include <ripple/nodestore/Manager.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <map>
 #include <memory>
 #include <mutex>
diff --git a/src/ripple/nodestore/impl/ManagerImp.cpp b/src/ripple/nodestore/impl/ManagerImp.cpp
index 955023d9d1..92fb649b48 100644
--- a/src/ripple/nodestore/impl/ManagerImp.cpp
+++ b/src/ripple/nodestore/impl/ManagerImp.cpp
@@ -23,7 +23,7 @@
 #include <ripple/nodestore/impl/DatabaseImp.h>
 #include <ripple/nodestore/impl/DatabaseRotatingImp.h>
 #include <ripple/basics/StringUtilities.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <memory>
 #include <stdexcept>
 
diff --git a/src/ripple/nodestore/tests/Backend.test.cpp b/src/ripple/nodestore/tests/Backend.test.cpp
index c0d77d1dd7..d639413c32 100644
--- a/src/ripple/nodestore/tests/Backend.test.cpp
+++ b/src/ripple/nodestore/tests/Backend.test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/nodestore/tests/Base.test.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <algorithm>
 
 namespace ripple {
diff --git a/src/ripple/nodestore/tests/Database.test.cpp b/src/ripple/nodestore/tests/Database.test.cpp
index 61f3ddd58e..7772814143 100644
--- a/src/ripple/nodestore/tests/Database.test.cpp
+++ b/src/ripple/nodestore/tests/Database.test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/nodestore/tests/Base.test.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <algorithm>
 
 namespace ripple {
diff --git a/src/ripple/nodestore/tests/Timing.test.cpp b/src/ripple/nodestore/tests/Timing.test.cpp
index 6ae0562b4e..8f0ac39a82 100644
--- a/src/ripple/nodestore/tests/Timing.test.cpp
+++ b/src/ripple/nodestore/tests/Timing.test.cpp
@@ -23,10 +23,10 @@
 #include <ripple/nodestore/Manager.h>
 #include <ripple/basics/BasicConfig.h>
 #include <ripple/unity/rocksdb.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/detail/unit_test/thread.hpp>
+#include <beast/unit_test/thread.hpp>
 #include <boost/algorithm/string.hpp>
 #include <atomic>
 #include <chrono>
diff --git a/src/ripple/nodestore/tests/import_test.cpp b/src/ripple/nodestore/tests/import_test.cpp
index 2e867db55e..3ad1c1715d 100644
--- a/src/ripple/nodestore/tests/import_test.cpp
+++ b/src/ripple/nodestore/tests/import_test.cpp
@@ -26,7 +26,7 @@
 #include <ripple/beast/nudb/create.h>
 #include <ripple/beast/nudb/detail/format.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
 #include <chrono>
diff --git a/src/ripple/overlay/impl/ConnectAttempt.cpp b/src/ripple/overlay/impl/ConnectAttempt.cpp
index 31b90d6376..7446b48360 100644
--- a/src/ripple/overlay/impl/ConnectAttempt.cpp
+++ b/src/ripple/overlay/impl/ConnectAttempt.cpp
@@ -23,9 +23,9 @@
 #include <ripple/overlay/impl/PeerImp.h>
 #include <ripple/overlay/impl/Tuning.h>
 #include <ripple/json/json_reader.h>
+#include <beast/core/to_string.hpp>
 #include <beast/http/read.hpp>
 #include <beast/http/write.hpp>
-#include <beast/to_string.hpp>
 
 namespace ripple {
 
diff --git a/src/ripple/overlay/impl/ConnectAttempt.h b/src/ripple/overlay/impl/ConnectAttempt.h
index b5a59c9e43..dcf6a95f3c 100644
--- a/src/ripple/overlay/impl/ConnectAttempt.h
+++ b/src/ripple/overlay/impl/ConnectAttempt.h
@@ -31,8 +31,8 @@
 #include <ripple/beast/asio/ssl_bundle.h>
 #include <ripple/beast/net/IPAddressConversion.h>
 #include <ripple/beast/utility/WrappedSink.h>
-#include <beast/placeholders.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/http/message_v1.hpp>
 #include <beast/http/empty_body.hpp>
 #include <beast/http/parser_v1.hpp>
diff --git a/src/ripple/overlay/impl/OverlayImpl.cpp b/src/ripple/overlay/impl/OverlayImpl.cpp
index ea7982a086..966824c417 100644
--- a/src/ripple/overlay/impl/OverlayImpl.cpp
+++ b/src/ripple/overlay/impl/OverlayImpl.cpp
@@ -35,11 +35,11 @@
 #include <ripple/peerfinder/make_Manager.h>
 #include <ripple/protocol/STExchange.h>
 #include <ripple/beast/core/ByteOrder.h>
-#include <beast/detail/base64.hpp>
+#include <beast/core/detail/base64.hpp>
 #include <ripple/beast/core/LexicalCast.h>
 #include <beast/http.hpp>
 #include <beast/http/rfc2616.hpp>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <ripple/beast/utility/WrappedSink.h>
 
 #include <boost/utility/in_place_factory.hpp>
diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h
index fe0c843fff..fc67ee2fff 100644
--- a/src/ripple/overlay/impl/PeerImp.h
+++ b/src/ripple/overlay/impl/PeerImp.h
@@ -36,8 +36,8 @@
 #include <ripple/protocol/STValidation.h>
 #include <ripple/beast/core/ByteOrder.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
 #include <ripple/beast/asio/ssl_bundle.h>
 #include <beast/http/message.hpp>
 #include <beast/http/parser_v1.hpp>
diff --git a/src/ripple/overlay/impl/PeerSet.cpp b/src/ripple/overlay/impl/PeerSet.cpp
index c174f7cd5c..4c84025fc9 100644
--- a/src/ripple/overlay/impl/PeerSet.cpp
+++ b/src/ripple/overlay/impl/PeerSet.cpp
@@ -22,7 +22,7 @@
 #include <ripple/overlay/PeerSet.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/overlay/Overlay.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 
 namespace ripple {
 
diff --git a/src/ripple/overlay/impl/TMHello.cpp b/src/ripple/overlay/impl/TMHello.cpp
index 8ecac0281b..0c69bd4bfa 100644
--- a/src/ripple/overlay/impl/TMHello.cpp
+++ b/src/ripple/overlay/impl/TMHello.cpp
@@ -25,7 +25,7 @@
 #include <ripple/protocol/digest.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/overlay/impl/TMHello.h>
-#include <beast/detail/base64.hpp>
+#include <beast/core/detail/base64.hpp>
 #include <beast/http/rfc2616.hpp>
 #include <ripple/beast/core/LexicalCast.h>
 #include <boost/regex.hpp>
diff --git a/src/ripple/overlay/tests/short_read.test.cpp b/src/ripple/overlay/tests/short_read.test.cpp
index 4287592d36..dae51d3f9d 100644
--- a/src/ripple/overlay/tests/short_read.test.cpp
+++ b/src/ripple/overlay/tests/short_read.test.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/make_SSLContext.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/unit_test.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
diff --git a/src/ripple/peerfinder/impl/Checker.h b/src/ripple/peerfinder/impl/Checker.h
index 0a12c4a0b5..c432fe1940 100644
--- a/src/ripple/peerfinder/impl/Checker.h
+++ b/src/ripple/peerfinder/impl/Checker.h
@@ -21,7 +21,7 @@
 #define RIPPLE_PEERFINDER_CHECKER_H_INCLUDED
 
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>
diff --git a/src/ripple/server/Port.h b/src/ripple/server/Port.h
index 0df7baad75..684ab47df1 100644
--- a/src/ripple/server/Port.h
+++ b/src/ripple/server/Port.h
@@ -22,7 +22,7 @@
 
 #include <ripple/basics/BasicConfig.h>
 #include <ripple/beast/net/IPEndpoint.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <cstdint>
 #include <memory>
diff --git a/src/ripple/server/SimpleWriter.h b/src/ripple/server/SimpleWriter.h
index 2d59c2c398..95fb9024fa 100644
--- a/src/ripple/server/SimpleWriter.h
+++ b/src/ripple/server/SimpleWriter.h
@@ -21,10 +21,10 @@
 #define RIPPLE_SERVER_SIMPLEWRITER_H_INCLUDED
 
 #include <ripple/server/Writer.h>
+#include <beast/core/streambuf.hpp>
+#include <beast/core/write_streambuf.hpp>
 #include <beast/http/message_v1.hpp>
 #include <beast/http/write.hpp>
-#include <beast/streambuf.hpp>
-#include <beast/write_streambuf.hpp>
 #include <utility>
 
 namespace ripple {
diff --git a/src/ripple/server/impl/BaseHTTPPeer.h b/src/ripple/server/impl/BaseHTTPPeer.h
index ede5e9b130..42ed4f9b69 100644
--- a/src/ripple/server/impl/BaseHTTPPeer.h
+++ b/src/ripple/server/impl/BaseHTTPPeer.h
@@ -26,7 +26,7 @@
 #include <ripple/server/impl/io_list.h>
 #include <ripple/server/impl/ServerImpl.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/asio/ssl_error.h> // for is_short_read?
 #include <beast/http/read.hpp>
 #include <beast/http/message.hpp>
diff --git a/src/ripple/server/impl/BaseWSPeer.h b/src/ripple/server/impl/BaseWSPeer.h
index 8c17f4f2ec..a4cb52ab98 100644
--- a/src/ripple/server/impl/BaseWSPeer.h
+++ b/src/ripple/server/impl/BaseWSPeer.h
@@ -23,7 +23,7 @@
 #include <ripple/server/impl/BasePeer.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <beast/websocket.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/http/message_v1.hpp>
 #include <cassert>
 
diff --git a/src/ripple/server/impl/Door.cpp b/src/ripple/server/impl/Door.cpp
index a645700f2d..19c4b2acf4 100644
--- a/src/ripple/server/impl/Door.cpp
+++ b/src/ripple/server/impl/Door.cpp
@@ -24,7 +24,7 @@
 #include <ripple/server/impl/PlainHTTPPeer.h>
 #include <ripple/server/impl/SSLHTTPPeer.h>
 #include <boost/asio/buffer.hpp>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/asio/ssl_bundle.h>
 #include <functional>
 
diff --git a/src/ripple/server/impl/Door.h b/src/ripple/server/impl/Door.h
index 9b0e1020d4..7f36fd5670 100644
--- a/src/ripple/server/impl/Door.h
+++ b/src/ripple/server/impl/Door.h
@@ -22,7 +22,7 @@
 
 #include <ripple/server/impl/io_list.h>
 #include <ripple/server/impl/ServerImpl.h>
-#include <beast/streambuf.hpp>
+#include <beast/core/streambuf.hpp>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>
diff --git a/src/ripple/server/impl/SSLWSPeer.h b/src/ripple/server/impl/SSLWSPeer.h
index ed074905c3..5e57644ac6 100644
--- a/src/ripple/server/impl/SSLWSPeer.h
+++ b/src/ripple/server/impl/SSLWSPeer.h
@@ -23,7 +23,7 @@
 #include <ripple/server/impl/BaseHTTPPeer.h>
 #include <ripple/server/WSSession.h>
 #include <ripple/beast/asio/ssl_bundle.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <beast/websocket/ssl.hpp>
 #include <memory>
 
diff --git a/src/ripple/server/impl/ServerHandlerImp.cpp b/src/ripple/server/impl/ServerHandlerImp.cpp
index c748c803fc..81f173e1b1 100644
--- a/src/ripple/server/impl/ServerHandlerImp.cpp
+++ b/src/ripple/server/impl/ServerHandlerImp.cpp
@@ -38,7 +38,7 @@
 #include <ripple/resource/Fees.h>
 #include <ripple/rpc/impl/Tuning.h>
 #include <ripple/rpc/RPCHandler.h>
-#include <beast/detail/base64.hpp>
+#include <beast/core/detail/base64.hpp>
 #include <beast/http/headers.hpp>
 #include <beast/http/rfc2616.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/src/ripple/server/json_body.h b/src/ripple/server/json_body.h
index 9616f600b4..0f794587bb 100644
--- a/src/ripple/server/json_body.h
+++ b/src/ripple/server/json_body.h
@@ -21,7 +21,7 @@
 #define RIPPLE_SERVER_JSON_BODY_H
 
 #include <ripple/json/json_value.h>
-#include <beast/streambuf.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/http/body_type.hpp>
 
 namespace ripple {
@@ -50,7 +50,7 @@ struct json_body
         }
 
         void
-        init(beast::http::error_code&)
+        init(beast::error_code&)
         {
         }
 
@@ -63,7 +63,7 @@ struct json_body
         template<class Write>
         boost::tribool
         operator()(beast::http::resume_context&&,
-            beast::http::error_code&, Write&& write)
+            beast::error_code&, Write&& write)
         {
             write(sb_.data());
             return true;
diff --git a/src/ripple/test/impl/BasicNetwork_test.cpp b/src/ripple/test/impl/BasicNetwork_test.cpp
index dbfb951d9d..f1e3f00d1f 100644
--- a/src/ripple/test/impl/BasicNetwork_test.cpp
+++ b/src/ripple/test/impl/BasicNetwork_test.cpp
@@ -126,7 +126,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(BasicNetwork, test, ripple)
+BEAST_DEFINE_TESTSUITE(BasicNetwork, test, ripple);
 
 } // test
 } // ripple
diff --git a/src/ripple/test/impl/WSClient.cpp b/src/ripple/test/impl/WSClient.cpp
index 4a8281fd54..d125fa9ab6 100644
--- a/src/ripple/test/impl/WSClient.cpp
+++ b/src/ripple/test/impl/WSClient.cpp
@@ -24,8 +24,8 @@
 #include <ripple/json/to_string.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/server/Port.h>
-#include <beast/placeholders.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/websocket.hpp>
 #include <condition_variable>
 
diff --git a/src/ripple/test/impl/WSClient_test.cpp b/src/ripple/test/impl/WSClient_test.cpp
index 891fb83d69..5c8fdc057b 100644
--- a/src/ripple/test/impl/WSClient_test.cpp
+++ b/src/ripple/test/impl/WSClient_test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/test/WSClient.h>
 #include <ripple/test/jtx.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/handler_alloc.hpp>
+#include <beast/core/handler_alloc.hpp>
 
 namespace ripple {
 namespace test {
diff --git a/src/ripple/test/jtx/Env.h b/src/ripple/test/jtx/Env.h
index c26a84f7f4..09c2e12aed 100644
--- a/src/ripple/test/jtx/Env.h
+++ b/src/ripple/test/jtx/Env.h
@@ -42,7 +42,7 @@
 #include <ripple/protocol/STAmount.h>
 #include <ripple/protocol/STObject.h>
 #include <ripple/protocol/STTx.h>
-#include <beast/detail/is_call_possible.hpp>
+#include <beast/core/detail/is_call_possible.hpp>
 #include <ripple/beast/unit_test.h>
 #include <functional>
 #include <string>
diff --git a/src/ripple/test/jtx/impl/Env_test.cpp b/src/ripple/test/jtx/impl/Env_test.cpp
index 3bf0ad7241..46b255d6d8 100644
--- a/src/ripple/test/jtx/impl/Env_test.cpp
+++ b/src/ripple/test/jtx/impl/Env_test.cpp
@@ -601,7 +601,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(Env,app,ripple)
+BEAST_DEFINE_TESTSUITE(Env,app,ripple);
 
 } // test
 } // ripple
diff --git a/src/ripple/unity/beast.cpp b/src/ripple/unity/beast.cpp
index 2d410ba090..c08ac90469 100644
--- a/src/ripple/unity/beast.cpp
+++ b/src/ripple/unity/beast.cpp
@@ -22,6 +22,6 @@
 // MUST come first!
 #include <BeastConfig.h>
 #include <ripple/beast/core/core.unity.cpp>
-#include <beast/detail/unit_test/define_print.cpp>
+#include <ripple/beast/define_print.cpp>
 
 #endif
diff --git a/src/ripple/websocket/AutoSocket.h b/src/ripple/websocket/AutoSocket.h
index be58b8aeef..3317fdbe01 100644
--- a/src/ripple/websocket/AutoSocket.h
+++ b/src/ripple/websocket/AutoSocket.h
@@ -22,8 +22,8 @@
 
 #include <ripple/basics/Log.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/bind_handler.hpp>
-#include <beast/placeholders.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/placeholders.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
diff --git a/src/ripple/websocket/Connection.h b/src/ripple/websocket/Connection.h
index 35c5efceec..697efdf15c 100644
--- a/src/ripple/websocket/Connection.h
+++ b/src/ripple/websocket/Connection.h
@@ -41,7 +41,7 @@
 #include <ripple/websocket/WebSocket.h>
 
 #include <boost/asio.hpp>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <memory>
 
 namespace ripple {
diff --git a/src/websocketpp_02/src/sockets/autotls.hpp b/src/websocketpp_02/src/sockets/autotls.hpp
index dc11e1dcb2..2bd0d34516 100644
--- a/src/websocketpp_02/src/sockets/autotls.hpp
+++ b/src/websocketpp_02/src/sockets/autotls.hpp
@@ -29,7 +29,7 @@
 #define WEBSOCKETPP_SOCKET_AUTOTLS_HPP
 
 #include <ripple/websocket/AutoSocket.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <functional>
 
 // Note that AutoSocket.h must be included before this file