diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index d6c2ef185a..a841c94df4 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -29,22 +29,27 @@
 #include <vector>
 
 // VFALCO NOTE Holy smokes...that's a lot of boost!!!
-
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
+#include <boost/asio/read_until.hpp>
 #include <boost/asio/ssl.hpp>
+#include <boost/asio/streambuf.hpp>
 #include <boost/bimap.hpp>
-#include <boost/bimap/unordered_set_of.hpp>
+#include <boost/bimap/list_of.hpp>
 #include <boost/bimap/multiset_of.hpp>
+#include <boost/bimap/unordered_set_of.hpp>
 #include <boost/bind.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <boost/function.hpp>
+#include <boost/iostreams/concepts.hpp>
+#include <boost/iostreams/stream.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/mem_fn.hpp>
@@ -71,11 +76,16 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include <openssl/buffer.h>
 #include <openssl/ec.h>
+#include <openssl/evp.h>
 #include <openssl/md5.h>
 #include <openssl/ripemd.h>
 #include <openssl/sha.h>
 
+// for SqliteDatabase.cpp
+#include "src/cpp/database/sqlite3.h"
+
 //------------------------------------------------------------------------------
 
 // VFALCO TODO fix these warnings!
@@ -92,6 +102,16 @@
 
 #include "../ripple_data/ripple_data.h"
 
+
+
+// VFALCO NOTE Log dependencies have wormed their way into websocketpp,
+//             which needs the ripple_basic module to compile.
+//
+// VFALCO TODO Make a unity include for websocket
+//             for WSDoor, et. al.
+#include "src/cpp/websocketpp/src/sockets/autotls.hpp"
+#include "src/cpp/websocketpp/src/websocketpp.hpp"
+
 //------------------------------------------------------------------------------
 
 // VFALCO NOTE The order of these includes is critical, since they do not
@@ -204,6 +224,7 @@
 #include "src/cpp/ripple/ripple_IApplication.h"
 #include "src/cpp/ripple/AutoSocket.h"
 #include "src/cpp/ripple/CallRPC.h"
+#include "src/cpp/ripple/Transactor.h"
 #include "src/cpp/ripple/ChangeTransactor.h"
 #include "src/cpp/ripple/HTTPRequest.h"
 #include "src/cpp/ripple/HttpsClient.h"
@@ -226,14 +247,13 @@
 #include "src/cpp/ripple/PaymentTransactor.h"
 #include "src/cpp/ripple/PeerDoor.h"
 #include "src/cpp/ripple/RPC.h"
+#include "src/cpp/ripple/RPCServer.h"
 #include "src/cpp/ripple/RPCDoor.h"
 #include "src/cpp/ripple/RPCErr.h"
-#include "src/cpp/ripple/RPCServer.h"
 #include "src/cpp/ripple/RPCSub.h"
 #include "src/cpp/ripple/RegularKeySetTransactor.h"
 #include "src/cpp/ripple/ripple_RippleState.h"
 #include "src/cpp/ripple/SerializedValidation.h"
-#include "src/cpp/ripple/Transactor.h"
 #include "src/cpp/ripple/AccountSetTransactor.h"
 #include "src/cpp/ripple/TrustSetTransactor.h"
 #include "src/cpp/ripple/ripple_Version.h"
@@ -243,6 +263,21 @@
 
 #include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
 
+#if 0
+#include <iostream>
+#include <cstdlib>
+#include <boost/asio.hpp>
+#include <boost/asio/ssl.hpp>
+#include <boost/bind.hpp>
+#include <boost/iostreams/concepts.hpp>
+#include <boost/iostreams/stream.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
+#include <boost/regex.hpp>
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
+#endif
+
 //------------------------------------------------------------------------------
 
 // VFALCO TODO figure out who needs these and move to a sensible private header.
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 4fa011c45d..a18b70e563 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -115,9 +115,6 @@
     <Filter Include="1. Modules\ripple_app\_unfactored\transactions">
       <UniqueIdentifier>{1d36a65a-de7c-41f9-85dd-93b29d67606e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_app\_unfactored\main">
-      <UniqueIdentifier>{1ccfc5ad-5cd7-4a8e-b305-08f663c2397c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_app\_unfactored\ledger">
       <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
     </Filter>
@@ -1214,9 +1211,6 @@
     <ClInclude Include="src\cpp\database\database.h">
       <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\database\SqliteDatabase.h">
-      <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_net\ripple_net.h">
       <Filter>2. %28Unused%29\ripple_net</Filter>
     </ClInclude>
@@ -1644,6 +1638,9 @@
     <ClInclude Include="modules\ripple_basics\utility\ripple_CountedObject.h">
       <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
+    <ClInclude Include="src\cpp\database\SqliteDatabase.h">
+      <Filter>1. Modules\ripple_app\_unfactored\db</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="SConstruct" />
diff --git a/src/cpp/database/SqliteDatabase.cpp b/src/cpp/database/SqliteDatabase.cpp
index 313e21f577..2792bfc23b 100644
--- a/src/cpp/database/SqliteDatabase.cpp
+++ b/src/cpp/database/SqliteDatabase.cpp
@@ -4,21 +4,37 @@
 */
 //==============================================================================
 
-#include "SqliteDatabase.h"
-#include "sqlite3.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <iostream>
-
-#include <boost/thread.hpp>
-#include <boost/foreach.hpp>
-#include <boost/bind.hpp>
-
 SETUP_LOG (SqliteDatabase)
 
 using namespace std;
 
+SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
+{
+    assert (db);
+
+    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
+    int j = sqlite3_prepare_v2 (conn, sql, strlen (sql) + 1, &statement, NULL);
+
+    if (j != SQLITE_OK)
+        throw j;
+}
+
+SqliteStatement::SqliteStatement (SqliteDatabase* db, const std::string& sql, bool aux)
+{
+    assert (db);
+
+    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
+    int j = sqlite3_prepare_v2 (conn, sql.c_str (), sql.size () + 1, &statement, NULL);
+
+    if (j != SQLITE_OK)
+        throw j;
+}
+
+SqliteStatement::~SqliteStatement ()
+{
+    sqlite3_finalize (statement);
+}
+
 SqliteDatabase::SqliteDatabase (const char* host) : Database (host, "", ""), mWalQ (NULL), walRunning (false)
 {
     mConnection     = NULL;
@@ -298,33 +314,6 @@ void SqliteDatabase::runWal ()
     }
 }
 
-SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
-{
-    assert (db);
-
-    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
-    int j = sqlite3_prepare_v2 (conn, sql, strlen (sql) + 1, &statement, NULL);
-
-    if (j != SQLITE_OK)
-        throw j;
-}
-
-SqliteStatement::SqliteStatement (SqliteDatabase* db, const std::string& sql, bool aux)
-{
-    assert (db);
-
-    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
-    int j = sqlite3_prepare_v2 (conn, sql.c_str (), sql.size () + 1, &statement, NULL);
-
-    if (j != SQLITE_OK)
-        throw j;
-}
-
-SqliteStatement::~SqliteStatement ()
-{
-    sqlite3_finalize (statement);
-}
-
 sqlite3_stmt* SqliteStatement::peekStatement ()
 {
     return statement;
diff --git a/src/cpp/database/SqliteDatabase.h b/src/cpp/database/SqliteDatabase.h
index b7629d7f1f..ccd4e139e3 100644
--- a/src/cpp/database/SqliteDatabase.h
+++ b/src/cpp/database/SqliteDatabase.h
@@ -13,7 +13,7 @@ struct sqlite3_stmt;
 class SqliteDatabase : public Database
 {
 public:
-    SqliteDatabase (const char* host);
+    explicit SqliteDatabase (char const* host);
 
     void connect ();
     void disconnect ();
@@ -61,6 +61,7 @@ public:
 
 private:
     sqlite3* mConnection;
+    // VFALCO TODO Why do we need an "aux" connection? Should just use a second SqliteDatabase object.
     sqlite3* mAuxConnection;
     sqlite3_stmt* mCurrentStmt;
     bool mMoreRows;
@@ -80,6 +81,9 @@ protected:
     sqlite3_stmt* statement;
 
 public:
+    // VFALCO TODO This is quite a convoluted interface. A mysterious "aux" connection? 
+    //             Why not just have two SqliteDatabase objects?
+    //
     SqliteStatement (SqliteDatabase* db, const char* statement, bool aux = false);
     SqliteStatement (SqliteDatabase* db, const std::string& statement, bool aux = false);
     ~SqliteStatement ();
diff --git a/src/cpp/database/database.cpp b/src/cpp/database/database.cpp
index 683456b317..d52ac30abe 100644
--- a/src/cpp/database/database.cpp
+++ b/src/cpp/database/database.cpp
@@ -4,10 +4,6 @@
 */
 //==============================================================================
 
-#include "database.h"
-#include <stdlib.h>
-#include <string.h>
-
 Database::Database (const char* host, const char* user, const char* pass) : mNumCol (0)
 {
     mDBPass = pass;
diff --git a/src/cpp/ripple/AutoSocket.h b/src/cpp/ripple/AutoSocket.h
index 315b70ce7c..32b9eff99c 100644
--- a/src/cpp/ripple/AutoSocket.h
+++ b/src/cpp/ripple/AutoSocket.h
@@ -7,17 +7,6 @@
 #ifndef __AUTOSOCKET_H_
 #define __AUTOSOCKET_H_
 
-#include <vector>
-#include <string>
-
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/asio/read_until.hpp>
-
 extern LogPartition AutoSocketPartition;
 
 // Socket wrapper that supports both SSL and non-SSL connections.
diff --git a/src/cpp/ripple/CallRPC.cpp b/src/cpp/ripple/CallRPC.cpp
index 5470542ec6..d00594638a 100644
--- a/src/cpp/ripple/CallRPC.cpp
+++ b/src/cpp/ripple/CallRPC.cpp
@@ -11,26 +11,6 @@
 // Improvements to be more strict and to provide better diagnostics are welcome.
 //
 
-#include <iostream>
-#include <cstdlib>
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/bind.hpp>
-#include <boost/iostreams/concepts.hpp>
-#include <boost/iostreams/stream.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-#include <boost/regex.hpp>
-
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-
-#include "RPC.h"
-#include "RPCErr.h"
-
-#include "CallRPC.h"
-
 SETUP_LOG (RPCParser)
 
 static inline bool isSwitchChar (char c)
diff --git a/src/cpp/ripple/CallRPC.h b/src/cpp/ripple/CallRPC.h
index 10c84ebd76..3bfefe7d03 100644
--- a/src/cpp/ripple/CallRPC.h
+++ b/src/cpp/ripple/CallRPC.h
@@ -7,8 +7,6 @@
 #ifndef __CALLRPC__
 #define __CALLRPC__
 
-#include <string>
-
 class RPCParser
 {
 public:
diff --git a/src/cpp/ripple/ChangeTransactor.cpp b/src/cpp/ripple/ChangeTransactor.cpp
index c7e2d4c882..16514708cd 100644
--- a/src/cpp/ripple/ChangeTransactor.cpp
+++ b/src/cpp/ripple/ChangeTransactor.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (ChangeTransactor)
 
 TER ChangeTransactor::doApply ()
diff --git a/src/cpp/ripple/ChangeTransactor.h b/src/cpp/ripple/ChangeTransactor.h
index ab79bf8e1c..4526d8101a 100644
--- a/src/cpp/ripple/ChangeTransactor.h
+++ b/src/cpp/ripple/ChangeTransactor.h
@@ -4,8 +4,6 @@
 */
 //==============================================================================
 
-#include "Transactor.h"
-
 class ChangeTransactor : public Transactor
 {
 public:
diff --git a/src/cpp/ripple/Contract.cpp b/src/cpp/ripple/Contract.cpp
index e17453ca9a..30eaa95dd0 100644
--- a/src/cpp/ripple/Contract.cpp
+++ b/src/cpp/ripple/Contract.cpp
@@ -4,11 +4,6 @@
 */
 //==============================================================================
 
-using namespace Script;
-/*
-JED: V III
-*/
-
 Contract::Contract ()
 {
 
diff --git a/src/cpp/ripple/DBInit.cpp b/src/cpp/ripple/DBInit.cpp
index 69d6a8214e..bd6cbbd79b 100644
--- a/src/cpp/ripple/DBInit.cpp
+++ b/src/cpp/ripple/DBInit.cpp
@@ -4,8 +4,6 @@
 */
 //==============================================================================
 
-#include <string>
-
 // Transaction database holds transactions and public keys
 const char* TxnDBInit[] =
 {
diff --git a/src/cpp/ripple/HTTPRequest.cpp b/src/cpp/ripple/HTTPRequest.cpp
index 2361834833..15ec644b02 100644
--- a/src/cpp/ripple/HTTPRequest.cpp
+++ b/src/cpp/ripple/HTTPRequest.cpp
@@ -4,12 +4,6 @@
 */
 //==============================================================================
 
-#include "HTTPRequest.h"
-
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
 SETUP_LOG (HTTPRequest)
 
 // Logic to handle incoming HTTP reqests
diff --git a/src/cpp/ripple/HTTPRequest.h b/src/cpp/ripple/HTTPRequest.h
index 86152d01fd..9219eba3ab 100644
--- a/src/cpp/ripple/HTTPRequest.h
+++ b/src/cpp/ripple/HTTPRequest.h
@@ -7,11 +7,6 @@
 #ifndef HTTPREQUEST__HPP
 #define HTTPREQUEST__HPP
 
-#include <string>
-#include <map>
-
-#include <boost/asio/streambuf.hpp>
-
 enum HTTPRequestAction
 {
     // What the application code needs to do
diff --git a/src/cpp/ripple/HttpsClient.h b/src/cpp/ripple/HttpsClient.h
index f291f6ae90..2bb2eabd57 100644
--- a/src/cpp/ripple/HttpsClient.h
+++ b/src/cpp/ripple/HttpsClient.h
@@ -7,17 +7,6 @@
 #ifndef _HTTPS_CLIENT_
 #define _HTTPS_CLIENT_
 
-#include <deque>
-#include <string>
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include "AutoSocket.h"
-
 //
 // Async https client.
 //
diff --git a/src/cpp/ripple/Interpreter.cpp b/src/cpp/ripple/Interpreter.cpp
index 58afd03227..53e3a1a3aa 100644
--- a/src/cpp/ripple/Interpreter.cpp
+++ b/src/cpp/ripple/Interpreter.cpp
@@ -4,9 +4,6 @@
 */
 //==============================================================================
 
-#include "Interpreter.h"
-#include "Operation.h"
-
 /*
 We also need to charge for each op
 
diff --git a/src/cpp/ripple/OfferCancelTransactor.cpp b/src/cpp/ripple/OfferCancelTransactor.cpp
index 4a34819dfd..a623ae2109 100644
--- a/src/cpp/ripple/OfferCancelTransactor.cpp
+++ b/src/cpp/ripple/OfferCancelTransactor.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (OfferCancelTransactor)
 
 TER OfferCancelTransactor::doApply ()
diff --git a/src/cpp/ripple/OfferCancelTransactor.h b/src/cpp/ripple/OfferCancelTransactor.h
index 059cf057a6..74bf51dbaa 100644
--- a/src/cpp/ripple/OfferCancelTransactor.h
+++ b/src/cpp/ripple/OfferCancelTransactor.h
@@ -7,8 +7,6 @@
 #ifndef OFFERCANCELTRANSACTOR_H
 #define OFFERCANCELTRANSACTOR_H
 
-#include "Transactor.h"
-
 class OfferCancelTransactor : public Transactor
 {
 public:
diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/src/cpp/ripple/OfferCreateTransactor.cpp
index 1e0c589cc5..c74ade445f 100644
--- a/src/cpp/ripple/OfferCreateTransactor.cpp
+++ b/src/cpp/ripple/OfferCreateTransactor.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (OfferCreateTransactor)
 
 // Make sure an offer is still valid. If not, mark it unfunded.
diff --git a/src/cpp/ripple/OfferCreateTransactor.h b/src/cpp/ripple/OfferCreateTransactor.h
index f0982bf6ed..c29874503a 100644
--- a/src/cpp/ripple/OfferCreateTransactor.h
+++ b/src/cpp/ripple/OfferCreateTransactor.h
@@ -7,8 +7,6 @@
 #ifndef __OFFERCREATETRANSACTOR__
 #define __OFFERCREATETRANSACTOR__
 
-#include "Transactor.h"
-
 class OfferCreateTransactor : public Transactor
 {
 public:
diff --git a/src/cpp/ripple/ParameterTable.cpp b/src/cpp/ripple/ParameterTable.cpp
index 9b00c435e9..3152a838ee 100644
--- a/src/cpp/ripple/ParameterTable.cpp
+++ b/src/cpp/ripple/ParameterTable.cpp
@@ -4,11 +4,6 @@
 */
 //==============================================================================
 
-#include "ParameterTable.h"
-
-#include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
-
 bool ParameterNode::setValue (const std::string& name, const Json::Value& value, Json::Value& error)
 {
     if (name.empty ()) // this node
diff --git a/src/cpp/ripple/ParseSection.cpp b/src/cpp/ripple/ParseSection.cpp
index 0c80381753..f8ae05b6c3 100644
--- a/src/cpp/ripple/ParseSection.cpp
+++ b/src/cpp/ripple/ParseSection.cpp
@@ -4,12 +4,6 @@
 */
 //==============================================================================
 
-#include "ParseSection.h"
-
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-
 #define SECTION_DEFAULT_NAME    ""
 
 // for logging
diff --git a/src/cpp/ripple/ParseSection.h b/src/cpp/ripple/ParseSection.h
index 103dbe0ba3..9930b02d0a 100644
--- a/src/cpp/ripple/ParseSection.h
+++ b/src/cpp/ripple/ParseSection.h
@@ -7,10 +7,6 @@
 #ifndef _PARSE_SECTION_
 #define _PARSE_SECTION_
 
-#include <map>
-#include <vector>
-#include <string>
-
 typedef std::map<const std::string, std::vector<std::string> > section;
 
 section ParseSection (const std::string& strInput, const bool bTrim);
diff --git a/src/cpp/ripple/PaymentTransactor.cpp b/src/cpp/ripple/PaymentTransactor.cpp
index beccb5d9dd..b4cd21ca3a 100644
--- a/src/cpp/ripple/PaymentTransactor.cpp
+++ b/src/cpp/ripple/PaymentTransactor.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (PaymentTransactor)
 
 #define RIPPLE_PATHS_MAX    6
diff --git a/src/cpp/ripple/PaymentTransactor.h b/src/cpp/ripple/PaymentTransactor.h
index d27372b3f9..af30139b09 100644
--- a/src/cpp/ripple/PaymentTransactor.h
+++ b/src/cpp/ripple/PaymentTransactor.h
@@ -7,8 +7,6 @@
 #ifndef __PAYMENTTRANSACTOR__
 #define __PAYMENTTRANSACTOR__
 
-#include "Transactor.h"
-
 class PaymentTransactor : public Transactor
 {
 public:
diff --git a/src/cpp/ripple/PeerDoor.h b/src/cpp/ripple/PeerDoor.h
index 3a4458206a..c2e4d89007 100644
--- a/src/cpp/ripple/PeerDoor.h
+++ b/src/cpp/ripple/PeerDoor.h
@@ -7,9 +7,6 @@
 #ifndef __PEERDOOR__
 #define __PEERDOOR__
 
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-
 /*
 Handles incoming connections from other Peers
 */
diff --git a/src/cpp/ripple/RPC.h b/src/cpp/ripple/RPC.h
index 6b33587f75..771141ded4 100644
--- a/src/cpp/ripple/RPC.h
+++ b/src/cpp/ripple/RPC.h
@@ -7,9 +7,6 @@
 #ifndef __RPC_h__
 #define __RPC_h__
 
-#include <string>
-#include <map>
-
 enum http_status_type
 {
     ok = 200,
diff --git a/src/cpp/ripple/RPCDoor.cpp b/src/cpp/ripple/RPCDoor.cpp
index 45f3f7ec8a..f27208ca24 100644
--- a/src/cpp/ripple/RPCDoor.cpp
+++ b/src/cpp/ripple/RPCDoor.cpp
@@ -4,10 +4,6 @@
 */
 //==============================================================================
 
-#include "RPCDoor.h"
-#include <boost/bind.hpp>
-#include <iostream>
-
 SETUP_LOG (RPCDoor)
 
 using namespace std;
diff --git a/src/cpp/ripple/RPCDoor.h b/src/cpp/ripple/RPCDoor.h
index 801ed9597e..7a5d4763d1 100644
--- a/src/cpp/ripple/RPCDoor.h
+++ b/src/cpp/ripple/RPCDoor.h
@@ -7,8 +7,6 @@
 #ifndef RIPPLE_RPCDOOR_H
 #define RIPPLE_RPCDOOR_H
 
-#include "RPCServer.h"
-
 /*
 Handles incoming connections from people making RPC Requests
 */
diff --git a/src/cpp/ripple/RPCErr.cpp b/src/cpp/ripple/RPCErr.cpp
index c00343ca37..22fa0ab628 100644
--- a/src/cpp/ripple/RPCErr.cpp
+++ b/src/cpp/ripple/RPCErr.cpp
@@ -4,9 +4,6 @@
 */
 //==============================================================================
 
-
-#include "RPCErr.h"
-
 // For logging
 struct RPCErr { };
 
diff --git a/src/cpp/ripple/RPCHandler.h b/src/cpp/ripple/RPCHandler.h
index 8979b0d2fa..c3479af564 100644
--- a/src/cpp/ripple/RPCHandler.h
+++ b/src/cpp/ripple/RPCHandler.h
@@ -7,10 +7,6 @@
 #ifndef __RPCHANDLER__
 #define __RPCHANDLER__
 
-#include <boost/unordered_set.hpp>
-
-#include "Ledger.h"
-
 #define LEDGER_CURRENT      -1
 #define LEDGER_CLOSED       -2
 #define LEDGER_VALIDATED    -3
diff --git a/src/cpp/ripple/RPCServer.cpp b/src/cpp/ripple/RPCServer.cpp
index 4290f06724..ee859c2039 100644
--- a/src/cpp/ripple/RPCServer.cpp
+++ b/src/cpp/ripple/RPCServer.cpp
@@ -4,20 +4,6 @@
 */
 //==============================================================================
 
-#include "RPCServer.h"
-
-#include "HttpsClient.h"
-#include "RPC.h"
-
-#include <iostream>
-
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/asio/read_until.hpp>
-
 #ifndef RPC_MAXIMUM_QUERY
 #define RPC_MAXIMUM_QUERY   (1024*1024)
 #endif
diff --git a/src/cpp/ripple/RPCServer.h b/src/cpp/ripple/RPCServer.h
index 542e2b62b3..d7cd1351a8 100644
--- a/src/cpp/ripple/RPCServer.h
+++ b/src/cpp/ripple/RPCServer.h
@@ -7,9 +7,6 @@
 #ifndef __RPCSERVER__
 #define __RPCSERVER__
 
-#include "HTTPRequest.h"
-#include "RPCHandler.h"
-
 class RPCServer : public boost::enable_shared_from_this<RPCServer>
 {
 public:
diff --git a/src/cpp/ripple/RPCSub.cpp b/src/cpp/ripple/RPCSub.cpp
index 339eb62d96..9a1b8781c7 100644
--- a/src/cpp/ripple/RPCSub.cpp
+++ b/src/cpp/ripple/RPCSub.cpp
@@ -4,12 +4,6 @@
 */
 //==============================================================================
 
-#include <boost/thread.hpp>
-
-#include "RPCSub.h"
-
-#include "CallRPC.h"
-
 SETUP_LOG (RPCSub)
 
 RPCSub::RPCSub (const std::string& strUrl, const std::string& strUsername, const std::string& strPassword)
diff --git a/src/cpp/ripple/RegularKeySetTransactor.cpp b/src/cpp/ripple/RegularKeySetTransactor.cpp
index 0c89cad5f0..fae42620f1 100644
--- a/src/cpp/ripple/RegularKeySetTransactor.cpp
+++ b/src/cpp/ripple/RegularKeySetTransactor.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (RegularKeySetTransactor)
 
 uint64 RegularKeySetTransactor::calculateBaseFee ()
diff --git a/src/cpp/ripple/RegularKeySetTransactor.h b/src/cpp/ripple/RegularKeySetTransactor.h
index 9de5230444..3176348b7e 100644
--- a/src/cpp/ripple/RegularKeySetTransactor.h
+++ b/src/cpp/ripple/RegularKeySetTransactor.h
@@ -7,8 +7,6 @@
 #ifndef REGULARKEYSETTRANSACTOR_H
 #define REGULARKEYSETTRANSACTOR_H
 
-#include "Transactor.h"
-
 class RegularKeySetTransactor : public Transactor
 {
     uint64 calculateBaseFee ();
diff --git a/src/cpp/ripple/SNTPClient.cpp b/src/cpp/ripple/SNTPClient.cpp
index 929b3d3314..324f7973f6 100644
--- a/src/cpp/ripple/SNTPClient.cpp
+++ b/src/cpp/ripple/SNTPClient.cpp
@@ -4,14 +4,6 @@
 */
 //==============================================================================
 
-#include "SNTPClient.h"
-
-#include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
-
-#include <openssl/rand.h>
-
 SETUP_LOG (SNTPClient)
 
 // #define SNTP_DEBUG
diff --git a/src/cpp/ripple/SNTPClient.h b/src/cpp/ripple/SNTPClient.h
index fdfc540550..4344522348 100644
--- a/src/cpp/ripple/SNTPClient.h
+++ b/src/cpp/ripple/SNTPClient.h
@@ -7,14 +7,6 @@
 #ifndef __SNTPCLIENT__
 #define __SNTPCLIENT__
 
-#include <string>
-#include <map>
-#include <vector>
-#include <list>
-
-#include <boost/thread/mutex.hpp>
-#include <boost/asio.hpp>
-
 class SNTPQuery
 {
 public:
diff --git a/src/cpp/ripple/ScriptData.cpp b/src/cpp/ripple/ScriptData.cpp
index c3a2fef235..00e552dc74 100644
--- a/src/cpp/ripple/ScriptData.cpp
+++ b/src/cpp/ripple/ScriptData.cpp
@@ -3,7 +3,3 @@
     Copyright (c) 2011-2013, OpenCoin, Inc.
 */
 //==============================================================================
-
-#include "ScriptData.h"
-
-// vim:ts=4
diff --git a/src/cpp/ripple/TransactionMaster.cpp b/src/cpp/ripple/TransactionMaster.cpp
index b822469b45..57a2d241d2 100644
--- a/src/cpp/ripple/TransactionMaster.cpp
+++ b/src/cpp/ripple/TransactionMaster.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 #ifndef CACHED_TRANSACTION_NUM
 #define CACHED_TRANSACTION_NUM 65536
 #endif
diff --git a/src/cpp/ripple/TransactionMaster.h b/src/cpp/ripple/TransactionMaster.h
index feb1a45270..c46539d1f8 100644
--- a/src/cpp/ripple/TransactionMaster.h
+++ b/src/cpp/ripple/TransactionMaster.h
@@ -7,8 +7,6 @@
 #ifndef __TRANSACTIONMASTER__
 #define __TRANSACTIONMASTER__
 
-#include "Transaction.h"
-
 // Tracks all transactions in memory
 
 class TransactionMaster
diff --git a/src/cpp/ripple/TransactionMeta.cpp b/src/cpp/ripple/TransactionMeta.cpp
index af28069fa0..2fec9c6afd 100644
--- a/src/cpp/ripple/TransactionMeta.cpp
+++ b/src/cpp/ripple/TransactionMeta.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 // VFALCO TODO rename class to TransactionMeta
 
 SETUP_LOG (TransactionMetaSet)
diff --git a/src/cpp/ripple/TransactionQueue.cpp b/src/cpp/ripple/TransactionQueue.cpp
index 70bd76bc3e..4c2cbe2cd5 100644
--- a/src/cpp/ripple/TransactionQueue.cpp
+++ b/src/cpp/ripple/TransactionQueue.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 void TXQEntry::addCallbacks (const TXQEntry& otherEntry)
 {
     BOOST_FOREACH (const stCallback & callback, otherEntry.mCallbacks)
diff --git a/src/cpp/ripple/TransactionQueue.h b/src/cpp/ripple/TransactionQueue.h
index ce45749279..ed4b400e06 100644
--- a/src/cpp/ripple/TransactionQueue.h
+++ b/src/cpp/ripple/TransactionQueue.h
@@ -9,15 +9,6 @@
 
 // Allow transactions to be signature checked out of sequence but retired in sequence
 
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/bimap.hpp>
-#include <boost/bimap/unordered_set_of.hpp>
-#include <boost/bimap/list_of.hpp>
-
-#include "Transaction.h"
-
 class TXQeueue;
 
 class TXQEntry
diff --git a/src/cpp/ripple/Transactor.cpp b/src/cpp/ripple/Transactor.cpp
index 95cfd5746f..9a3c382493 100644
--- a/src/cpp/ripple/Transactor.cpp
+++ b/src/cpp/ripple/Transactor.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (Transactor)
 
 UPTR_T<Transactor> Transactor::makeTransactor (const SerializedTransaction& txn, TransactionEngineParams params, TransactionEngine* engine)
diff --git a/src/cpp/ripple/Transactor.h b/src/cpp/ripple/Transactor.h
index e67b8fa981..9892d33740 100644
--- a/src/cpp/ripple/Transactor.h
+++ b/src/cpp/ripple/Transactor.h
@@ -7,8 +7,6 @@
 #ifndef __TRANSACTOR__
 #define __TRANSACTOR__
 
-#include "TransactionEngine.h"
-
 class Transactor
 {
 public:
diff --git a/src/cpp/ripple/TrustSetTransactor.cpp b/src/cpp/ripple/TrustSetTransactor.cpp
index 817f2751b9..5cbb2719c5 100644
--- a/src/cpp/ripple/TrustSetTransactor.cpp
+++ b/src/cpp/ripple/TrustSetTransactor.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (TrustSetTransactor)
 
 TER TrustSetTransactor::doApply ()
diff --git a/src/cpp/ripple/TrustSetTransactor.h b/src/cpp/ripple/TrustSetTransactor.h
index f3f8e2d569..b9d75180e0 100644
--- a/src/cpp/ripple/TrustSetTransactor.h
+++ b/src/cpp/ripple/TrustSetTransactor.h
@@ -7,8 +7,6 @@
 #ifndef TRUSTSETTRANSACTOR_H
 #define TRUSTSETTRANSACTOR_H
 
-#include "Transactor.h"
-
 class TrustSetTransactor : public Transactor
 {
 public:
diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h
index e47f94a4d1..1b55345b1f 100644
--- a/src/cpp/ripple/WSConnection.h
+++ b/src/cpp/ripple/WSConnection.h
@@ -8,9 +8,6 @@
 #ifndef RIPPLE_WSCONNECTION_H
 #define RIPPLE_WSCONNECTION_H
 
-#include "../websocketpp/src/sockets/autotls.hpp"
-#include "../websocketpp/src/websocketpp.hpp"
-
 // This is for logging
 struct WSConnectionLog;
 
diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp
index c35976d440..feb2667c87 100644
--- a/src/cpp/ripple/WSDoor.cpp
+++ b/src/cpp/ripple/WSDoor.cpp
@@ -4,24 +4,6 @@
 */
 //==============================================================================
 
-
-
-//#define WSDOOR_CPP
-//#include "../websocketpp/src/sockets/autotls.hpp"
-//#include "../websocketpp/src/websocketpp.hpp"
-
-#include "WSConnection.h"
-#include "WSHandler.h"
-
-#include "WSDoor.h"
-
-#include <iostream>
-
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#include <boost/mem_fn.hpp>
-#include <boost/unordered_set.hpp>
-
 SETUP_LOG (WSDoor)
 
 //
diff --git a/src/cpp/ripple/WSDoor.h b/src/cpp/ripple/WSDoor.h
index b8c9b3012b..f5df7dcf82 100644
--- a/src/cpp/ripple/WSDoor.h
+++ b/src/cpp/ripple/WSDoor.h
@@ -4,29 +4,8 @@
 */
 //==============================================================================
 
-#ifndef __WSDOOR__
-#define __WSDOOR__
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-
-#include "../websocketpp/src/sockets/autotls.hpp"
-#include "../websocketpp/src/websocketpp.hpp"
-
-/*
-#ifndef WSDOOR_CPP
-
-namespace websocketpp
-{
-    class server;
-    class server_autotls;
-}
-
-#endif
-*/
+#ifndef RIPPLE_WSDOOR_RIPPLEHEADER
+#define RIPPLE_WSDOOR_RIPPLEHEADER
 
 class WSDoor
 {
diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp
index 31e88d39ef..5dd2aee2e7 100644
--- a/src/cpp/ripple/main.cpp
+++ b/src/cpp/ripple/main.cpp
@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 namespace po = boost::program_options;
 
 // VFALCO TODO make these singletons that initialize statically
diff --git a/src/cpp/ripple/ripple_HashedObjectStore.cpp b/src/cpp/ripple/ripple_HashedObjectStore.cpp
index 66fcd2a6ee..8c9b9fc45e 100644
--- a/src/cpp/ripple/ripple_HashedObjectStore.cpp
+++ b/src/cpp/ripple/ripple_HashedObjectStore.cpp
@@ -303,6 +303,10 @@ void HashedObjectStore::bulkWriteSQLite (Job&)
 
         {
             Database* db = theApp->getHashNodeDB ()->getDB ();
+
+
+            // VFALCO TODO Get rid of the last parameter "aux", which is set to !theConfig.RUN_STANDALONE
+            //
             static SqliteStatement pStB (db->getSqliteDB (), "BEGIN TRANSACTION;", !theConfig.RUN_STANDALONE);
             static SqliteStatement pStE (db->getSqliteDB (), "END TRANSACTION;", !theConfig.RUN_STANDALONE);
             static SqliteStatement pSt (db->getSqliteDB (),
diff --git a/src/cpp/ripple/rpc.cpp b/src/cpp/ripple/rpc.cpp
index 125642d198..df42e86a33 100644
--- a/src/cpp/ripple/rpc.cpp
+++ b/src/cpp/ripple/rpc.cpp
@@ -4,18 +4,6 @@
 */
 //==============================================================================
 
-
-#include <boost/asio.hpp>
-#include <boost/iostreams/concepts.hpp>
-#include <boost/iostreams/stream.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-
-#include "RPC.h"
-
 // Used for logging
 struct RPC
 {