diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 8b45e3d6b..e3aa0abd4 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -1594,6 +1594,8 @@
     <ClInclude Include="..\..\modules\ripple_basics\containers\ripple_TaggedCache.h" />
     <ClInclude Include="..\..\modules\ripple_basics\ripple_basics.h" />
     <ClInclude Include="..\..\modules\ripple_basics\system\ripple_BoostIncludes.h" />
+    <ClInclude Include="..\..\modules\ripple_basics\system\ripple_OpenSSLIncludes.h" />
+    <ClInclude Include="..\..\modules\ripple_basics\system\ripple_StandardIncludes.h" />
     <ClInclude Include="..\..\modules\ripple_basics\types\ripple_HashMaps.h" />
     <ClInclude Include="..\..\modules\ripple_basics\types\ripple_BasicTypes.h" />
     <ClInclude Include="..\..\modules\ripple_basics\types\ripple_UInt256.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 8fcae53f3..5c8e4bf5d 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -1791,6 +1791,12 @@
     <ClInclude Include="..\..\modules\ripple_basics\system\ripple_BoostIncludes.h">
       <Filter>1. Modules\ripple_basics\system</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_basics\system\ripple_StandardIncludes.h">
+      <Filter>1. Modules\ripple_basics\system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_basics\system\ripple_OpenSSLIncludes.h">
+      <Filter>1. Modules\ripple_basics\system</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.proto">
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 25f12de9a..fb366439b 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -12,22 +12,6 @@
 
 //------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------
-
-#include <algorithm>
-#include <bitset>
-#include <cassert>
-#include <deque>
-#include <fstream>
-#include <iostream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <stack>
-#include <string>
-#include <vector>
-
 // VFALCO NOTE Holy smokes...that's a lot of boost!!!
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -69,15 +53,6 @@
 #include <boost/unordered_set.hpp>
 #include <boost/weak_ptr.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>
-
-
-
 #include "../modules/ripple_sqlite/ripple_sqlite.h" // for SqliteDatabase.cpp
 
 #include "../modules/ripple_core/ripple_core.h"
diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp
index 7ed9355d5..bfe86eb8f 100644
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/modules/ripple_basics/ripple_basics.cpp
@@ -12,9 +12,6 @@
 
 #include "ripple_basics.h"
 
-#include <fstream>
-#include <iostream>
-
 // VFALCO TODO Rewrite Sustain to use beast::Process
 //
 // These are for Sustain Linux variants
@@ -28,12 +25,6 @@
 #include <sys/wait.h>
 #endif
 
-#include <boost/algorithm/string.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/asio.hpp> // VFALCO NOTE just for parseIpPort (!)
-#include <boost/regex.hpp>
-
 //#include <boost/test/included/unit_test.hpp>
 
 // VFALCO TODO Replace OpenSSL randomness with a dependency-free implementation
diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index 6447fa9a9..ad1bb4ffa 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -20,41 +20,11 @@
 #ifndef RIPPLE_BASICS_RIPPLEHEADER
 #define RIPPLE_BASICS_RIPPLEHEADER
 
-#include <algorithm>
-#include <cassert>
-#include <climits>
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-#include <functional>
-#include <limits>
-#include <list>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <boost/version.hpp>
-#if BOOST_VERSION < 104700
-#error Ripple requires Boost version 1.47 or later
-#endif
+#include "system/ripple_StandardIncludes.h"
 
 #include "system/ripple_BoostIncludes.h"
 
-// VFALCO TODO Move all boost includes into ripple_BoostHeaders.h
-//
-#include <boost/bind.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/ref.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/recursive_mutex.hpp>
-#include <boost/unordered_map.hpp>
+#include "system/ripple_OpenSSLIncludes.h"
 
 // ByteOrder
 #ifdef WIN32
@@ -67,10 +37,6 @@
 # include <sys/types.h>
 #endif
 
-#include <openssl/dh.h> // for DiffieHellmanUtil
-#include <openssl/ripemd.h> // For HashUtilities
-#include <openssl/sha.h> // For HashUtilities
-
 #include "BeastConfig.h" // Must come before any Beast includes
 
 #include "modules/beast_core/beast_core.h"
diff --git a/modules/ripple_basics/system/ripple_BoostIncludes.h b/modules/ripple_basics/system/ripple_BoostIncludes.h
index 9d483c881..4cb4b7476 100644
--- a/modules/ripple_basics/system/ripple_BoostIncludes.h
+++ b/modules/ripple_basics/system/ripple_BoostIncludes.h
@@ -16,18 +16,41 @@
 // A long term goal is to reduce and hopefully eliminate the usage of boost.
 //
 
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 104700
+# error Ripple requires Boost version 1.47 or later
+#endif
+
+// This is better than setting it in some Makefile or IDE Project file.
+//
 #define BOOST_FILESYSTEM_NO_DEPRECATED
-
-#include <boost/filesystem.hpp>
-
-//------------------------------------------------------------------------------
-
-// Boost Unit Test Framework
-
 #define BOOST_TEST_NO_LIB
 #define BOOST_TEST_ALTERNATIVE_INIT_API
 #define BOOST_TEST_NO_MAIN
 
+#include <boost/algorithm/string.hpp>
+#include <boost/asio.hpp>
+#include <boost/asio/ssl.hpp>
+#include <boost/bind.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/date_time/posix_time/posix_time.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/functional/hash.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/ptr_container/ptr_vector.hpp> // VFALCO NOTE this looks like junk
+#include <boost/ref.hpp>
+#include <boost/regex.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/test/unit_test.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/unordered_map.hpp>
 
 #endif
diff --git a/modules/ripple_basics/system/ripple_OpenSSLIncludes.h b/modules/ripple_basics/system/ripple_OpenSSLIncludes.h
new file mode 100644
index 000000000..eddb8c8da
--- /dev/null
+++ b/modules/ripple_basics/system/ripple_OpenSSLIncludes.h
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_OPENSSLINCLUDES_RIPPLEHEADER
+#define RIPPLE_OPENSSLINCLUDES_RIPPLEHEADER
+
+// All OpenSSL includes we need
+
+#include <openssl/bn.h>
+#include <openssl/buffer.h>
+#include <openssl/dh.h>
+#include <openssl/ec.h>
+#include <openssl/ecdsa.h>
+#include <openssl/evp.h>
+#include <openssl/md5.h>
+#include <openssl/obj_mac.h>
+#include <openssl/ripemd.h>
+#include <openssl/sha.h>
+
+#endif
diff --git a/modules/ripple_basics/system/ripple_StandardIncludes.h b/modules/ripple_basics/system/ripple_StandardIncludes.h
new file mode 100644
index 000000000..b20927e77
--- /dev/null
+++ b/modules/ripple_basics/system/ripple_StandardIncludes.h
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_STANDARDINCLUDES_RIPPLEHEADER
+#define RIPPLE_STANDARDINCLUDES_RIPPLEHEADER
+
+// All required Standard C++ Library includes
+
+#include <algorithm>
+#include <bitset>
+#include <cassert>
+#include <climits>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <deque>
+#include <fstream>
+#include <functional>
+#include <iostream>
+#include <limits>
+#include <list>
+#include <map>
+#include <queue>
+#include <set>
+#include <set>
+#include <sstream>
+#include <stack>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#endif
diff --git a/modules/ripple_core/ripple_core.cpp b/modules/ripple_core/ripple_core.cpp
index 9fe879f32..3116573ac 100644
--- a/modules/ripple_core/ripple_core.cpp
+++ b/modules/ripple_core/ripple_core.cpp
@@ -16,7 +16,6 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
 namespace ripple
diff --git a/modules/ripple_core/ripple_core.h b/modules/ripple_core/ripple_core.h
index 6302e3dd0..0535edad3 100644
--- a/modules/ripple_core/ripple_core.h
+++ b/modules/ripple_core/ripple_core.h
@@ -22,16 +22,9 @@
 #define RIPPLE_CORE_RIPPLEHEADER
 
 #include "../ripple_basics/ripple_basics.h"
+
 #include "../ripple_data/ripple_data.h"
 
-#include <set>
-#include <string>
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/thread/condition_variable.hpp>
-#include <boost/thread/mutex.hpp>
-
 namespace ripple
 {
 
diff --git a/modules/ripple_data/ripple_data.cpp b/modules/ripple_data/ripple_data.cpp
index 27329e8f4..0f5ebce4a 100644
--- a/modules/ripple_data/ripple_data.cpp
+++ b/modules/ripple_data/ripple_data.cpp
@@ -33,7 +33,6 @@
 #include <boost/range/adaptor/copied.hpp>
 #include <boost/regex.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/test/unit_test.hpp>
 #include <boost/thread/mutex.hpp>
 
 #include <openssl/ec.h>
diff --git a/modules/ripple_data/ripple_data.h b/modules/ripple_data/ripple_data.h
index 8c8d5a06d..bc2a2e8a3 100644
--- a/modules/ripple_data/ripple_data.h
+++ b/modules/ripple_data/ripple_data.h
@@ -20,28 +20,6 @@
 #ifndef RIPPLE_DATA_RIPPLEHEADER
 #define RIPPLE_DATA_RIPPLEHEADER
 
-#include <algorithm>
-#include <cassert>
-#include <cstdio>
-#include <list>
-#include <stdexcept>
-#include <string>
-#include <stdexcept>
-#include <vector>
-
-#include <boost/cstdint.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/ptr_container/ptr_vector.hpp> // VFALCO NOTE this looks like junk
-
-#include <openssl/bn.h>
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#include <openssl/obj_mac.h>
-
-//------------------------------------------------------------------------------
-
 // VFALCO TODO try to reduce these dependencies
 #include "../ripple_basics/ripple_basics.h"
 
diff --git a/modules/ripple_json/ripple_json.h b/modules/ripple_json/ripple_json.h
index 75b8c3df6..7bda52df0 100644
--- a/modules/ripple_json/ripple_json.h
+++ b/modules/ripple_json/ripple_json.h
@@ -20,12 +20,7 @@
 #ifndef RIPPLE_JSON_RIPPLEHEADER
 #define RIPPLE_JSON_RIPPLEHEADER
 
-#include <deque>
-#include <stack>
-#include <string>
-#include <vector>
-
-#include "BeastConfig.h"
+#include "../modules/ripple_basics/ripple_basics.h"
 
 #include "json/json_config.h" // Needed before these cpptl includes
 
diff --git a/modules/ripple_websocket/ripple_websocket.h b/modules/ripple_websocket/ripple_websocket.h
index 4eeb8c78c..f9d4a2ac4 100644
--- a/modules/ripple_websocket/ripple_websocket.h
+++ b/modules/ripple_websocket/ripple_websocket.h
@@ -34,12 +34,6 @@
 //
 #include "../modules/ripple_basics/ripple_basics.h"
 
-#include <iostream>
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/bind.hpp>
-
 //------------------------------------------------------------------------------
 
 #include "websocket/src/common.hpp"