diff --git a/src/cpp/ripple/Log.cpp b/modules/ripple_basics/diagnostic/ripple_Log.cpp
similarity index 80%
rename from src/cpp/ripple/Log.cpp
rename to modules/ripple_basics/diagnostic/ripple_Log.cpp
index 52fb79ea5f..0f08d0828a 100644
--- a/src/cpp/ripple/Log.cpp
+++ b/modules/ripple_basics/diagnostic/ripple_Log.cpp
@@ -1,14 +1,4 @@
 
-#include "Log.h"
-
-#include <fstream>
-
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
-
-#include "../websocketpp/src/logger/logger.hpp"
-
 boost::recursive_mutex Log::sLock;
 
 LogSeverity Log::sMinSeverity = lsINFO;
@@ -209,40 +199,4 @@ void LogPartition::setSeverity(LogSeverity severity)
 			p->mMinSeverity = severity;
 }
 
-
-namespace websocketpp
-{
-	namespace log
-	{
-		LogPartition websocketPartition("WebSocket");
-
-		void websocketLog(websocketpp::log::alevel::value v, const std::string& entry)
-		{
-			if ((v == websocketpp::log::alevel::DEVEL) || (v == websocketpp::log::alevel::DEBUG_CLOSE))
-			{
-				if (websocketPartition.doLog(lsTRACE))
-					Log(lsDEBUG, websocketPartition) << entry;
-			}
-			else if (websocketPartition.doLog(lsDEBUG))
-				Log(lsDEBUG, websocketPartition) << entry;
-		}
-
-		void websocketLog(websocketpp::log::elevel::value v, const std::string& entry)
-		{
-			LogSeverity s = lsDEBUG;
-			if ((v & websocketpp::log::elevel::INFO) != 0)
-				s = lsINFO;
-			else if ((v & websocketpp::log::elevel::FATAL) != 0)
-				s = lsFATAL;
-			else if ((v & websocketpp::log::elevel::RERROR) != 0)
-				s = lsERROR;
-			else if ((v & websocketpp::log::elevel::WARN) != 0)
-				s = lsWARNING;
-			if (websocketPartition.doLog(s))
-				Log(s, websocketPartition) << entry;
-		}
-
-	}
-}
-
 // vim:ts=4
diff --git a/src/cpp/ripple/Log.h b/modules/ripple_basics/diagnostic/ripple_Log.h
similarity index 90%
rename from src/cpp/ripple/Log.h
rename to modules/ripple_basics/diagnostic/ripple_Log.h
index 8c3c1e2ba4..6af5663833 100644
--- a/src/cpp/ripple/Log.h
+++ b/modules/ripple_basics/diagnostic/ripple_Log.h
@@ -1,22 +1,5 @@
-#ifndef __LOG__
-#define __LOG__
-
-#include <sstream>
-#include <string>
-#include <limits>
-
-#include <boost/thread/recursive_mutex.hpp>
-
-// VFALCO: TODO, fix this for Linux builds
-// Forward declaration
-/*
-namespace boost {
-	namespace filesystem {
-		class path;
-	}
-}
-*/
-#include <boost/filesystem.hpp> // unfortunately needed to compile
+#ifndef RIPPLE_LOG_H
+#define RIPPLE_LOG_H
 
 enum LogSeverity
 {
diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp
index e6aaf9c349..a26ad5bbf6 100644
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/modules/ripple_basics/ripple_basics.cpp
@@ -24,6 +24,12 @@
 
 #include "ripple_basics.h"
 
+#include <fstream>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/algorithm/string.hpp>
+//#include <boost/filesystem.hpp>
+
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -31,6 +37,8 @@
 //#pragma warning (disable: 4244) // conversion, possible loss of data
 #endif
 
+#include "diagnostic/ripple_Log.cpp"
+
 #include "events/ripple_UptimeTimer.cpp"
 
 #ifdef _MSC_VER
diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index a46536ca2d..132af9c1cb 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -33,16 +33,35 @@
 #define RIPPLE_BASICS_H
 
 #include <ctime>
+#include <limits>
+#include <sstream>
+#include <string>
 
 // KeyCache
 #include <string>
 #include <boost/unordered_map.hpp>
 #include <boost/thread/mutex.hpp>
 
+// Log
+#include <boost/thread/recursive_mutex.hpp>
+// Forward declaration
+/*
+namespace boost {
+	namespace filesystem {
+		class path;
+	}
+}
+*/
+#include <boost/filesystem.hpp> // VFALCO: TODO, try to eliminate thie dependency
+
 #include "../ripple_json/ripple_json.h"
 
 #include "types/ripple_IntegerTypes.h"
+
 #include "containers/ripple_KeyCache.h"
+
+#include "diagnostic/ripple_Log.h"
+
 #include "events/ripple_UptimeTimer.h"
 
 #endif
diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp
index ee7c9fe4f1..82807e5e9d 100644
--- a/modules/ripple_ledger/ripple_ledger.cpp
+++ b/modules/ripple_ledger/ripple_ledger.cpp
@@ -90,7 +90,6 @@
 #include "src/cpp/ripple/LedgerMaster.h"
 #include "src/cpp/ripple/LedgerProposal.h"
 #include "src/cpp/ripple/LedgerTiming.h"
-#include "src/cpp/ripple/Log.h"
 #include "src/cpp/ripple/NetworkOPs.h"
 #include "src/cpp/ripple/NicknameState.h"
 #include "src/cpp/ripple/Offer.h"
diff --git a/modules/ripple_mess/ripple_mess.cpp b/modules/ripple_mess/ripple_mess.cpp
index 74cfee8aeb..1259b5d701 100644
--- a/modules/ripple_mess/ripple_mess.cpp
+++ b/modules/ripple_mess/ripple_mess.cpp
@@ -48,8 +48,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #pragma warning (disable: 4244) // conversion, possible loss of data
 #endif
 
-#include "src/cpp/ripple/Log.cpp"
-
 #include "src/cpp/ripple/Amount.cpp"
 #include "src/cpp/ripple/AmountRound.cpp"
 #include "src/cpp/ripple/BitcoinUtil.cpp" // no log
diff --git a/modules/ripple_net/ripple_net.cpp b/modules/ripple_net/ripple_net.cpp
index 02b06b62da..1f6e542ad1 100644
--- a/modules/ripple_net/ripple_net.cpp
+++ b/modules/ripple_net/ripple_net.cpp
@@ -24,6 +24,8 @@
 
 #include "ripple_net.h"
 
+#include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
+
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -53,6 +55,8 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/PeerDoor.cpp"
 #include "src/cpp/ripple/WSDoor.cpp" // uses logging in WSConnection.h 
 
+#include "sockets/ripple_LogWebsockets.cpp"
+
 #ifdef _MSC_VER
 //#pragma warning (pop)
 #endif
diff --git a/modules/ripple_net/sockets/ripple_LogWebsockets.cpp b/modules/ripple_net/sockets/ripple_LogWebsockets.cpp
new file mode 100644
index 0000000000..f4d77ef27b
--- /dev/null
+++ b/modules/ripple_net/sockets/ripple_LogWebsockets.cpp
@@ -0,0 +1,36 @@
+namespace websocketpp
+{
+	namespace log
+	{
+		LogPartition websocketPartition("WebSocket");
+
+		void websocketLog(websocketpp::log::alevel::value v, const std::string& entry)
+		{
+			if ((v == websocketpp::log::alevel::DEVEL) || (v == websocketpp::log::alevel::DEBUG_CLOSE))
+			{
+				if (websocketPartition.doLog(lsTRACE))
+					Log(lsDEBUG, websocketPartition) << entry;
+			}
+			else if (websocketPartition.doLog(lsDEBUG))
+				Log(lsDEBUG, websocketPartition) << entry;
+		}
+
+		void websocketLog(websocketpp::log::elevel::value v, const std::string& entry)
+		{
+			LogSeverity s = lsDEBUG;
+			if ((v & websocketpp::log::elevel::INFO) != 0)
+				s = lsINFO;
+			else if ((v & websocketpp::log::elevel::FATAL) != 0)
+				s = lsFATAL;
+			else if ((v & websocketpp::log::elevel::RERROR) != 0)
+				s = lsERROR;
+			else if ((v & websocketpp::log::elevel::WARN) != 0)
+				s = lsWARNING;
+			if (websocketPartition.doLog(s))
+				Log(s, websocketPartition) << entry;
+		}
+
+	}
+}
+
+// vim:ts=4
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 5895472dae..f92618629b 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -173,6 +173,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="modules\ripple_basics\diagnostic\ripple_Log.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\diagnostic\ripple_LogWebsockets.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="modules\ripple_basics\events\ripple_UptimeTimer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -751,12 +763,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Log.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\main.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1170,6 +1176,7 @@
     <ClInclude Include="database\sqlite3.h" />
     <ClInclude Include="database\sqlite3ext.h" />
     <ClInclude Include="modules\ripple_basics\containers\ripple_KeyCache.h" />
+    <ClInclude Include="modules\ripple_basics\diagnostic\ripple_Log.h" />
     <ClInclude Include="modules\ripple_basics\events\ripple_UptimeTimer.h" />
     <ClInclude Include="modules\ripple_basics\ripple_basics.h" />
     <ClInclude Include="modules\ripple_basics\types\ripple_IntegerTypes.h" />
@@ -1536,7 +1543,6 @@
     <ClInclude Include="src\cpp\ripple\LedgerTiming.h" />
     <ClInclude Include="src\cpp\ripple\LoadManager.h" />
     <ClInclude Include="src\cpp\ripple\LoadMonitor.h" />
-    <ClInclude Include="src\cpp\ripple\Log.h" />
     <ClInclude Include="src\cpp\ripple\NetworkOPs.h" />
     <ClInclude Include="src\cpp\ripple\NetworkStatus.h" />
     <ClInclude Include="src\cpp\ripple\NicknameState.h" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 3ea7307a18..aa190dddfa 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -130,6 +130,12 @@
     <Filter Include="1. Modules\ripple_json\json\DEPRECATED">
       <UniqueIdentifier>{e398b116-a7fa-4850-8b8e-6de95efdea4e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_basics\diagnostic">
+      <UniqueIdentifier>{8d816d89-3ab2-4a9f-ac8e-8b4346b23cf8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_net\sockets\_OLD">
+      <UniqueIdentifier>{1194480b-fa6b-4d92-8656-2470f45f2753}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -522,9 +528,6 @@
     <ClCompile Include="modules\ripple_basics\ripple_basics.cpp">
       <Filter>1. Modules\ripple_basics</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Log.cpp">
-      <Filter>1. Modules\ripple_mess\diagnostic</Filter>
-    </ClCompile>
     <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp">
       <Filter>1. Modules\ripple_ledger</Filter>
     </ClCompile>
@@ -657,21 +660,6 @@
     <ClCompile Include="src\cpp\ripple\HTTPRequest.cpp">
       <Filter>1. Modules\ripple_client\http</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\Peer.cpp">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\WSDoor.cpp">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClCompile>
     <ClCompile Include="modules\ripple_net\ripple_net.cpp">
       <Filter>1. Modules\ripple_net</Filter>
     </ClCompile>
@@ -747,6 +735,27 @@
     <ClCompile Include="modules\ripple_json\ripple_json.cpp">
       <Filter>1. Modules\ripple_json</Filter>
     </ClCompile>
+    <ClCompile Include="modules\ripple_basics\diagnostic\ripple_Log.cpp">
+      <Filter>1. Modules\ripple_basics\diagnostic</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\NetworkOPs.cpp">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\Peer.cpp">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\PeerDoor.cpp">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\WSDoor.cpp">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\diagnostic\ripple_LogWebsockets.cpp">
+      <Filter>1. Modules\ripple_net\sockets</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="database\sqlite3ext.h">
@@ -1130,9 +1139,6 @@
     <ClInclude Include="modules\ripple_basics\ripple_basics.h">
       <Filter>1. Modules\ripple_basics</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Log.h">
-      <Filter>1. Modules\ripple_mess\diagnostic</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_ledger\ripple_ledger.h">
       <Filter>1. Modules\ripple_ledger</Filter>
     </ClInclude>
@@ -1262,27 +1268,6 @@
     <ClInclude Include="src\cpp\ripple\HTTPRequest.h">
       <Filter>1. Modules\ripple_client\http</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\WSDoor.h">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\AutoSocket.h">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ConnectionPool.h">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\NetworkOPs.h">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\Peer.h">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\PeerDoor.h">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\WSConnection.h">
-      <Filter>1. Modules\ripple_net\sockets</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_net\ripple_net.h">
       <Filter>1. Modules\ripple_net</Filter>
     </ClInclude>
@@ -1394,6 +1379,30 @@
     <ClInclude Include="modules\ripple_json\json\json_features.h">
       <Filter>1. Modules\ripple_json\json</Filter>
     </ClInclude>
+    <ClInclude Include="modules\ripple_basics\diagnostic\ripple_Log.h">
+      <Filter>1. Modules\ripple_basics\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\AutoSocket.h">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ConnectionPool.h">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\NetworkOPs.h">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\Peer.h">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\PeerDoor.h">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\WSConnection.h">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\WSDoor.h">
+      <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="SConstruct" />
diff --git a/src/cpp/database/SqliteDatabase.cpp b/src/cpp/database/SqliteDatabase.cpp
index 6d4a1f1402..2d83738076 100644
--- a/src/cpp/database/SqliteDatabase.cpp
+++ b/src/cpp/database/SqliteDatabase.cpp
@@ -10,7 +10,6 @@
 #include <boost/bind.hpp>
 
 #include "../ripple/JobQueue.h"
-#include "../ripple/Log.h"
 
 SETUP_LOG (SqliteDatabase)
 
diff --git a/src/cpp/ripple/Amount.cpp b/src/cpp/ripple/Amount.cpp
index f9b94a905c..a23badb3de 100644
--- a/src/cpp/ripple/Amount.cpp
+++ b/src/cpp/ripple/Amount.cpp
@@ -10,7 +10,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include "Config.h"
-#include "Log.h"
 #include "SerializedTypes.h"
 #include "utils.h"
 
diff --git a/src/cpp/ripple/AmountRound.cpp b/src/cpp/ripple/AmountRound.cpp
index 39d6a162a3..b2c21fe28e 100644
--- a/src/cpp/ripple/AmountRound.cpp
+++ b/src/cpp/ripple/AmountRound.cpp
@@ -2,7 +2,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include "SerializedTypes.h"
-#include "Log.h"
 
 #if (ULONG_MAX > UINT_MAX)
 #define BN_add_word64(bn, word) BN_add_word(bn, word)
diff --git a/src/cpp/ripple/Application.cpp b/src/cpp/ripple/Application.cpp
index c898d4c57e..52ab879409 100644
--- a/src/cpp/ripple/Application.cpp
+++ b/src/cpp/ripple/Application.cpp
@@ -14,7 +14,6 @@
 #include "key.h"
 #include "utils.h"
 #include "TaggedCache.h"
-#include "Log.h"
 
 #include "../database/SqliteDatabase.h"
 
diff --git a/src/cpp/ripple/AutoSocket.h b/src/cpp/ripple/AutoSocket.h
index 7caa431bf1..54b70efb44 100644
--- a/src/cpp/ripple/AutoSocket.h
+++ b/src/cpp/ripple/AutoSocket.h
@@ -12,7 +12,6 @@
 #include <boost/asio/ssl.hpp>
 #include <boost/asio/read_until.hpp>
 
-#include "Log.h"
 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 3d185fb6cb..3193e36832 100644
--- a/src/cpp/ripple/CallRPC.cpp
+++ b/src/cpp/ripple/CallRPC.cpp
@@ -22,7 +22,6 @@
 
 #include "Application.h"
 #include "RPC.h"
-#include "Log.h"
 #include "RPCErr.h"
 #include "Config.h"
 #include "BitcoinUtil.h"
diff --git a/src/cpp/ripple/ConnectionPool.cpp b/src/cpp/ripple/ConnectionPool.cpp
index e49ba53575..5c08799fc5 100644
--- a/src/cpp/ripple/ConnectionPool.cpp
+++ b/src/cpp/ripple/ConnectionPool.cpp
@@ -13,7 +13,6 @@
 #include "PeerDoor.h"
 #include "Application.h"
 #include "utils.h"
-#include "Log.h"
 
 // How often to enforce policies.
 #define POLICY_INTERVAL_SECONDS	5
diff --git a/src/cpp/ripple/DeterministicKeys.cpp b/src/cpp/ripple/DeterministicKeys.cpp
index 951c4b8943..7d28b101ed 100644
--- a/src/cpp/ripple/DeterministicKeys.cpp
+++ b/src/cpp/ripple/DeterministicKeys.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include "Serializer.h"
-#include "Log.h"
 
 // <-- seed
 uint128 CKey::PassPhraseToKey(const std::string& passPhrase)
diff --git a/src/cpp/ripple/HTTPRequest.cpp b/src/cpp/ripple/HTTPRequest.cpp
index 4ef78b7267..ac945d26ba 100644
--- a/src/cpp/ripple/HTTPRequest.cpp
+++ b/src/cpp/ripple/HTTPRequest.cpp
@@ -4,8 +4,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "Log.h"
-
 SETUP_LOG (HTTPRequest)
 
 // Logic to handle incoming HTTP reqests
diff --git a/src/cpp/ripple/HashedObject.cpp b/src/cpp/ripple/HashedObject.cpp
index 88111eda80..7bfc5a9926 100644
--- a/src/cpp/ripple/HashedObject.cpp
+++ b/src/cpp/ripple/HashedObject.cpp
@@ -12,7 +12,6 @@
 
 #include "Serializer.h"
 #include "Application.h"
-#include "Log.h"
 
 SETUP_LOG (HashedObject)
 
diff --git a/src/cpp/ripple/HttpsClient.cpp b/src/cpp/ripple/HttpsClient.cpp
index 857cdcdc27..af06bfa693 100644
--- a/src/cpp/ripple/HttpsClient.cpp
+++ b/src/cpp/ripple/HttpsClient.cpp
@@ -12,7 +12,6 @@
 #include <boost/system/error_code.hpp>
 
 #include "Config.h"
-#include "Log.h"
 
 #define CLIENT_MAX_HEADER (32*1024)
 
diff --git a/src/cpp/ripple/JobQueue.cpp b/src/cpp/ripple/JobQueue.cpp
index cc116f65c9..66a47460f3 100644
--- a/src/cpp/ripple/JobQueue.cpp
+++ b/src/cpp/ripple/JobQueue.cpp
@@ -4,7 +4,6 @@
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
 
-#include "Log.h"
 #include "Config.h"
 #include "Application.h"
 
diff --git a/src/cpp/ripple/LoadManager.cpp b/src/cpp/ripple/LoadManager.cpp
index 91361ce821..3c724f58fc 100644
--- a/src/cpp/ripple/LoadManager.cpp
+++ b/src/cpp/ripple/LoadManager.cpp
@@ -4,7 +4,6 @@
 #include <boost/thread.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
-#include "Log.h"
 #include "Config.h"
 #include "Application.h"
 
diff --git a/src/cpp/ripple/LoadMonitor.cpp b/src/cpp/ripple/LoadMonitor.cpp
index 1cf64c09d7..0dace84d83 100644
--- a/src/cpp/ripple/LoadMonitor.cpp
+++ b/src/cpp/ripple/LoadMonitor.cpp
@@ -1,5 +1,4 @@
 #include "LoadMonitor.h"
-#include "Log.h"
 
 SETUP_LOG (LoadMonitor)
 
diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
index 66cb83da3b..68433155ac 100644
--- a/src/cpp/ripple/NetworkOPs.cpp
+++ b/src/cpp/ripple/NetworkOPs.cpp
@@ -9,7 +9,6 @@
 #include "HashPrefixes.h"
 #include "LedgerConsensus.h"
 #include "LedgerTiming.h"
-#include "Log.h"
 #include "RippleAddress.h"
 
 SETUP_LOG (NetworkOPs)
diff --git a/src/cpp/ripple/ParseSection.cpp b/src/cpp/ripple/ParseSection.cpp
index b31e6e604e..99f8ce39c7 100644
--- a/src/cpp/ripple/ParseSection.cpp
+++ b/src/cpp/ripple/ParseSection.cpp
@@ -1,5 +1,4 @@
 #include "ParseSection.h"
-#include "Log.h"
 #include "utils.h"
 
 #include <iostream>
diff --git a/src/cpp/ripple/Pathfinder.cpp b/src/cpp/ripple/Pathfinder.cpp
index 65862e628a..8db36b2289 100644
--- a/src/cpp/ripple/Pathfinder.cpp
+++ b/src/cpp/ripple/Pathfinder.cpp
@@ -6,7 +6,6 @@
 #include <boost/foreach.hpp>
 
 #include "Application.h"
-#include "Log.h"
 
 SETUP_LOG (Pathfinder)
 
diff --git a/src/cpp/ripple/Peer.cpp b/src/cpp/ripple/Peer.cpp
index 9c1bc5faea..c54af9c881 100644
--- a/src/cpp/ripple/Peer.cpp
+++ b/src/cpp/ripple/Peer.cpp
@@ -11,7 +11,6 @@
 #include "Application.h"
 #include "SerializedTransaction.h"
 #include "utils.h"
-#include "Log.h"
 
 SETUP_LOG (Peer)
 
diff --git a/src/cpp/ripple/PeerDoor.cpp b/src/cpp/ripple/PeerDoor.cpp
index 06f1ce9686..856ed2eea5 100644
--- a/src/cpp/ripple/PeerDoor.cpp
+++ b/src/cpp/ripple/PeerDoor.cpp
@@ -9,7 +9,6 @@
 #include "Application.h"
 #include "Config.h"
 #include "utils.h"
-#include "Log.h"
 
 SETUP_LOG (PeerDoor)
 
diff --git a/src/cpp/ripple/ProofOfWork.cpp b/src/cpp/ripple/ProofOfWork.cpp
index 88600f0685..280e0a41d1 100644
--- a/src/cpp/ripple/ProofOfWork.cpp
+++ b/src/cpp/ripple/ProofOfWork.cpp
@@ -10,7 +10,6 @@
 #include <openssl/rand.h>
 
 #include "Serializer.h"
-#include "Log.h"
 
 SETUP_LOG (ProofOfWork)
 
diff --git a/src/cpp/ripple/RPCDoor.cpp b/src/cpp/ripple/RPCDoor.cpp
index 3dfe81c7b5..da79c9b486 100644
--- a/src/cpp/ripple/RPCDoor.cpp
+++ b/src/cpp/ripple/RPCDoor.cpp
@@ -1,7 +1,6 @@
 #include "RPCDoor.h"
 #include "Application.h"
 #include "Config.h"
-#include "Log.h"
 #include <boost/bind.hpp>
 #include <iostream>
 
diff --git a/src/cpp/ripple/RPCErr.cpp b/src/cpp/ripple/RPCErr.cpp
index 50371fbb3c..b3a42d40cb 100644
--- a/src/cpp/ripple/RPCErr.cpp
+++ b/src/cpp/ripple/RPCErr.cpp
@@ -1,6 +1,4 @@
 
-#include "Log.h"
-
 #include "RPCErr.h"
 #include "utils.h"
 
diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
index eaf1be1b51..0a855f4e1e 100644
--- a/src/cpp/ripple/RPCHandler.cpp
+++ b/src/cpp/ripple/RPCHandler.cpp
@@ -9,7 +9,6 @@
 #include <boost/pointer_cast.hpp>
 
 #include "Pathfinder.h"
-#include "Log.h"
 #include "RPCHandler.h"
 #include "RPCSub.h"
 #include "Application.h"
diff --git a/src/cpp/ripple/RPCServer.cpp b/src/cpp/ripple/RPCServer.cpp
index 814ab9bf2e..db4a23a296 100644
--- a/src/cpp/ripple/RPCServer.cpp
+++ b/src/cpp/ripple/RPCServer.cpp
@@ -1,5 +1,4 @@
 #include "RPCServer.h"
-#include "Log.h"
 
 #include "HttpsClient.h"
 #include "RPC.h"
diff --git a/src/cpp/ripple/RangeSet.cpp b/src/cpp/ripple/RangeSet.cpp
index 8e782a6e6a..b4c3c9030a 100644
--- a/src/cpp/ripple/RangeSet.cpp
+++ b/src/cpp/ripple/RangeSet.cpp
@@ -4,8 +4,6 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "Log.h"
-
 SETUP_LOG (RangeSet)
 
 inline uint32 min(uint32 x, uint32 y)	{ return (x < y) ? x : y; }
diff --git a/src/cpp/ripple/RippleAddress.cpp b/src/cpp/ripple/RippleAddress.cpp
index 9046b23d5a..dfdab3f7c0 100644
--- a/src/cpp/ripple/RippleAddress.cpp
+++ b/src/cpp/ripple/RippleAddress.cpp
@@ -17,7 +17,6 @@
 #include "BitcoinUtil.h"
 #include "rfc1751.h"
 #include "utils.h"
-#include "Log.h"
 #include "Serializer.h"
 #include "Application.h"
 
diff --git a/src/cpp/ripple/SHAMap.cpp b/src/cpp/ripple/SHAMap.cpp
index 7fe0498565..20223a6573 100644
--- a/src/cpp/ripple/SHAMap.cpp
+++ b/src/cpp/ripple/SHAMap.cpp
@@ -11,7 +11,6 @@
 
 #include "Serializer.h"
 #include "BitcoinUtil.h"
-#include "Log.h"
 #include "SHAMap.h"
 #include "Application.h"
 
diff --git a/src/cpp/ripple/SHAMapNodes.cpp b/src/cpp/ripple/SHAMapNodes.cpp
index e8945d4f16..87189a6515 100644
--- a/src/cpp/ripple/SHAMapNodes.cpp
+++ b/src/cpp/ripple/SHAMapNodes.cpp
@@ -13,7 +13,6 @@
 
 #include "Serializer.h"
 #include "BitcoinUtil.h"
-#include "Log.h"
 #include "HashPrefixes.h"
 
 SETUP_LOG (SHAMapNode)
diff --git a/src/cpp/ripple/SHAMapSync.cpp b/src/cpp/ripple/SHAMapSync.cpp
index 91a4efdbd5..2137d59430 100644
--- a/src/cpp/ripple/SHAMapSync.cpp
+++ b/src/cpp/ripple/SHAMapSync.cpp
@@ -9,8 +9,6 @@
 
 #include <openssl/rand.h>
 
-#include "Log.h"
-
 static const uint256 uZero;
 
 KeyCache <uint256, KeyCacheUptimeTimer> SHAMap::fullBelowCache("fullBelowCache", 65536, 240);
diff --git a/src/cpp/ripple/SNTPClient.cpp b/src/cpp/ripple/SNTPClient.cpp
index b9ed80c2d0..e7a24e5612 100644
--- a/src/cpp/ripple/SNTPClient.cpp
+++ b/src/cpp/ripple/SNTPClient.cpp
@@ -8,7 +8,6 @@
 
 #include "utils.h"
 #include "Config.h"
-#include "Log.h"
 
 SETUP_LOG (SNTPClient)
 
diff --git a/src/cpp/ripple/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h
index 0d9241033d..6bc252bae1 100644
--- a/src/cpp/ripple/SerializedTypes.h
+++ b/src/cpp/ripple/SerializedTypes.h
@@ -8,7 +8,6 @@
 #include "Serializer.h"
 #include "FieldNames.h"
 #include "InstanceCounter.h"
-#include "Log.h"
 
 // CAUTION: Do not create a vector (or similar container) of any object derived from
 // SerializedType. Use Boost ptr_* containers. The copy assignment operator of
diff --git a/src/cpp/ripple/TaggedCache.h b/src/cpp/ripple/TaggedCache.h
index 8b05e30e07..d7af5544af 100644
--- a/src/cpp/ripple/TaggedCache.h
+++ b/src/cpp/ripple/TaggedCache.h
@@ -9,7 +9,6 @@
 #include <boost/ref.hpp>
 #include <boost/make_shared.hpp>
 
-#include "Log.h"
 extern LogPartition TaggedCachePartition;
 extern int upTime();
 
diff --git a/src/cpp/ripple/UniqueNodeList.cpp b/src/cpp/ripple/UniqueNodeList.cpp
index c6dcdb6d46..26d7f4e4ab 100644
--- a/src/cpp/ripple/UniqueNodeList.cpp
+++ b/src/cpp/ripple/UniqueNodeList.cpp
@@ -17,7 +17,6 @@
 
 #include "Application.h"
 #include "HttpsClient.h"
-#include "Log.h"
 #include "ParseSection.h"
 #include "Serializer.h"
 #include "utils.h"
diff --git a/src/cpp/ripple/ValidationCollection.cpp b/src/cpp/ripple/ValidationCollection.cpp
index 2dbebc766f..7862b4cd28 100644
--- a/src/cpp/ripple/ValidationCollection.cpp
+++ b/src/cpp/ripple/ValidationCollection.cpp
@@ -5,7 +5,6 @@
 
 #include "Application.h"
 #include "LedgerTiming.h"
-#include "Log.h"
 
 SETUP_LOG (ValidationCollection)
 
diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h
index 3f94f0775f..cb1185b113 100644
--- a/src/cpp/ripple/WSConnection.h
+++ b/src/cpp/ripple/WSConnection.h
@@ -12,7 +12,6 @@
 #include "NetworkOPs.h"
 #include "CallRPC.h"
 #include "InstanceCounter.h"
-#include "Log.h"
 #include "LoadManager.h"
 #include "RPCErr.h"
 
diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp
index c9658afaa7..9ae6e87d1f 100644
--- a/src/cpp/ripple/WSDoor.cpp
+++ b/src/cpp/ripple/WSDoor.cpp
@@ -1,5 +1,4 @@
 
-#include "Log.h"
 
 //#define WSDOOR_CPP
 //#include "../websocketpp/src/sockets/autotls.hpp"
diff --git a/src/cpp/ripple/WSHandler.h b/src/cpp/ripple/WSHandler.h
index 44dbe22d7a..f469cd2020 100644
--- a/src/cpp/ripple/WSHandler.h
+++ b/src/cpp/ripple/WSHandler.h
@@ -3,7 +3,6 @@
 
 #include "Application.h"
 #include "Config.h"
-#include "Log.h"
 
 extern void initSSLContext(boost::asio::ssl::context& context,
 	std::string key_file, std::string cert_file, std::string chain_file);
diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp
index 7cfb5cb0b3..e6f87edae7 100644
--- a/src/cpp/ripple/main.cpp
+++ b/src/cpp/ripple/main.cpp
@@ -9,7 +9,6 @@
 #include "Application.h"
 #include "CallRPC.h"
 #include "Config.h"
-#include "Log.h"
 #include "RPCHandler.h"
 #include "utils.h"
 
diff --git a/src/cpp/ripple/rpc.cpp b/src/cpp/ripple/rpc.cpp
index c19e95e75d..9b401c23e4 100644
--- a/src/cpp/ripple/rpc.cpp
+++ b/src/cpp/ripple/rpc.cpp
@@ -11,7 +11,6 @@
 #include "RPC.h"
 #include "BitcoinUtil.h"
 #include "Config.h"
-#include "Log.h"
 #include "Version.h"
 
 // Used for logging