diff --git a/src/beast/modules/beast_asio/basics/SSLContext.h b/src/beast/modules/beast_asio/basics/SSLContext.h
index 3949db3d53..847927cb65 100644
--- a/src/beast/modules/beast_asio/basics/SSLContext.h
+++ b/src/beast/modules/beast_asio/basics/SSLContext.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_BASICS_SSLCONTEXT_H_INCLUDED
 #define BEAST_ASIO_BASICS_SSLCONTEXT_H_INCLUDED
 
+#include <boost/asio/ssl/context.hpp>
+
 namespace beast {
 namespace asio {
 
diff --git a/src/beast/modules/beast_asio/http/HTTPField.h b/src/beast/modules/beast_asio/http/HTTPField.h
index 6a7c390124..9671de6a4c 100644
--- a/src/beast/modules/beast_asio/http/HTTPField.h
+++ b/src/beast/modules/beast_asio/http/HTTPField.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_HTTPFIELD_H_INCLUDED
 #define BEAST_ASIO_HTTPFIELD_H_INCLUDED
 
+#include "../../../beast/strings/String.h"
+
 namespace beast {
 
 /** A single header.
diff --git a/src/beast/modules/beast_asio/http/HTTPHeaders.h b/src/beast/modules/beast_asio/http/HTTPHeaders.h
index 12688f714f..e3360327b3 100644
--- a/src/beast/modules/beast_asio/http/HTTPHeaders.h
+++ b/src/beast/modules/beast_asio/http/HTTPHeaders.h
@@ -20,6 +20,10 @@
 #ifndef BEAST_ASIO_HTTPHEADERS_H_INCLUDED
 #define BEAST_ASIO_HTTPHEADERS_H_INCLUDED
 
+#include "HTTPField.h"
+
+#include "../../beast_core/text/StringPairArray.h"
+
 namespace beast {
 
 /** A set of HTTP headers. */
diff --git a/src/beast/modules/beast_asio/http/HTTPMessage.h b/src/beast/modules/beast_asio/http/HTTPMessage.h
index 7a7a75463f..588b830ce7 100644
--- a/src/beast/modules/beast_asio/http/HTTPMessage.h
+++ b/src/beast/modules/beast_asio/http/HTTPMessage.h
@@ -20,7 +20,12 @@
 #ifndef BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
 #define BEAST_ASIO_HTTPMESSAGE_H_INCLUDED
 
+#include "HTTPHeaders.h"
+#include "HTTPVersion.h"
+
+#include "../../../beast/smart_ptr/SharedObject.h"
 #include "../../../beast/net/DynamicBuffer.h"
+#include "../../beast_core/text/StringPairArray.h"
 
 namespace beast {
 
diff --git a/src/beast/modules/beast_asio/http/HTTPParser.h b/src/beast/modules/beast_asio/http/HTTPParser.h
index 3d559e66a4..791f981bfc 100644
--- a/src/beast/modules/beast_asio/http/HTTPParser.h
+++ b/src/beast/modules/beast_asio/http/HTTPParser.h
@@ -20,6 +20,9 @@
 #ifndef BEAST_ASIO_HTTPPARSER_H_INCLUDED
 #define BEAST_ASIO_HTTPPARSER_H_INCLUDED
 
+#include "HTTPRequest.h"
+#include "HTTPResponse.h"
+
 namespace beast {
 
 class HTTPParserImpl;
diff --git a/src/beast/modules/beast_asio/http/HTTPRequest.h b/src/beast/modules/beast_asio/http/HTTPRequest.h
index 730dce52f8..ee3d9db93f 100644
--- a/src/beast/modules/beast_asio/http/HTTPRequest.h
+++ b/src/beast/modules/beast_asio/http/HTTPRequest.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_HTTPREQUEST_H_INCLUDED
 #define BEAST_ASIO_HTTPREQUEST_H_INCLUDED
 
+#include "HTTPMessage.h"
+
 namespace beast {
 
 class HTTPRequest : public HTTPMessage
diff --git a/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h b/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
index 423a6c5d4f..329232e88c 100644
--- a/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
+++ b/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h
@@ -20,6 +20,9 @@
 #ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED
 
+#include "HandshakeDetectLogic.h"
+#include "InputParser.h"
+
 namespace beast {
 namespace asio {
 
diff --git a/src/beast/modules/beast_asio/protocol/InputParser.h b/src/beast/modules/beast_asio/protocol/InputParser.h
index f9314d9880..d6bb3e84e5 100644
--- a/src/beast/modules/beast_asio/protocol/InputParser.h
+++ b/src/beast/modules/beast_asio/protocol/InputParser.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED
 #define BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED
 
+#include "../basics/FixedInputBuffer.h"
+
 namespace beast {
 namespace asio {
 
diff --git a/src/beast/modules/beast_core/text/StringArray.h b/src/beast/modules/beast_core/text/StringArray.h
index 426b98ed42..1957fe9b47 100644
--- a/src/beast/modules/beast_core/text/StringArray.h
+++ b/src/beast/modules/beast_core/text/StringArray.h
@@ -35,7 +35,7 @@ namespace beast {
 
     @see String, StringPairArray
 */
-class StringArray : LeakChecked <StringArray>
+class StringArray
 {
 public:
     //==============================================================================
diff --git a/src/ripple/common/MultiSocket.h b/src/ripple/common/MultiSocket.h
index 0332417475..00b492eac3 100644
--- a/src/ripple/common/MultiSocket.h
+++ b/src/ripple/common/MultiSocket.h
@@ -20,7 +20,11 @@
 #ifndef RIPPLE_COMMON_MULTISOCKET_H_INCLUDED
 #define RIPPLE_COMMON_MULTISOCKET_H_INCLUDED
 
-#include "../../beast/modules/beast_asio/beast_asio.h"
+#include "../../beast/beast/asio/abstract_socket.h"
+#include "../../beast/beast/net/IPEndpoint.h"
+#include "../../beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h"
+
+#include <boost/asio/ip/tcp.hpp>
 
 namespace ripple {
 
diff --git a/src/ripple/common/RippleSSLContext.h b/src/ripple/common/RippleSSLContext.h
index c0a5a64718..8160c4aa48 100644
--- a/src/ripple/common/RippleSSLContext.h
+++ b/src/ripple/common/RippleSSLContext.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED
 #define RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED
 
-#include "../../beast/modules/beast_asio/beast_asio.h"
+#include "../../beast/modules/beast_asio/basics/SSLContext.h"
 
 #include <string>
 
diff --git a/src/ripple/http/api/Port.h b/src/ripple/http/api/Port.h
index fb04dab0bd..d386d83eac 100644
--- a/src/ripple/http/api/Port.h
+++ b/src/ripple/http/api/Port.h
@@ -20,6 +20,11 @@
 #ifndef RIPPLE_HTTP_PORT_H_INCLUDED
 #define RIPPLE_HTTP_PORT_H_INCLUDED
 
+#include "../../beast/beast/net/IPEndpoint.h"
+#include "../../beast/modules/beast_asio/basics/SSLContext.h"
+
+#include <cstdint>
+
 namespace ripple {
 
 namespace HTTP {
diff --git a/src/ripple/http/api/Session.h b/src/ripple/http/api/Session.h
index cb80e41b4d..15cda5994f 100644
--- a/src/ripple/http/api/Session.h
+++ b/src/ripple/http/api/Session.h
@@ -20,6 +20,11 @@
 #ifndef RIPPLE_HTTP_SESSION_H_INCLUDED
 #define RIPPLE_HTTP_SESSION_H_INCLUDED
 
+#include "../../beast/beast/smart_ptr/SharedPtr.h"
+#include "../../beast/beast/net/IPEndpoint.h"
+#include "../../beast/beast/utility/Journal.h"
+#include "../../beast/modules/beast_asio/http/HTTPRequest.h"
+
 #include <ostream>
 
 namespace ripple {
@@ -31,9 +36,12 @@ namespace HTTP {
     Some fields are input parameters, some are output parameters,
     and all only become defined during specific callbacks.
 */
-class Session : public beast::Uncopyable
+class Session
 {
 public:
+    Session() = default;
+    Session (Session const&) = delete;
+
     /** A user-definable pointer.
         The initial value is always zero.
         Changes to the value are persisted between calls.
diff --git a/src/ripple/http/impl/Peer.h b/src/ripple/http/impl/Peer.h
index 8566458d33..65c87298f3 100644
--- a/src/ripple/http/impl/Peer.h
+++ b/src/ripple/http/impl/Peer.h
@@ -20,10 +20,15 @@
 #ifndef RIPPLE_HTTP_PEER_H_INCLUDED
 #define RIPPLE_HTTP_PEER_H_INCLUDED
 
-#include <memory>
-
+#include "../api/Session.h"
 #include "../../ripple/common/MultiSocket.h"
 
+#include "../../beast/modules/beast_asio/async/AsyncObject.h"
+#include "../../beast/modules/beast_asio/basics/SharedArg.h"
+#include "../../beast/modules/beast_asio/http/HTTPRequestParser.h"
+
+#include <memory>
+
 namespace ripple {
 namespace HTTP {
 
diff --git a/src/ripple/http/impl/ServerImpl.h b/src/ripple/http/impl/ServerImpl.h
index 71e3256c0f..1844c696dc 100644
--- a/src/ripple/http/impl/ServerImpl.h
+++ b/src/ripple/http/impl/ServerImpl.h
@@ -20,6 +20,9 @@
 #ifndef RIPPLE_HTTP_SERVERIMPL_H_INCLUDED
 #define RIPPLE_HTTP_SERVERIMPL_H_INCLUDED
 
+#include "../../beast/beast/threads/Thread.h"
+#include "../../beast/modules/beast_asio/basics/SharedArg.h"
+
 namespace ripple {
 namespace HTTP {
 
diff --git a/src/ripple/http/ripple_http.h b/src/ripple/http/ripple_http.h
index 96d1c7ab92..d0d668d542 100644
--- a/src/ripple/http/ripple_http.h
+++ b/src/ripple/http/ripple_http.h
@@ -20,6 +20,8 @@
 #ifndef RIPPLE_HTTP_H_INCLUDED
 #define RIPPLE_HTTP_H_INCLUDED
 
+// VFALCO This entire file is deprecated now, I'm working on a replacement
+
 // VFALCO NOTE this sucks that we have to include asio in the header
 //             just for HTTPMessage!!
 #include "../../beast/modules/beast_asio/beast_asio.h"
diff --git a/src/ripple_app/main/Application.cpp b/src/ripple_app/main/Application.cpp
index 930686f073..a9e1b407e4 100644
--- a/src/ripple_app/main/Application.cpp
+++ b/src/ripple_app/main/Application.cpp
@@ -17,11 +17,16 @@
 */
 //==============================================================================
 
+#include "Tuning.h"
+
 #include "../../ripple/common/seconds_clock.h"
 #include "../../ripple_rpc/api/Manager.h"
 #include "../../ripple_overlay/api/make_Overlay.h"
+#include "../../ripple_overlay/api/make_Overlay.h"
+#include "../../ripple/common/seconds_clock.h"
+#include "../../ripple_rpc/api/Manager.h"
 
-#include "Tuning.h"
+#include "../../beast/modules/beast_core/thread/DeadlineTimer.h"
 
 namespace ripple {
 
diff --git a/src/ripple_app/main/FatalErrorReporter.h b/src/ripple_app/main/FatalErrorReporter.h
index 567c4f6412..f692d516e8 100644
--- a/src/ripple_app/main/FatalErrorReporter.h
+++ b/src/ripple_app/main/FatalErrorReporter.h
@@ -20,6 +20,8 @@
 #ifndef RIPPLE_FATALERRORREPORTER_H_INCLUDED
 #define RIPPLE_FATALERRORREPORTER_H_INCLUDED
 
+#include "../../beast/modules/beast_core/diagnostic/FatalError.h"
+
 namespace ripple {
 
 /** FatalError reporter.
diff --git a/src/ripple_net/basics/HTTPRequest.cpp b/src/ripple_net/basics/HTTPRequest.cpp
index 5c9481dee4..66e222ffaa 100644
--- a/src/ripple_net/basics/HTTPRequest.cpp
+++ b/src/ripple_net/basics/HTTPRequest.cpp
@@ -17,6 +17,10 @@
 */
 //==============================================================================
 
+#include "../../beast/modules/beast_core/text/LexicalCast.h"
+
+#include <string>
+
 namespace ripple {
 
 SETUP_LOG (HTTPRequest)
diff --git a/src/ripple_net/basics/RPCDoor.cpp b/src/ripple_net/basics/RPCDoor.cpp
index 0550977e2f..d2d2288cc6 100644
--- a/src/ripple_net/basics/RPCDoor.cpp
+++ b/src/ripple_net/basics/RPCDoor.cpp
@@ -56,7 +56,6 @@ public:
 
     void startListening ()
     {
-        // VFALCO NOTE Why not use make_shared?
         RPCServerImp::pointer new_connection (boost::make_shared <RPCServerImp> (
             boost::ref (mAcceptor.get_io_service ()),
                 boost::ref (m_sslContext->get ()),
@@ -130,16 +129,15 @@ private:
     RPCServer::Handler& m_rpcServerHandler;
     boost::asio::ip::tcp::acceptor      mAcceptor;
     boost::asio::deadline_timer         mDelayTimer;
-    beast::ScopedPointer <RippleSSLContext>    m_sslContext;
+    std::unique_ptr <RippleSSLContext>    m_sslContext;
 };
 
 //------------------------------------------------------------------------------
 
+// VFALCO TODO Return std::unique_ptr here
 RPCDoor* RPCDoor::New (boost::asio::io_service& io_service, RPCServer::Handler& handler)
 {
-    beast::ScopedPointer <RPCDoor> result (new RPCDoorImp (io_service, handler));
-
-    return result.release ();
+    return new RPCDoorImp (io_service, handler);
 }
 
 }
diff --git a/src/ripple_net/basics/SNTPClient.cpp b/src/ripple_net/basics/SNTPClient.cpp
index 741dbe8ab5..f08e0d9673 100644
--- a/src/ripple_net/basics/SNTPClient.cpp
+++ b/src/ripple_net/basics/SNTPClient.cpp
@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+#include "../../beast/beast/threads/Thread.h"
+
 namespace ripple {
 
 SETUP_LOG (SNTPClient)
diff --git a/src/ripple_net/basics/impl/RPCServerImp.h b/src/ripple_net/basics/impl/RPCServerImp.h
index 1a914c5b39..ee0b51720d 100644
--- a/src/ripple_net/basics/impl/RPCServerImp.h
+++ b/src/ripple_net/basics/impl/RPCServerImp.h
@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+#include "../../beast/beast/asio/IPAddressConversion.h"
+
 namespace ripple {
 
 SETUP_LOG (RPCServer)
diff --git a/src/ripple_overlay/impl/PeerImp.h b/src/ripple_overlay/impl/PeerImp.h
index 5cb42bbc42..7481cf1adf 100644
--- a/src/ripple_overlay/impl/PeerImp.h
+++ b/src/ripple_overlay/impl/PeerImp.h
@@ -33,6 +33,8 @@
 //        just include what is needed.
 #include "../../ripple_app/ripple_app.h"
 
+#include "../../beast/beast/asio/IPAddressConversion.h"
+
 #include <cstdint>
 
 namespace ripple {
diff --git a/src/ripple_websocket/ripple_websocket.h b/src/ripple_websocket/ripple_websocket.h
index 9546a96a3a..193366c03c 100644
--- a/src/ripple_websocket/ripple_websocket.h
+++ b/src/ripple_websocket/ripple_websocket.h
@@ -27,6 +27,7 @@
 
 #include "../ripple_net/ripple_net.h"
 
+#include "../beast/modules/beast_core/text/LexicalCast.h"
 #include "../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>