diff --git a/Builds/CMake/CMakeFuncs.cmake b/Builds/CMake/CMakeFuncs.cmake
index 79120077e..c10a5f0e1 100644
--- a/Builds/CMake/CMakeFuncs.cmake
+++ b/Builds/CMake/CMakeFuncs.cmake
@@ -749,6 +749,75 @@ macro(setup_build_boilerplate)
     # set_target_properties(ripple-libpp PROPERTIES LINK_SEARCH_START_STATIC 1)
     # set_target_properties(ripple-libpp PROPERTIES LINK_SEARCH_END_STATIC 1)
   endif()
+
+  ## The following options were migrated from the erstwhile BeastConfig.h
+  ## Some of these should be considered for removal in the future if
+  ## unused or unmaintained
+
+  # beast_no_unit_test_inline
+  #    Prevents unit test definitions from being inserted into a global table
+  if (beast_no_unit_test_inline)
+    add_definitions(-DBEAST_NO_UNIT_TEST_INLINE=1)
+  endif()
+
+  # beast_force_debug
+  #    Force BEAST_DEBUG behavior regardless of other compiler settings
+  if (beast_force_debug)
+    add_definitions(-DBEAST_FORCE_DEBUG=1)
+  endif()
+
+  # beast_check_mem_leaks
+  #    Force BEAST_CHECK_MEMORY_LEAKS to be ON.  Default is ON only for debug
+  #    builds. Only implemeted for windows builds.
+  if (beast_check_mem_leaks)
+    add_definitions(-DBEAST_CHECK_MEMORY_LEAKS=1)
+  elseif(DEFINED beast_check_mem_leaks)
+    add_definitions(-DBEAST_CHECK_MEMORY_LEAKS=0)
+  endif()
+
+  if (WIN32)
+    # beast_disable_auto_link
+    #    Disables autolinking of system library dependencies on windows
+    if (beast_disable_auto_link)
+      add_definitions(-DBEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES=1)
+    endif()
+  endif()
+
+  # dump_leaks_on_exit
+  #    Displays heap blocks and counted objects which were not disposed of
+  #    during exit. Only implemented for windows builds.
+  if (DEFINED dump_leaks_on_exit AND NOT dump_leaks_on_exit)
+    add_definitions(-DRIPPLE_DUMP_LEAKS_ON_EXIT=0)
+  else ()
+    add_definitions(-DRIPPLE_DUMP_LEAKS_ON_EXIT=1)
+  endif()
+
+  # NOTE - THIS OPTION CURRENTLY DOES NOT COMPILE !!
+  # verify_nodeobject_keys
+  #    This verifies that the hash of node objects matches the payload.
+  #    This check is expensive - use with caution.
+  if (verify_nodeobject_keys)
+    add_definitions(-DRIPPLE_VERIFY_NODEOBJECT_KEYS=1)
+  endif()
+
+  # single_io_service_thread
+  #    Restricts the number of threads calling io_service::run to one.
+  #    This can be useful when debugging."
+  if (single_io_service_thread)
+    add_definitions(-DRIPPLE_SINGLE_IO_SERVICE_THREAD=1)
+  endif()
+
+  # use_rocksdb
+  #    Controls whether or not the RocksDB database back-end is compiled into
+  #    rippled. RocksDB requires a relatively modern C++ compiler (tested with
+  #    gcc versions 4.8.1 and later) that supports some C++11 features. The
+  #    default is ON for modern unix compilers and OFF for everything else.
+  if (use_rocksdb)
+    add_definitions(-DRIPPLE_ROCKSDB_AVAILABLE=1)
+  elseif(DEFINED use_rocksdb)
+    add_definitions(-DRIPPLE_ROCKSDB_AVAILABLE=0)
+  endif()
+
 endmacro()
 
 ############################################################
diff --git a/src/BeastConfig.h b/src/BeastConfig.h
deleted file mode 100644
index bdb8da130..000000000
--- a/src/BeastConfig.h
+++ /dev/null
@@ -1,165 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2012, 2013 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_BEASTCONFIG_H_INCLUDED
-#define BEAST_BEASTCONFIG_H_INCLUDED
-
-/** Configuration file for Beast
-    This sets various configurable options for Beast. In order to compile you
-    must place a copy of this file in a location where your build environment
-    can find it, and then customize its contents to suit your needs.
-    @file BeastConfig.h
-*/
-
-//------------------------------------------------------------------------------
-//
-// Unit Tests
-//
-//------------------------------------------------------------------------------
-
-/** Config: BEAST_NO_UNIT_TEST_INLINE
-    Prevents unit test definitions from being inserted into a global table.
-    The default is to include inline unit test definitions.
-*/
-
-#ifndef BEAST_NO_UNIT_TEST_INLINE
-//#define BEAST_NO_UNIT_TEST_INLINE 1
-#endif
-
-//------------------------------------------------------------------------------
-//
-// Diagnostics
-//
-//------------------------------------------------------------------------------
-
-/** Config: BEAST_FORCE_DEBUG
-    Normally, BEAST_DEBUG is set to 1 or 0 based on compiler and project
-    settings, but if you define this value, you can override this to force it
-    to be true or false.
-*/
-#ifndef   BEAST_FORCE_DEBUG
-//#define BEAST_FORCE_DEBUG 1
-#endif
-
-/** Config: BEAST_CHECK_MEMORY_LEAKS
-    Enables a memory-leak check for certain objects when the app terminates.
-*/
-#ifndef   BEAST_CHECK_MEMORY_LEAKS
-//#define BEAST_CHECK_MEMORY_LEAKS 0
-#endif
-
-//------------------------------------------------------------------------------
-//
-// Libraries
-//
-//------------------------------------------------------------------------------
-
-/** Config: BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
-    In a Visual C++  build, this can be used to stop the required system libs
-    being automatically added to the link stage.
-*/
-#ifndef   BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
-//#define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1
-#endif
-
-/** Config: BEAST_INCLUDE_ZLIB_CODE
-    This can be used to disable Beast's embedded 3rd-party zlib code.
-    You might need to tweak this if you're linking to an external zlib library
-    in your app, but for normal apps, this option should be left alone.
-
-    If you disable this, you might also want to set a value for
-    BEAST_ZLIB_INCLUDE_PATH, to specify the path where your zlib headers live.
-*/
-#ifndef   BEAST_INCLUDE_ZLIB_CODE
-//#define BEAST_INCLUDE_ZLIB_CODE 1
-#endif
-
-/** Config: BEAST_ZLIB_INCLUDE_PATH
-    This is included when BEAST_INCLUDE_ZLIB_CODE is set to zero.
-*/
-#ifndef BEAST_ZLIB_INCLUDE_PATH
-#define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
-#endif
-
-/** Config: BEAST_SQLITE_FORCE_NDEBUG
-    Setting this option forces sqlite into release mode even if NDEBUG is not set
-*/
-#ifndef BEAST_SQLITE_FORCE_NDEBUG
-#define BEAST_SQLITE_FORCE_NDEBUG 1
-#endif
-
-//------------------------------------------------------------------------------
-//
-// Ripple
-//
-//------------------------------------------------------------------------------
-
-/** Config: RIPPLE_VERIFY_NODEOBJECT_KEYS
-    This verifies that the hash of node objects matches the payload.
-    It is quite expensive so normally this is turned off!
-*/
-#ifndef   RIPPLE_VERIFY_NODEOBJECT_KEYS
-//#define RIPPLE_VERIFY_NODEOBJECT_KEYS 1
-#endif
-
-/** Config: RIPPLE_DUMP_LEAKS_ON_EXIT
-    Displays heap blocks and counted objects which were not disposed of
-    during exit.
-*/
-#ifndef RIPPLE_DUMP_LEAKS_ON_EXIT
-#define RIPPLE_DUMP_LEAKS_ON_EXIT 1
-#endif
-
-//------------------------------------------------------------------------------
-
-// These control whether or not certain functionality gets
-// compiled into the resulting rippled executable
-
-/** Config: RIPPLE_ROCKSDB_AVAILABLE
-    Controls whether or not the RocksDB database back-end is compiled into
-    rippled. RocksDB requires a relatively modern C++ compiler (tested with
-    gcc versions 4.8.1 and later) that supports some C++11 features.
-*/
-#ifndef   RIPPLE_ROCKSDB_AVAILABLE
-//#define RIPPLE_ROCKSDB_AVAILABLE 0
-#endif
-
-//------------------------------------------------------------------------------
-
-// Here temporarily to turn off new Validations code while it
-// is being written.
-//
-#ifndef RIPPLE_USE_VALIDATORS
-#define RIPPLE_USE_VALIDATORS 0
-#endif
-
-/** Config: RIPPLE_SINGLE_IO_SERVICE_THREAD
-    When set, restricts the number of threads calling io_service::run to one.
-    This is useful when debugging.
-*/
-#ifndef RIPPLE_SINGLE_IO_SERVICE_THREAD
-#define RIPPLE_SINGLE_IO_SERVICE_THREAD 0
-#endif
-
-// Uses OpenSSL instead of alternatives
-#ifndef RIPPLE_USE_OPENSSL
-#define RIPPLE_USE_OPENSSL 1
-#endif
-
-#endif
diff --git a/src/beast/extras/beast/unit_test/suite.hpp b/src/beast/extras/beast/unit_test/suite.hpp
index ce0ec909a..d0ded8b6d 100644
--- a/src/beast/extras/beast/unit_test/suite.hpp
+++ b/src/beast/extras/beast/unit_test/suite.hpp
@@ -670,6 +670,7 @@ run(runner& r)
 
 #if BEAST_NO_UNIT_TEST_INLINE
 #define BEAST_DEFINE_TESTSUITE(Class,Module,Library)
+#define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library)
 
 #else
 #include <beast/unit_test/global_suites.hpp>
diff --git a/src/ripple/app/consensus/RCLConsensus.cpp b/src/ripple/app/consensus/RCLConsensus.cpp
index bf25128cc..d4cdedd8c 100644
--- a/src/ripple/app/consensus/RCLConsensus.cpp
+++ b/src/ripple/app/consensus/RCLConsensus.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/consensus/RCLConsensus.h>
 #include <ripple/app/consensus/RCLValidations.h>
 #include <ripple/app/ledger/InboundLedgers.h>
diff --git a/src/ripple/app/consensus/RCLConsensus.h b/src/ripple/app/consensus/RCLConsensus.h
index e4ffef074..9903b69d5 100644
--- a/src/ripple/app/consensus/RCLConsensus.h
+++ b/src/ripple/app/consensus/RCLConsensus.h
@@ -20,7 +20,6 @@
 #ifndef RIPPLE_APP_CONSENSUS_RCLCONSENSUS_H_INCLUDED
 #define RIPPLE_APP_CONSENSUS_RCLCONSENSUS_H_INCLUDED
 
-#include <BeastConfig.h>
 #include <ripple/app/consensus/RCLCxLedger.h>
 #include <ripple/app/consensus/RCLCxPeerPos.h>
 #include <ripple/app/consensus/RCLCxTx.h>
diff --git a/src/ripple/app/consensus/RCLCxPeerPos.cpp b/src/ripple/app/consensus/RCLCxPeerPos.cpp
index 0e7ac763d..94eddf133 100644
--- a/src/ripple/app/consensus/RCLCxPeerPos.cpp
+++ b/src/ripple/app/consensus/RCLCxPeerPos.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/consensus/RCLCxPeerPos.h>
 #include <ripple/core/Config.h>
 #include <ripple/protocol/HashPrefix.h>
diff --git a/src/ripple/app/consensus/RCLValidations.cpp b/src/ripple/app/consensus/RCLValidations.cpp
index d8b97fa5b..a638d8382 100644
--- a/src/ripple/app/consensus/RCLValidations.cpp
+++ b/src/ripple/app/consensus/RCLValidations.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/consensus/RCLValidations.h>
 #include <ripple/app/ledger/InboundLedger.h>
 #include <ripple/app/ledger/InboundLedgers.h>
diff --git a/src/ripple/app/ledger/AcceptedLedger.cpp b/src/ripple/app/ledger/AcceptedLedger.cpp
index 7ceaffb12..ec2cfde19 100644
--- a/src/ripple/app/ledger/AcceptedLedger.cpp
+++ b/src/ripple/app/ledger/AcceptedLedger.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/AcceptedLedger.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/chrono.h>
diff --git a/src/ripple/app/ledger/AcceptedLedgerTx.cpp b/src/ripple/app/ledger/AcceptedLedgerTx.cpp
index 641c8dd81..6987dd8bd 100644
--- a/src/ripple/app/ledger/AcceptedLedgerTx.cpp
+++ b/src/ripple/app/ledger/AcceptedLedgerTx.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/ledger/AcceptedLedgerTx.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/ledger/AccountStateSF.cpp b/src/ripple/app/ledger/AccountStateSF.cpp
index 1d4cef3c6..142c7886f 100644
--- a/src/ripple/app/ledger/AccountStateSF.cpp
+++ b/src/ripple/app/ledger/AccountStateSF.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/AccountStateSF.h>
 
 namespace ripple {
diff --git a/src/ripple/app/ledger/BookListeners.cpp b/src/ripple/app/ledger/BookListeners.cpp
index abc22d8f2..e3ad2e16a 100644
--- a/src/ripple/app/ledger/BookListeners.cpp
+++ b/src/ripple/app/ledger/BookListeners.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/OrderBookDB.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/to_string.h>
diff --git a/src/ripple/app/ledger/ConsensusTransSetSF.cpp b/src/ripple/app/ledger/ConsensusTransSetSF.cpp
index dea15568b..e542848d1 100644
--- a/src/ripple/app/ledger/ConsensusTransSetSF.cpp
+++ b/src/ripple/app/ledger/ConsensusTransSetSF.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/ConsensusTransSetSF.h>
 #include <ripple/app/ledger/TransactionMaster.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp
index 6ced71107..ad6227413 100644
--- a/src/ripple/app/ledger/Ledger.cpp
+++ b/src/ripple/app/ledger/Ledger.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/app/ledger/AcceptedLedger.h>
 #include <ripple/app/ledger/InboundLedgers.h>
diff --git a/src/ripple/app/ledger/LedgerHistory.cpp b/src/ripple/app/ledger/LedgerHistory.cpp
index 28285c9d7..8037dacec 100644
--- a/src/ripple/app/ledger/LedgerHistory.cpp
+++ b/src/ripple/app/ledger/LedgerHistory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerHistory.h>
 #include <ripple/app/ledger/LedgerToJson.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/ledger/OrderBookDB.cpp b/src/ripple/app/ledger/OrderBookDB.cpp
index 183007d9f..77bbd9349 100644
--- a/src/ripple/app/ledger/OrderBookDB.cpp
+++ b/src/ripple/app/ledger/OrderBookDB.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/OrderBookDB.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/ledger/TransactionStateSF.cpp b/src/ripple/app/ledger/TransactionStateSF.cpp
index c30ee9829..527f8d1bb 100644
--- a/src/ripple/app/ledger/TransactionStateSF.cpp
+++ b/src/ripple/app/ledger/TransactionStateSF.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/TransactionStateSF.h>
 
 namespace ripple {
diff --git a/src/ripple/app/ledger/impl/InboundLedger.cpp b/src/ripple/app/ledger/impl/InboundLedger.cpp
index 86b3453d5..d34b2c5cc 100644
--- a/src/ripple/app/ledger/impl/InboundLedger.cpp
+++ b/src/ripple/app/ledger/impl/InboundLedger.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/InboundLedger.h>
 #include <ripple/shamap/SHAMapNodeID.h>
 #include <ripple/app/ledger/AccountStateSF.h>
diff --git a/src/ripple/app/ledger/impl/InboundLedgers.cpp b/src/ripple/app/ledger/impl/InboundLedgers.cpp
index f7d783772..0d94abeb7 100644
--- a/src/ripple/app/ledger/impl/InboundLedgers.cpp
+++ b/src/ripple/app/ledger/impl/InboundLedgers.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/InboundLedgers.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/ledger/impl/InboundTransactions.cpp b/src/ripple/app/ledger/impl/InboundTransactions.cpp
index 835fd8768..2b5538295 100644
--- a/src/ripple/app/ledger/impl/InboundTransactions.cpp
+++ b/src/ripple/app/ledger/impl/InboundTransactions.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/InboundTransactions.h>
 #include <ripple/app/ledger/InboundLedgers.h>
 #include <ripple/app/ledger/impl/TransactionAcquire.h>
diff --git a/src/ripple/app/ledger/impl/LedgerCleaner.cpp b/src/ripple/app/ledger/impl/LedgerCleaner.cpp
index f768df6d9..0c7bc3668 100644
--- a/src/ripple/app/ledger/impl/LedgerCleaner.cpp
+++ b/src/ripple/app/ledger/impl/LedgerCleaner.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerCleaner.h>
 #include <ripple/app/ledger/InboundLedgers.h>
 #include <ripple/app/ledger/LedgerMaster.h>
diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp
index 967bda677..6f95b9ee5 100644
--- a/src/ripple/app/ledger/impl/LedgerMaster.cpp
+++ b/src/ripple/app/ledger/impl/LedgerMaster.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/ledger/OpenLedger.h>
 #include <ripple/app/ledger/OrderBookDB.h>
diff --git a/src/ripple/app/ledger/impl/LocalTxs.cpp b/src/ripple/app/ledger/impl/LocalTxs.cpp
index 81d324414..d9c000e94 100644
--- a/src/ripple/app/ledger/impl/LocalTxs.cpp
+++ b/src/ripple/app/ledger/impl/LocalTxs.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/app/ledger/LocalTxs.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/ledger/impl/OpenLedger.cpp b/src/ripple/app/ledger/impl/OpenLedger.cpp
index 08493f140..829e62356 100644
--- a/src/ripple/app/ledger/impl/OpenLedger.cpp
+++ b/src/ripple/app/ledger/impl/OpenLedger.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/OpenLedger.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/HashRouter.h>
diff --git a/src/ripple/app/ledger/impl/TransactionAcquire.cpp b/src/ripple/app/ledger/impl/TransactionAcquire.cpp
index f846a92a2..e8900464d 100644
--- a/src/ripple/app/ledger/impl/TransactionAcquire.cpp
+++ b/src/ripple/app/ledger/impl/TransactionAcquire.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/impl/TransactionAcquire.h>
 #include <ripple/app/ledger/ConsensusTransSetSF.h>
 #include <ripple/app/ledger/InboundLedgers.h>
diff --git a/src/ripple/app/ledger/impl/TransactionMaster.cpp b/src/ripple/app/ledger/impl/TransactionMaster.cpp
index dc67407a3..402da2e57 100644
--- a/src/ripple/app/ledger/impl/TransactionMaster.cpp
+++ b/src/ripple/app/ledger/impl/TransactionMaster.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/TransactionMaster.h>
 #include <ripple/app/misc/Transaction.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index 6fba59095..5eeadeca1 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/core/DatabaseCon.h>
 #include <ripple/app/consensus/RCLValidations.h>
diff --git a/src/ripple/app/main/BasicApp.cpp b/src/ripple/app/main/BasicApp.cpp
index 6380bb979..cf54d3beb 100644
--- a/src/ripple/app/main/BasicApp.cpp
+++ b/src/ripple/app/main/BasicApp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/BasicApp.h>
 #include <ripple/beast/core/CurrentThreadName.h>
 
diff --git a/src/ripple/app/main/CollectorManager.cpp b/src/ripple/app/main/CollectorManager.cpp
index 97d4050b0..57da9809c 100644
--- a/src/ripple/app/main/CollectorManager.cpp
+++ b/src/ripple/app/main/CollectorManager.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/CollectorManager.h>
 #include <memory>
 
diff --git a/src/ripple/app/main/DBInit.cpp b/src/ripple/app/main/DBInit.cpp
index eb8170c20..60af0a6cb 100644
--- a/src/ripple/app/main/DBInit.cpp
+++ b/src/ripple/app/main/DBInit.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/DBInit.h>
 #include <type_traits>
 
diff --git a/src/ripple/app/main/LoadManager.cpp b/src/ripple/app/main/LoadManager.cpp
index 4837f0bb6..02c2f44ec 100644
--- a/src/ripple/app/main/LoadManager.cpp
+++ b/src/ripple/app/main/LoadManager.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/LoadManager.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
index d41326942..a994d3e63 100644
--- a/src/ripple/app/main/Main.cpp
+++ b/src/ripple/app/main/Main.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/digest.h>
diff --git a/src/ripple/app/main/NodeIdentity.cpp b/src/ripple/app/main/NodeIdentity.cpp
index eaae30400..7a44f5ce4 100644
--- a/src/ripple/app/main/NodeIdentity.cpp
+++ b/src/ripple/app/main/NodeIdentity.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/DatabaseCon.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/main/NodeIdentity.h>
diff --git a/src/ripple/app/main/NodeStoreScheduler.cpp b/src/ripple/app/main/NodeStoreScheduler.cpp
index dfe0121df..540da6e2f 100644
--- a/src/ripple/app/main/NodeStoreScheduler.cpp
+++ b/src/ripple/app/main/NodeStoreScheduler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/NodeStoreScheduler.h>
 #include <cassert>
 
diff --git a/src/ripple/app/misc/CanonicalTXSet.cpp b/src/ripple/app/misc/CanonicalTXSet.cpp
index fde8f71dd..1582f85d7 100644
--- a/src/ripple/app/misc/CanonicalTXSet.cpp
+++ b/src/ripple/app/misc/CanonicalTXSet.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/CanonicalTXSet.h>
 #include <boost/range/adaptor/transformed.hpp>
 
diff --git a/src/ripple/app/misc/FeeVoteImpl.cpp b/src/ripple/app/misc/FeeVoteImpl.cpp
index 9a24aca59..51446a3b8 100644
--- a/src/ripple/app/misc/FeeVoteImpl.cpp
+++ b/src/ripple/app/misc/FeeVoteImpl.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/st.h>
 #include <ripple/app/misc/FeeVote.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/misc/HashRouter.cpp b/src/ripple/app/misc/HashRouter.cpp
index 49ed0e4ae..56beed1e3 100644
--- a/src/ripple/app/misc/HashRouter.cpp
+++ b/src/ripple/app/misc/HashRouter.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/HashRouter.h>
 
 namespace ripple {
diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
index f659d0048..3bfcf05b7 100644
--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/consensus/Consensus.h>
 #include <ripple/app/consensus/RCLConsensus.h>
diff --git a/src/ripple/app/misc/SHAMapStoreImp.cpp b/src/ripple/app/misc/SHAMapStoreImp.cpp
index e590f7c02..4dfae0254 100644
--- a/src/ripple/app/misc/SHAMapStoreImp.cpp
+++ b/src/ripple/app/misc/SHAMapStoreImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/ledger/TransactionMaster.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/ripple/app/misc/impl/AccountTxPaging.cpp b/src/ripple/app/misc/impl/AccountTxPaging.cpp
index 7d4d5f1c0..342118109 100644
--- a/src/ripple/app/misc/impl/AccountTxPaging.cpp
+++ b/src/ripple/app/misc/impl/AccountTxPaging.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerToJson.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/misc/impl/AmendmentTable.cpp b/src/ripple/app/misc/impl/AmendmentTable.cpp
index c460d69c9..6288fbc9d 100644
--- a/src/ripple/app/misc/impl/AmendmentTable.cpp
+++ b/src/ripple/app/misc/impl/AmendmentTable.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/AmendmentTable.h>
 #include <ripple/protocol/STValidation.h>
diff --git a/src/ripple/app/misc/impl/LoadFeeTrack.cpp b/src/ripple/app/misc/impl/LoadFeeTrack.cpp
index 69c0a4bce..25242909b 100644
--- a/src/ripple/app/misc/impl/LoadFeeTrack.cpp
+++ b/src/ripple/app/misc/impl/LoadFeeTrack.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/misc/impl/Transaction.cpp b/src/ripple/app/misc/impl/Transaction.cpp
index db3c2bbee..4b04a2f59 100644
--- a/src/ripple/app/misc/impl/Transaction.cpp
+++ b/src/ripple/app/misc/impl/Transaction.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/Transaction.h>
 #include <ripple/app/tx/apply.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/misc/impl/ValidatorKeys.cpp b/src/ripple/app/misc/impl/ValidatorKeys.cpp
index 46c34dd24..2f96777c4 100644
--- a/src/ripple/app/misc/impl/ValidatorKeys.cpp
+++ b/src/ripple/app/misc/impl/ValidatorKeys.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/ValidatorKeys.h>
 
 #include <ripple/app/misc/Manifest.h>
diff --git a/src/ripple/app/paths/AccountCurrencies.cpp b/src/ripple/app/paths/AccountCurrencies.cpp
index 9aa2d77d5..a537d5810 100644
--- a/src/ripple/app/paths/AccountCurrencies.cpp
+++ b/src/ripple/app/paths/AccountCurrencies.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/AccountCurrencies.h>
 
 namespace ripple {
diff --git a/src/ripple/app/paths/Credit.cpp b/src/ripple/app/paths/Credit.cpp
index fe7352f55..7ac5c81eb 100644
--- a/src/ripple/app/paths/Credit.cpp
+++ b/src/ripple/app/paths/Credit.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/ReadView.h>
 #include <ripple/protocol/AmountConversions.h>
 #include <ripple/protocol/STAmount.h>
diff --git a/src/ripple/app/paths/Flow.cpp b/src/ripple/app/paths/Flow.cpp
index 06004d8d3..93739e98f 100644
--- a/src/ripple/app/paths/Flow.cpp
+++ b/src/ripple/app/paths/Flow.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Credit.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/impl/AmountSpec.h>
diff --git a/src/ripple/app/paths/Node.cpp b/src/ripple/app/paths/Node.cpp
index 5919d41af..108fc0728 100644
--- a/src/ripple/app/paths/Node.cpp
+++ b/src/ripple/app/paths/Node.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Node.h>
 #include <ripple/app/paths/PathState.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/app/paths/PathRequest.cpp b/src/ripple/app/paths/PathRequest.cpp
index 204378d40..f81d9b0c7 100644
--- a/src/ripple/app/paths/PathRequest.cpp
+++ b/src/ripple/app/paths/PathRequest.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/AccountCurrencies.h>
 #include <ripple/app/paths/RippleCalc.h>
 #include <ripple/app/paths/PathRequest.h>
diff --git a/src/ripple/app/paths/PathRequests.cpp b/src/ripple/app/paths/PathRequests.cpp
index 0c71c48b4..d1d3e1c8e 100644
--- a/src/ripple/app/paths/PathRequests.cpp
+++ b/src/ripple/app/paths/PathRequests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/PathRequests.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/app/paths/PathState.cpp b/src/ripple/app/paths/PathState.cpp
index f42f1f5c2..1a5fbc5b5 100644
--- a/src/ripple/app/paths/PathState.cpp
+++ b/src/ripple/app/paths/PathState.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Credit.h>
 #include <ripple/app/paths/PathState.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/paths/Pathfinder.cpp b/src/ripple/app/paths/Pathfinder.cpp
index 5df7f41a6..9bd81aace 100644
--- a/src/ripple/app/paths/Pathfinder.cpp
+++ b/src/ripple/app/paths/Pathfinder.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/paths/Tuning.h>
 #include <ripple/app/paths/Pathfinder.h>
diff --git a/src/ripple/app/paths/RippleCalc.cpp b/src/ripple/app/paths/RippleCalc.cpp
index 45e6a2ea1..4e81e7df1 100644
--- a/src/ripple/app/paths/RippleCalc.cpp
+++ b/src/ripple/app/paths/RippleCalc.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/RippleCalc.h>
 #include <ripple/app/paths/Tuning.h>
diff --git a/src/ripple/app/paths/RippleLineCache.cpp b/src/ripple/app/paths/RippleLineCache.cpp
index 95e413d87..e9338a4d1 100644
--- a/src/ripple/app/paths/RippleLineCache.cpp
+++ b/src/ripple/app/paths/RippleLineCache.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/RippleLineCache.h>
 #include <ripple/ledger/OpenView.h>
 
diff --git a/src/ripple/app/paths/RippleState.cpp b/src/ripple/app/paths/RippleState.cpp
index 562569fc2..416c6ea98 100644
--- a/src/ripple/app/paths/RippleState.cpp
+++ b/src/ripple/app/paths/RippleState.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/paths/RippleState.h>
 #include <ripple/protocol/STAmount.h>
diff --git a/src/ripple/app/paths/cursor/AdvanceNode.cpp b/src/ripple/app/paths/cursor/AdvanceNode.cpp
index 2805b8781..6eeb3a3c7 100644
--- a/src/ripple/app/paths/cursor/AdvanceNode.cpp
+++ b/src/ripple/app/paths/cursor/AdvanceNode.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/Log.h>
 #include <ripple/ledger/View.h>
diff --git a/src/ripple/app/paths/cursor/DeliverNodeForward.cpp b/src/ripple/app/paths/cursor/DeliverNodeForward.cpp
index 9a6961010..3fe36fa08 100644
--- a/src/ripple/app/paths/cursor/DeliverNodeForward.cpp
+++ b/src/ripple/app/paths/cursor/DeliverNodeForward.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/EffectiveRate.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/paths/cursor/DeliverNodeReverse.cpp b/src/ripple/app/paths/cursor/DeliverNodeReverse.cpp
index e18d2bfad..5488af5d9 100644
--- a/src/ripple/app/paths/cursor/DeliverNodeReverse.cpp
+++ b/src/ripple/app/paths/cursor/DeliverNodeReverse.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/EffectiveRate.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/paths/cursor/EffectiveRate.cpp b/src/ripple/app/paths/cursor/EffectiveRate.cpp
index 9f527c169..c7b068b16 100644
--- a/src/ripple/app/paths/cursor/EffectiveRate.cpp
+++ b/src/ripple/app/paths/cursor/EffectiveRate.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/EffectiveRate.h>
 #include <ripple/basics/contract.h>
 
diff --git a/src/ripple/app/paths/cursor/ForwardLiquidity.cpp b/src/ripple/app/paths/cursor/ForwardLiquidity.cpp
index be366de3e..73f05ca0c 100644
--- a/src/ripple/app/paths/cursor/ForwardLiquidity.cpp
+++ b/src/ripple/app/paths/cursor/ForwardLiquidity.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/PathCursor.h>
 #include <ripple/basics/Log.h>
 #include <tuple>
diff --git a/src/ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp b/src/ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp
index 3225f1c8f..d2a03a7ee 100644
--- a/src/ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp
+++ b/src/ripple/app/paths/cursor/ForwardLiquidityForAccount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/Quality.h>
diff --git a/src/ripple/app/paths/cursor/Liquidity.cpp b/src/ripple/app/paths/cursor/Liquidity.cpp
index ee8176a39..3625cb0ad 100644
--- a/src/ripple/app/paths/cursor/Liquidity.cpp
+++ b/src/ripple/app/paths/cursor/Liquidity.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/Log.h>
 #include <tuple>
diff --git a/src/ripple/app/paths/cursor/NextIncrement.cpp b/src/ripple/app/paths/cursor/NextIncrement.cpp
index 6b548cf68..bd3676c93 100644
--- a/src/ripple/app/paths/cursor/NextIncrement.cpp
+++ b/src/ripple/app/paths/cursor/NextIncrement.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/paths/cursor/ReverseLiquidity.cpp b/src/ripple/app/paths/cursor/ReverseLiquidity.cpp
index f34f1c1cb..3c912fc9e 100644
--- a/src/ripple/app/paths/cursor/ReverseLiquidity.cpp
+++ b/src/ripple/app/paths/cursor/ReverseLiquidity.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/cursor/PathCursor.h>
 #include <ripple/basics/Log.h>
 #include <ripple/ledger/View.h>
diff --git a/src/ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp b/src/ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp
index 1af3cdb31..86be96a72 100644
--- a/src/ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp
+++ b/src/ripple/app/paths/cursor/ReverseLiquidityForAccount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Credit.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/paths/cursor/RippleLiquidity.cpp b/src/ripple/app/paths/cursor/RippleLiquidity.cpp
index 1e71e68d6..c774346d4 100644
--- a/src/ripple/app/paths/cursor/RippleLiquidity.cpp
+++ b/src/ripple/app/paths/cursor/RippleLiquidity.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Quality.h>
 #include <ripple/app/paths/cursor/RippleLiquidity.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/paths/impl/BookStep.cpp b/src/ripple/app/paths/impl/BookStep.cpp
index 9cf320647..b6cae83c9 100644
--- a/src/ripple/app/paths/impl/BookStep.cpp
+++ b/src/ripple/app/paths/impl/BookStep.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/app/paths/Credit.h>
 #include <ripple/app/paths/NodeDirectory.h>
diff --git a/src/ripple/app/paths/impl/DirectStep.cpp b/src/ripple/app/paths/impl/DirectStep.cpp
index a75fc5d42..8e0389c6f 100644
--- a/src/ripple/app/paths/impl/DirectStep.cpp
+++ b/src/ripple/app/paths/impl/DirectStep.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Credit.h>
 #include <ripple/app/paths/impl/StepChecks.h>
 #include <ripple/app/paths/impl/Steps.h>
diff --git a/src/ripple/app/paths/impl/PaySteps.cpp b/src/ripple/app/paths/impl/PaySteps.cpp
index 5ecce2cb1..23e398676 100644
--- a/src/ripple/app/paths/impl/PaySteps.cpp
+++ b/src/ripple/app/paths/impl/PaySteps.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/basics/contract.h>
 #include <ripple/json/json_writer.h>
diff --git a/src/ripple/app/paths/impl/StrandFlow.h b/src/ripple/app/paths/impl/StrandFlow.h
index 4abc661ed..f9ad099cc 100644
--- a/src/ripple/app/paths/impl/StrandFlow.h
+++ b/src/ripple/app/paths/impl/StrandFlow.h
@@ -20,7 +20,6 @@
 #ifndef RIPPLE_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED
 #define RIPPLE_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Credit.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/impl/AmountSpec.h>
diff --git a/src/ripple/app/paths/impl/XRPEndpointStep.cpp b/src/ripple/app/paths/impl/XRPEndpointStep.cpp
index 44a391b14..e5629d5fd 100644
--- a/src/ripple/app/paths/impl/XRPEndpointStep.cpp
+++ b/src/ripple/app/paths/impl/XRPEndpointStep.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Credit.h>
 #include <ripple/app/paths/impl/AmountSpec.h>
 #include <ripple/app/paths/impl/Steps.h>
diff --git a/src/ripple/app/tx/impl/ApplyContext.cpp b/src/ripple/app/tx/impl/ApplyContext.cpp
index 34ff48ebe..c13a9c799 100644
--- a/src/ripple/app/tx/impl/ApplyContext.cpp
+++ b/src/ripple/app/tx/impl/ApplyContext.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/ApplyContext.h>
 #include <ripple/app/tx/impl/InvariantCheck.h>
 #include <ripple/app/tx/impl/Transactor.h>
diff --git a/src/ripple/app/tx/impl/BookTip.cpp b/src/ripple/app/tx/impl/BookTip.cpp
index 9148ab4d4..5ca858ba6 100644
--- a/src/ripple/app/tx/impl/BookTip.cpp
+++ b/src/ripple/app/tx/impl/BookTip.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/BookTip.h>
 #include <ripple/basics/Log.h>
 
diff --git a/src/ripple/app/tx/impl/CancelCheck.cpp b/src/ripple/app/tx/impl/CancelCheck.cpp
index 9c0796056..bf7068043 100644
--- a/src/ripple/app/tx/impl/CancelCheck.cpp
+++ b/src/ripple/app/tx/impl/CancelCheck.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/CancelCheck.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/tx/impl/CancelOffer.cpp b/src/ripple/app/tx/impl/CancelOffer.cpp
index dfb53744c..c7c48c118 100644
--- a/src/ripple/app/tx/impl/CancelOffer.cpp
+++ b/src/ripple/app/tx/impl/CancelOffer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/CancelOffer.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/st.h>
diff --git a/src/ripple/app/tx/impl/CancelTicket.cpp b/src/ripple/app/tx/impl/CancelTicket.cpp
index 7e301ee9c..7e93903a9 100644
--- a/src/ripple/app/tx/impl/CancelTicket.cpp
+++ b/src/ripple/app/tx/impl/CancelTicket.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/CancelTicket.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/ripple/app/tx/impl/CashCheck.cpp b/src/ripple/app/tx/impl/CashCheck.cpp
index 56bde04a8..06af3efc3 100644
--- a/src/ripple/app/tx/impl/CashCheck.cpp
+++ b/src/ripple/app/tx/impl/CashCheck.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/CashCheck.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/app/paths/Flow.h>
diff --git a/src/ripple/app/tx/impl/Change.cpp b/src/ripple/app/tx/impl/Change.cpp
index 25a7492c4..707cfa8b8 100644
--- a/src/ripple/app/tx/impl/Change.cpp
+++ b/src/ripple/app/tx/impl/Change.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/Change.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/AmendmentTable.h>
diff --git a/src/ripple/app/tx/impl/CreateCheck.cpp b/src/ripple/app/tx/impl/CreateCheck.cpp
index 646c312e0..03d0b9179 100644
--- a/src/ripple/app/tx/impl/CreateCheck.cpp
+++ b/src/ripple/app/tx/impl/CreateCheck.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/CreateCheck.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/tx/impl/CreateOffer.cpp b/src/ripple/app/tx/impl/CreateOffer.cpp
index d0b49fd1f..46dbe8c41 100644
--- a/src/ripple/app/tx/impl/CreateOffer.cpp
+++ b/src/ripple/app/tx/impl/CreateOffer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/CreateOffer.h>
 #include <ripple/app/ledger/OrderBookDB.h>
 #include <ripple/app/paths/Flow.h>
diff --git a/src/ripple/app/tx/impl/CreateTicket.cpp b/src/ripple/app/tx/impl/CreateTicket.cpp
index 8a1325501..a5dfd1f09 100644
--- a/src/ripple/app/tx/impl/CreateTicket.cpp
+++ b/src/ripple/app/tx/impl/CreateTicket.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/CreateTicket.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/tx/impl/Escrow.cpp b/src/ripple/app/tx/impl/Escrow.cpp
index 6432bd756..3a3d1b772 100644
--- a/src/ripple/app/tx/impl/Escrow.cpp
+++ b/src/ripple/app/tx/impl/Escrow.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/Escrow.h>
 #include <ripple/app/misc/HashRouter.h>
 #include <ripple/basics/chrono.h>
diff --git a/src/ripple/app/tx/impl/OfferStream.cpp b/src/ripple/app/tx/impl/OfferStream.cpp
index 5b92704ce..d1fa55613 100644
--- a/src/ripple/app/tx/impl/OfferStream.cpp
+++ b/src/ripple/app/tx/impl/OfferStream.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/OfferStream.h>
 #include <ripple/basics/Log.h>
 
diff --git a/src/ripple/app/tx/impl/PayChan.cpp b/src/ripple/app/tx/impl/PayChan.cpp
index 24a949b78..bc002cbf1 100644
--- a/src/ripple/app/tx/impl/PayChan.cpp
+++ b/src/ripple/app/tx/impl/PayChan.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/PayChan.h>
 
 #include <ripple/basics/chrono.h>
diff --git a/src/ripple/app/tx/impl/Payment.cpp b/src/ripple/app/tx/impl/Payment.cpp
index 10a085ae9..01308b946 100644
--- a/src/ripple/app/tx/impl/Payment.cpp
+++ b/src/ripple/app/tx/impl/Payment.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/Payment.h>
 #include <ripple/app/paths/RippleCalc.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/tx/impl/SetAccount.cpp b/src/ripple/app/tx/impl/SetAccount.cpp
index 200bb3eae..e5a30177c 100644
--- a/src/ripple/app/tx/impl/SetAccount.cpp
+++ b/src/ripple/app/tx/impl/SetAccount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/SetAccount.h>
 #include <ripple/basics/Log.h>
 #include <ripple/core/Config.h>
diff --git a/src/ripple/app/tx/impl/SetRegularKey.cpp b/src/ripple/app/tx/impl/SetRegularKey.cpp
index 9dcad0612..83d7cc6da 100644
--- a/src/ripple/app/tx/impl/SetRegularKey.cpp
+++ b/src/ripple/app/tx/impl/SetRegularKey.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/SetRegularKey.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/TxFlags.h>
diff --git a/src/ripple/app/tx/impl/SetSignerList.cpp b/src/ripple/app/tx/impl/SetSignerList.cpp
index 4a03ec36e..758515ced 100644
--- a/src/ripple/app/tx/impl/SetSignerList.cpp
+++ b/src/ripple/app/tx/impl/SetSignerList.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/SetSignerList.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/ripple/app/tx/impl/SetTrust.cpp b/src/ripple/app/tx/impl/SetTrust.cpp
index 43df55ad1..5e801a311 100644
--- a/src/ripple/app/tx/impl/SetTrust.cpp
+++ b/src/ripple/app/tx/impl/SetTrust.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/SetTrust.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/ripple/app/tx/impl/SignerEntries.cpp b/src/ripple/app/tx/impl/SignerEntries.cpp
index 5dba86b71..f1e0a3ed5 100644
--- a/src/ripple/app/tx/impl/SignerEntries.cpp
+++ b/src/ripple/app/tx/impl/SignerEntries.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/SignerEntries.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/STObject.h>
diff --git a/src/ripple/app/tx/impl/Taker.cpp b/src/ripple/app/tx/impl/Taker.cpp
index daee7f6b0..322e82828 100644
--- a/src/ripple/app/tx/impl/Taker.cpp
+++ b/src/ripple/app/tx/impl/Taker.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/Taker.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/app/tx/impl/Transactor.cpp b/src/ripple/app/tx/impl/Transactor.cpp
index f758b8538..c56c80019 100644
--- a/src/ripple/app/tx/impl/Transactor.cpp
+++ b/src/ripple/app/tx/impl/Transactor.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/app/tx/apply.h>
diff --git a/src/ripple/app/tx/impl/apply.cpp b/src/ripple/app/tx/impl/apply.cpp
index 0c7398751..747ad2c0f 100644
--- a/src/ripple/app/tx/impl/apply.cpp
+++ b/src/ripple/app/tx/impl/apply.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/app/tx/apply.h>
 #include <ripple/app/tx/applySteps.h>
diff --git a/src/ripple/app/tx/impl/applySteps.cpp b/src/ripple/app/tx/impl/applySteps.cpp
index c457387ab..b64b5959d 100644
--- a/src/ripple/app/tx/impl/applySteps.cpp
+++ b/src/ripple/app/tx/impl/applySteps.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/applySteps.h>
 #include <ripple/app/tx/impl/ApplyContext.h>
 #include <ripple/app/tx/impl/CancelCheck.h>
diff --git a/src/ripple/basics/impl/BasicConfig.cpp b/src/ripple/basics/impl/BasicConfig.cpp
index f0a58d7fe..a3020fe6e 100644
--- a/src/ripple/basics/impl/BasicConfig.cpp
+++ b/src/ripple/basics/impl/BasicConfig.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/BasicConfig.h>
 #include <boost/regex.hpp>
 #include <algorithm>
diff --git a/src/ripple/basics/impl/CheckLibraryVersions.cpp b/src/ripple/basics/impl/CheckLibraryVersions.cpp
index af15a6348..8acf2ccf9 100644
--- a/src/ripple/basics/impl/CheckLibraryVersions.cpp
+++ b/src/ripple/basics/impl/CheckLibraryVersions.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/impl/CheckLibraryVersionsImpl.h>
 #include <ripple/beast/core/SemanticVersion.h>
diff --git a/src/ripple/basics/impl/CountedObject.cpp b/src/ripple/basics/impl/CountedObject.cpp
index 5d2c1d3cc..faf13942a 100644
--- a/src/ripple/basics/impl/CountedObject.cpp
+++ b/src/ripple/basics/impl/CountedObject.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/CountedObject.h>
 
 namespace ripple {
diff --git a/src/ripple/basics/impl/Log.cpp b/src/ripple/basics/impl/Log.cpp
index 854eef0df..8131afa4a 100644
--- a/src/ripple/basics/impl/Log.cpp
+++ b/src/ripple/basics/impl/Log.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/contract.h>
diff --git a/src/ripple/basics/impl/ResolverAsio.cpp b/src/ripple/basics/impl/ResolverAsio.cpp
index 674594570..c4023492d 100644
--- a/src/ripple/basics/impl/ResolverAsio.cpp
+++ b/src/ripple/basics/impl/ResolverAsio.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/ResolverAsio.h>
 #include <ripple/basics/Log.h>
 #include <ripple/beast/net/IPAddressConversion.h>
diff --git a/src/ripple/basics/impl/StringUtilities.cpp b/src/ripple/basics/impl/StringUtilities.cpp
index db045f23f..6d8358663 100644
--- a/src/ripple/basics/impl/StringUtilities.cpp
+++ b/src/ripple/basics/impl/StringUtilities.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Slice.h>
 #include <ripple/basics/StringUtilities.h>
diff --git a/src/ripple/basics/impl/Sustain.cpp b/src/ripple/basics/impl/Sustain.cpp
index a2bf917f8..2ca30c6d0 100644
--- a/src/ripple/basics/impl/Sustain.cpp
+++ b/src/ripple/basics/impl/Sustain.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Sustain.h>
 #include <ripple/beast/core/CurrentThreadName.h>
 #include <boost/format.hpp>
diff --git a/src/ripple/basics/impl/Time.cpp b/src/ripple/basics/impl/Time.cpp
index 93f3c3eab..0367112f7 100644
--- a/src/ripple/basics/impl/Time.cpp
+++ b/src/ripple/basics/impl/Time.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/beast/clock/chrono_util.h>
 #include <ripple/basics/chrono.h>
 #include <iomanip>
diff --git a/src/ripple/basics/impl/UptimeTimer.cpp b/src/ripple/basics/impl/UptimeTimer.cpp
index cba395700..b7e3517f8 100644
--- a/src/ripple/basics/impl/UptimeTimer.cpp
+++ b/src/ripple/basics/impl/UptimeTimer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/UptimeTimer.h>
 
 #include <atomic>
diff --git a/src/ripple/basics/impl/contract.cpp b/src/ripple/basics/impl/contract.cpp
index 4cb64b8be..6e6f4b9e4 100644
--- a/src/ripple/basics/impl/contract.cpp
+++ b/src/ripple/basics/impl/contract.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
 #include <cstdlib>
diff --git a/src/ripple/basics/impl/make_SSLContext.cpp b/src/ripple/basics/impl/make_SSLContext.cpp
index b1812fa8a..0935010b9 100644
--- a/src/ripple/basics/impl/make_SSLContext.cpp
+++ b/src/ripple/basics/impl/make_SSLContext.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/make_SSLContext.h>
diff --git a/src/ripple/basics/impl/mulDiv.cpp b/src/ripple/basics/impl/mulDiv.cpp
index 0ba6495fd..69fc24834 100644
--- a/src/ripple/basics/impl/mulDiv.cpp
+++ b/src/ripple/basics/impl/mulDiv.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/mulDiv.h>
 #include <ripple/basics/contract.h>
 #include <boost/multiprecision/cpp_int.hpp>
diff --git a/src/ripple/basics/impl/strHex.cpp b/src/ripple/basics/impl/strHex.cpp
index 6a8342338..293ce5b96 100644
--- a/src/ripple/basics/impl/strHex.cpp
+++ b/src/ripple/basics/impl/strHex.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Slice.h>
 #include <ripple/basics/strHex.h>
 #include <algorithm>
diff --git a/src/ripple/beast/core/ConfigCheck.h b/src/ripple/beast/core/ConfigCheck.h
index 3469ffbd0..0c44837ef 100644
--- a/src/ripple/beast/core/ConfigCheck.h
+++ b/src/ripple/beast/core/ConfigCheck.h
@@ -50,20 +50,4 @@
 #define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0
 #endif
 
-#ifndef BEAST_INCLUDE_ZLIB_CODE
-#define BEAST_INCLUDE_ZLIB_CODE 1
-#endif
-
-#ifndef BEAST_ZLIB_INCLUDE_PATH
-#define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
-#endif
-
-#ifndef BEAST_SQLITE_FORCE_NDEBUG
-#define BEAST_SQLITE_FORCE_NDEBUG 0
-#endif
-
-#ifndef BEAST_STRING_UTF_TYPE
-#define BEAST_STRING_UTF_TYPE 8
-#endif
-
 #endif
diff --git a/src/ripple/beast/core/core.unity.cpp b/src/ripple/beast/core/core.unity.cpp
index ada011270..555031c59 100644
--- a/src/ripple/beast/core/core.unity.cpp
+++ b/src/ripple/beast/core/core.unity.cpp
@@ -22,14 +22,12 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include <BeastConfig.h>
 #endif
 
 //==============================================================================
 
 #include <ripple/beast/core/BasicNativeHeaders.h>
 
-// TargetPlatform.h should not use anything from BeastConfig.h
 #include <ripple/beast/core/Config.h>
 
 #if BEAST_MSVC
diff --git a/src/ripple/beast/net/impl/IPAddressV4.cpp b/src/ripple/beast/net/impl/IPAddressV4.cpp
index 05b3b8e05..ed75b0baf 100644
--- a/src/ripple/beast/net/impl/IPAddressV4.cpp
+++ b/src/ripple/beast/net/impl/IPAddressV4.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
 #endif
 
 #include <ripple/beast/net/IPAddressV4.h>
diff --git a/src/ripple/beast/net/impl/IPAddressV6.cpp b/src/ripple/beast/net/impl/IPAddressV6.cpp
index d6108f610..1a286488e 100644
--- a/src/ripple/beast/net/impl/IPAddressV6.cpp
+++ b/src/ripple/beast/net/impl/IPAddressV6.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
 #endif
 
 #include <ripple/beast/net/IPAddressV6.h>
diff --git a/src/ripple/beast/net/impl/IPEndpoint.cpp b/src/ripple/beast/net/impl/IPEndpoint.cpp
index 506decb65..9f3cec9f8 100644
--- a/src/ripple/beast/net/impl/IPEndpoint.cpp
+++ b/src/ripple/beast/net/impl/IPEndpoint.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
 #endif
 
 #include <ripple/beast/net/IPEndpoint.h>
diff --git a/src/ripple/beast/unity/beast_utility_unity.cpp b/src/ripple/beast/unity/beast_utility_unity.cpp
index 38137e5dd..4e47a5099 100644
--- a/src/ripple/beast/unity/beast_utility_unity.cpp
+++ b/src/ripple/beast/unity/beast_utility_unity.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include <BeastConfig.h>
 #endif
 
 #include <ripple/beast/utility/src/beast_Debug.cpp>
diff --git a/src/ripple/consensus/Consensus.cpp b/src/ripple/consensus/Consensus.cpp
index a1e6af96d..1b08859c8 100644
--- a/src/ripple/consensus/Consensus.cpp
+++ b/src/ripple/consensus/Consensus.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/consensus/Consensus.h>
 
diff --git a/src/ripple/core/impl/Config.cpp b/src/ripple/core/impl/Config.cpp
index 6c1dff527..1ea7c2b88 100644
--- a/src/ripple/core/impl/Config.cpp
+++ b/src/ripple/core/impl/Config.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/Config.h>
 #include <ripple/core/ConfigSections.h>
 #include <ripple/basics/contract.h>
diff --git a/src/ripple/core/impl/DatabaseCon.cpp b/src/ripple/core/impl/DatabaseCon.cpp
index 878a23bc1..8e7405da9 100644
--- a/src/ripple/core/impl/DatabaseCon.cpp
+++ b/src/ripple/core/impl/DatabaseCon.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/DatabaseCon.h>
 #include <ripple/core/SociDB.h>
 #include <ripple/basics/contract.h>
diff --git a/src/ripple/core/impl/DummySociDynamicBackend.cpp b/src/ripple/core/impl/DummySociDynamicBackend.cpp
index 59aebf56a..4e87db8cd 100644
--- a/src/ripple/core/impl/DummySociDynamicBackend.cpp
+++ b/src/ripple/core/impl/DummySociDynamicBackend.cpp
@@ -29,7 +29,6 @@
 #pragma clang diagnostic ignored "-Wdeprecated"
 #endif
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/core/SociDB.h>
 #include <soci/sqlite3/soci-sqlite3.h>
diff --git a/src/ripple/core/impl/Job.cpp b/src/ripple/core/impl/Job.cpp
index 717ce2343..69214512c 100644
--- a/src/ripple/core/impl/Job.cpp
+++ b/src/ripple/core/impl/Job.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/Job.h>
 #include <ripple/beast/core/CurrentThreadName.h>
 #include <cassert>
diff --git a/src/ripple/core/impl/JobQueue.cpp b/src/ripple/core/impl/JobQueue.cpp
index 1ff74e342..cebb81a6b 100644
--- a/src/ripple/core/impl/JobQueue.cpp
+++ b/src/ripple/core/impl/JobQueue.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/basics/contract.h>
 
diff --git a/src/ripple/core/impl/LoadEvent.cpp b/src/ripple/core/impl/LoadEvent.cpp
index 543227f4e..f431f1b4e 100644
--- a/src/ripple/core/impl/LoadEvent.cpp
+++ b/src/ripple/core/impl/LoadEvent.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/LoadEvent.h>
 #include <ripple/core/LoadMonitor.h>
 #include <cassert>
diff --git a/src/ripple/core/impl/LoadMonitor.cpp b/src/ripple/core/impl/LoadMonitor.cpp
index bb5c871db..67203b5d0 100644
--- a/src/ripple/core/impl/LoadMonitor.cpp
+++ b/src/ripple/core/impl/LoadMonitor.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/UptimeTimer.h>
 #include <ripple/beast/clock/chrono_util.h>
diff --git a/src/ripple/core/impl/SNTPClock.cpp b/src/ripple/core/impl/SNTPClock.cpp
index 646fc912e..20d5f030d 100644
--- a/src/ripple/core/impl/SNTPClock.cpp
+++ b/src/ripple/core/impl/SNTPClock.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/impl/SNTPClock.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/random.h>
diff --git a/src/ripple/core/impl/SociDB.cpp b/src/ripple/core/impl/SociDB.cpp
index d995bf5aa..386ebf0d0 100644
--- a/src/ripple/core/impl/SociDB.cpp
+++ b/src/ripple/core/impl/SociDB.cpp
@@ -22,7 +22,6 @@
 #pragma clang diagnostic ignored "-Wdeprecated"
 #endif
 
-#include <BeastConfig.h>
 
 #include <ripple/basics/contract.h>
 #include <ripple/core/ConfigSections.h>
diff --git a/src/ripple/core/impl/TerminateHandler.cpp b/src/ripple/core/impl/TerminateHandler.cpp
index 337022c2a..5ea1a4dc1 100644
--- a/src/ripple/core/impl/TerminateHandler.cpp
+++ b/src/ripple/core/impl/TerminateHandler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/TerminateHandler.h>
 #include <ripple/basics/Log.h>
 #include <ripple/beast/core/CurrentThreadName.h>
diff --git a/src/ripple/core/impl/TimeKeeper.cpp b/src/ripple/core/impl/TimeKeeper.cpp
index 675ccbecd..eba3be801 100644
--- a/src/ripple/core/impl/TimeKeeper.cpp
+++ b/src/ripple/core/impl/TimeKeeper.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/core/TimeKeeper.h>
 #include <ripple/core/impl/SNTPClock.h>
diff --git a/src/ripple/crypto/impl/GenerateDeterministicKey.cpp b/src/ripple/crypto/impl/GenerateDeterministicKey.cpp
index 80599debc..1f7d231ef 100644
--- a/src/ripple/crypto/impl/GenerateDeterministicKey.cpp
+++ b/src/ripple/crypto/impl/GenerateDeterministicKey.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/beast/crypto/secure_erase.h>
 #include <ripple/crypto/GenerateDeterministicKey.h>
diff --git a/src/ripple/crypto/impl/KeyType.cpp b/src/ripple/crypto/impl/KeyType.cpp
index 86e90becd..9d0df6d94 100644
--- a/src/ripple/crypto/impl/KeyType.cpp
+++ b/src/ripple/crypto/impl/KeyType.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/crypto/KeyType.h>
 
 namespace ripple {
diff --git a/src/ripple/crypto/impl/RFC1751.cpp b/src/ripple/crypto/impl/RFC1751.cpp
index 3bac8bd32..6cea9d0aa 100644
--- a/src/ripple/crypto/impl/RFC1751.cpp
+++ b/src/ripple/crypto/impl/RFC1751.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/crypto/RFC1751.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/copied.hpp>
diff --git a/src/ripple/crypto/impl/csprng.cpp b/src/ripple/crypto/impl/csprng.cpp
index 648abf4fe..c7bf1d11e 100644
--- a/src/ripple/crypto/impl/csprng.cpp
+++ b/src/ripple/crypto/impl/csprng.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/crypto/csprng.h>
 #include <openssl/rand.h>
diff --git a/src/ripple/crypto/impl/ec_key.cpp b/src/ripple/crypto/impl/ec_key.cpp
index fabac916a..6602a6114 100644
--- a/src/ripple/crypto/impl/ec_key.cpp
+++ b/src/ripple/crypto/impl/ec_key.cpp
@@ -22,7 +22,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/crypto/impl/ec_key.h>
 #include <openssl/ec.h>
diff --git a/src/ripple/json/impl/JsonPropertyStream.cpp b/src/ripple/json/impl/JsonPropertyStream.cpp
index 87546f5a7..1080e2c31 100644
--- a/src/ripple/json/impl/JsonPropertyStream.cpp
+++ b/src/ripple/json/impl/JsonPropertyStream.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_value.h>
 #include <ripple/json/JsonPropertyStream.h>
 
diff --git a/src/ripple/json/impl/Object.cpp b/src/ripple/json/impl/Object.cpp
index 67141172c..2ae699713 100644
--- a/src/ripple/json/impl/Object.cpp
+++ b/src/ripple/json/impl/Object.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/json/Object.h>
 #include <cassert>
diff --git a/src/ripple/json/impl/Output.cpp b/src/ripple/json/impl/Output.cpp
index a80b16bdc..03bf32ed2 100644
--- a/src/ripple/json/impl/Output.cpp
+++ b/src/ripple/json/impl/Output.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/Output.h>
 #include <ripple/json/Writer.h>
 
diff --git a/src/ripple/json/impl/Writer.cpp b/src/ripple/json/impl/Writer.cpp
index 4d232dc6e..2d7f49537 100644
--- a/src/ripple/json/impl/Writer.cpp
+++ b/src/ripple/json/impl/Writer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/Output.h>
 #include <ripple/json/Writer.h>
 #include <stack>
diff --git a/src/ripple/json/impl/json_reader.cpp b/src/ripple/json/impl/json_reader.cpp
index 07052323b..ecf5d9831 100644
--- a/src/ripple/json/impl/json_reader.cpp
+++ b/src/ripple/json/impl/json_reader.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/json/json_reader.h>
 #include <algorithm>
diff --git a/src/ripple/json/impl/json_value.cpp b/src/ripple/json/impl/json_value.cpp
index b2fe80acc..c3a4a865c 100644
--- a/src/ripple/json/impl/json_value.cpp
+++ b/src/ripple/json/impl/json_value.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/json/impl/json_assert.h>
 #include <ripple/json/to_string.h>
diff --git a/src/ripple/json/impl/json_writer.cpp b/src/ripple/json/impl/json_writer.cpp
index f7625f6de..e313abf41 100644
--- a/src/ripple/json/impl/json_writer.cpp
+++ b/src/ripple/json/impl/json_writer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_writer.h>
 #include <cassert>
 #include <iomanip>
diff --git a/src/ripple/json/impl/to_string.cpp b/src/ripple/json/impl/to_string.cpp
index 6182f4b7d..7dccfe4a0 100644
--- a/src/ripple/json/impl/to_string.cpp
+++ b/src/ripple/json/impl/to_string.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_writer.h>
 #include <ripple/json/to_string.h>
 
diff --git a/src/ripple/ledger/impl/ApplyStateTable.cpp b/src/ripple/ledger/impl/ApplyStateTable.cpp
index 9e14aad7a..ec1e21752 100644
--- a/src/ripple/ledger/impl/ApplyStateTable.cpp
+++ b/src/ripple/ledger/impl/ApplyStateTable.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/detail/ApplyStateTable.h>
 #include <ripple/basics/Log.h>
 #include <ripple/json/to_string.h>
diff --git a/src/ripple/ledger/impl/ApplyView.cpp b/src/ripple/ledger/impl/ApplyView.cpp
index d985c3f0d..7243897e8 100644
--- a/src/ripple/ledger/impl/ApplyView.cpp
+++ b/src/ripple/ledger/impl/ApplyView.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/ApplyView.h>
 #include <ripple/basics/contract.h>
 #include <ripple/protocol/Protocol.h>
diff --git a/src/ripple/ledger/impl/ApplyViewBase.cpp b/src/ripple/ledger/impl/ApplyViewBase.cpp
index eb132489b..f5c119eca 100644
--- a/src/ripple/ledger/impl/ApplyViewBase.cpp
+++ b/src/ripple/ledger/impl/ApplyViewBase.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/detail/ApplyViewBase.h>
 #include <ripple/basics/contract.h>
 #include <ripple/ledger/CashDiff.h>
diff --git a/src/ripple/ledger/impl/ApplyViewImpl.cpp b/src/ripple/ledger/impl/ApplyViewImpl.cpp
index 58e112441..3ff7b4237 100644
--- a/src/ripple/ledger/impl/ApplyViewImpl.cpp
+++ b/src/ripple/ledger/impl/ApplyViewImpl.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/ApplyViewImpl.h>
 #include <ripple/basics/contract.h>
 #include <cassert>
diff --git a/src/ripple/ledger/impl/BookDirs.cpp b/src/ripple/ledger/impl/BookDirs.cpp
index 49cdbb1cd..6d212af9d 100644
--- a/src/ripple/ledger/impl/BookDirs.cpp
+++ b/src/ripple/ledger/impl/BookDirs.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/BookDirs.h>
 #include <ripple/ledger/View.h>
 #include <ripple/protocol/Indexes.h>
diff --git a/src/ripple/ledger/impl/CachedSLEs.cpp b/src/ripple/ledger/impl/CachedSLEs.cpp
index 513d0aa5b..fe317263a 100644
--- a/src/ripple/ledger/impl/CachedSLEs.cpp
+++ b/src/ripple/ledger/impl/CachedSLEs.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/CachedSLEs.h>
 #include <vector>
 
diff --git a/src/ripple/ledger/impl/CachedView.cpp b/src/ripple/ledger/impl/CachedView.cpp
index e5007cd4c..d7f1c8f62 100644
--- a/src/ripple/ledger/impl/CachedView.cpp
+++ b/src/ripple/ledger/impl/CachedView.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/CachedView.h>
 #include <ripple/basics/contract.h>
 #include <ripple/protocol/Serializer.h>
diff --git a/src/ripple/ledger/impl/CashDiff.cpp b/src/ripple/ledger/impl/CashDiff.cpp
index 5a0733a79..ac82513e8 100644
--- a/src/ripple/ledger/impl/CashDiff.cpp
+++ b/src/ripple/ledger/impl/CashDiff.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/CashDiff.h>
 #include <ripple/ledger/detail/ApplyStateTable.h>
 #include <ripple/protocol/st.h>
diff --git a/src/ripple/ledger/impl/Directory.cpp b/src/ripple/ledger/impl/Directory.cpp
index d1b4b4c95..48d4593bc 100644
--- a/src/ripple/ledger/impl/Directory.cpp
+++ b/src/ripple/ledger/impl/Directory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/Directory.h>
 
 namespace ripple {
diff --git a/src/ripple/ledger/impl/OpenView.cpp b/src/ripple/ledger/impl/OpenView.cpp
index a1ca91439..38facd9e4 100644
--- a/src/ripple/ledger/impl/OpenView.cpp
+++ b/src/ripple/ledger/impl/OpenView.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/OpenView.h>
 #include <ripple/basics/contract.h>
 
diff --git a/src/ripple/ledger/impl/PaymentSandbox.cpp b/src/ripple/ledger/impl/PaymentSandbox.cpp
index 8916a25ba..ad44fdd0c 100644
--- a/src/ripple/ledger/impl/PaymentSandbox.cpp
+++ b/src/ripple/ledger/impl/PaymentSandbox.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/impl/AmountSpec.h>
 #include <ripple/ledger/PaymentSandbox.h>
 #include <ripple/ledger/View.h>
diff --git a/src/ripple/ledger/impl/RawStateTable.cpp b/src/ripple/ledger/impl/RawStateTable.cpp
index 18f0e717b..5694121d1 100644
--- a/src/ripple/ledger/impl/RawStateTable.cpp
+++ b/src/ripple/ledger/impl/RawStateTable.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/detail/RawStateTable.h>
 #include <ripple/basics/contract.h>
 
diff --git a/src/ripple/ledger/impl/ReadView.cpp b/src/ripple/ledger/impl/ReadView.cpp
index ddb448015..99ca35077 100644
--- a/src/ripple/ledger/impl/ReadView.cpp
+++ b/src/ripple/ledger/impl/ReadView.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/ReadView.h>
 #include <boost/optional.hpp>
 
diff --git a/src/ripple/ledger/impl/TxMeta.cpp b/src/ripple/ledger/impl/TxMeta.cpp
index 9f47c7b13..cac23a062 100644
--- a/src/ripple/ledger/impl/TxMeta.cpp
+++ b/src/ripple/ledger/impl/TxMeta.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/ledger/TxMeta.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/ledger/impl/View.cpp b/src/ripple/ledger/impl/View.cpp
index 7bd627efd..88978f189 100644
--- a/src/ripple/ledger/impl/View.cpp
+++ b/src/ripple/ledger/impl/View.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/ledger/BookDirs.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/net/impl/HTTPClient.cpp b/src/ripple/net/impl/HTTPClient.cpp
index 0524a8ef2..fc86e1134 100644
--- a/src/ripple/net/impl/HTTPClient.cpp
+++ b/src/ripple/net/impl/HTTPClient.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
diff --git a/src/ripple/net/impl/InfoSub.cpp b/src/ripple/net/impl/InfoSub.cpp
index 8683ee108..bc887ad3b 100644
--- a/src/ripple/net/impl/InfoSub.cpp
+++ b/src/ripple/net/impl/InfoSub.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/net/InfoSub.h>
 #include <atomic>
 
diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp
index 6c64fd0d4..53a5e603c 100644
--- a/src/ripple/net/impl/RPCCall.cpp
+++ b/src/ripple/net/impl/RPCCall.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/net/RPCCall.h>
diff --git a/src/ripple/net/impl/RPCErr.cpp b/src/ripple/net/impl/RPCErr.cpp
index b4a16e483..77dd8782c 100644
--- a/src/ripple/net/impl/RPCErr.cpp
+++ b/src/ripple/net/impl/RPCErr.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
 
diff --git a/src/ripple/net/impl/RPCSub.cpp b/src/ripple/net/impl/RPCSub.cpp
index a08d38294..f1b184be5 100644
--- a/src/ripple/net/impl/RPCSub.cpp
+++ b/src/ripple/net/impl/RPCSub.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/net/RPCSub.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/net/impl/RegisterSSLCerts.cpp b/src/ripple/net/impl/RegisterSSLCerts.cpp
index cc04c338b..3c5618819 100644
--- a/src/ripple/net/impl/RegisterSSLCerts.cpp
+++ b/src/ripple/net/impl/RegisterSSLCerts.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/net/RegisterSSLCerts.h>
 #include <boost/predef.h>
 #if BOOST_OS_WINDOWS
diff --git a/src/ripple/nodestore/backend/MemoryFactory.cpp b/src/ripple/nodestore/backend/MemoryFactory.cpp
index e3d65f945..89f12e859 100644
--- a/src/ripple/nodestore/backend/MemoryFactory.cpp
+++ b/src/ripple/nodestore/backend/MemoryFactory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/nodestore/Factory.h>
 #include <ripple/nodestore/Manager.h>
diff --git a/src/ripple/nodestore/backend/NuDBFactory.cpp b/src/ripple/nodestore/backend/NuDBFactory.cpp
index 938bd2861..a39833c26 100644
--- a/src/ripple/nodestore/backend/NuDBFactory.cpp
+++ b/src/ripple/nodestore/backend/NuDBFactory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/basics/contract.h>
 #include <ripple/nodestore/Factory.h>
diff --git a/src/ripple/nodestore/backend/NullFactory.cpp b/src/ripple/nodestore/backend/NullFactory.cpp
index 8d1064a68..39b29d84e 100644
--- a/src/ripple/nodestore/backend/NullFactory.cpp
+++ b/src/ripple/nodestore/backend/NullFactory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/nodestore/Factory.h>
 #include <ripple/nodestore/Manager.h>
diff --git a/src/ripple/nodestore/backend/RocksDBFactory.cpp b/src/ripple/nodestore/backend/RocksDBFactory.cpp
index 2b86fc82f..ec2c0a6f0 100644
--- a/src/ripple/nodestore/backend/RocksDBFactory.cpp
+++ b/src/ripple/nodestore/backend/RocksDBFactory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/unity/rocksdb.h>
 
diff --git a/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp b/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp
index 72d91489d..d09ce7f89 100644
--- a/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp
+++ b/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/unity/rocksdb.h>
 
diff --git a/src/ripple/nodestore/impl/BatchWriter.cpp b/src/ripple/nodestore/impl/BatchWriter.cpp
index cb56e0dbe..d40ec27bc 100644
--- a/src/ripple/nodestore/impl/BatchWriter.cpp
+++ b/src/ripple/nodestore/impl/BatchWriter.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/impl/BatchWriter.h>
 
 namespace ripple {
diff --git a/src/ripple/nodestore/impl/DatabaseNodeImp.cpp b/src/ripple/nodestore/impl/DatabaseNodeImp.cpp
index 9b151e884..20eaa98d3 100644
--- a/src/ripple/nodestore/impl/DatabaseNodeImp.cpp
+++ b/src/ripple/nodestore/impl/DatabaseNodeImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/impl/DatabaseNodeImp.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/protocol/HashPrefix.h>
diff --git a/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp b/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp
index 8060ebd1a..49c7ff286 100644
--- a/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp
+++ b/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/impl/DatabaseRotatingImp.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/protocol/HashPrefix.h>
diff --git a/src/ripple/nodestore/impl/DatabaseShardImp.cpp b/src/ripple/nodestore/impl/DatabaseShardImp.cpp
index 9122abc80..73166dfa9 100644
--- a/src/ripple/nodestore/impl/DatabaseShardImp.cpp
+++ b/src/ripple/nodestore/impl/DatabaseShardImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/nodestore/impl/DatabaseShardImp.h>
 #include <ripple/app/ledger/InboundLedgers.h>
diff --git a/src/ripple/nodestore/impl/DecodedBlob.cpp b/src/ripple/nodestore/impl/DecodedBlob.cpp
index b99e57ec9..6419a52f1 100644
--- a/src/ripple/nodestore/impl/DecodedBlob.cpp
+++ b/src/ripple/nodestore/impl/DecodedBlob.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/impl/DecodedBlob.h>
 #include <ripple/beast/core/ByteOrder.h>
 #include <algorithm>
diff --git a/src/ripple/nodestore/impl/DummyScheduler.cpp b/src/ripple/nodestore/impl/DummyScheduler.cpp
index d90c0ca2d..be4b4d480 100644
--- a/src/ripple/nodestore/impl/DummyScheduler.cpp
+++ b/src/ripple/nodestore/impl/DummyScheduler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/DummyScheduler.h>
 
 namespace ripple {
diff --git a/src/ripple/nodestore/impl/EncodedBlob.cpp b/src/ripple/nodestore/impl/EncodedBlob.cpp
index abf1327b1..ba906a6c7 100644
--- a/src/ripple/nodestore/impl/EncodedBlob.cpp
+++ b/src/ripple/nodestore/impl/EncodedBlob.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/impl/EncodedBlob.h>
 #include <cstring>
 
diff --git a/src/ripple/nodestore/impl/ManagerImp.cpp b/src/ripple/nodestore/impl/ManagerImp.cpp
index a29ace5ee..0daf284fd 100644
--- a/src/ripple/nodestore/impl/ManagerImp.cpp
+++ b/src/ripple/nodestore/impl/ManagerImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/impl/ManagerImp.h>
 #include <ripple/nodestore/impl/DatabaseNodeImp.h>
 
diff --git a/src/ripple/nodestore/impl/NodeObject.cpp b/src/ripple/nodestore/impl/NodeObject.cpp
index 4df044b45..91a845926 100644
--- a/src/ripple/nodestore/impl/NodeObject.cpp
+++ b/src/ripple/nodestore/impl/NodeObject.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/NodeObject.h>
 #include <memory>
 
diff --git a/src/ripple/nodestore/impl/Shard.cpp b/src/ripple/nodestore/impl/Shard.cpp
index f73b6538a..a47147b6b 100644
--- a/src/ripple/nodestore/impl/Shard.cpp
+++ b/src/ripple/nodestore/impl/Shard.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/nodestore/impl/Shard.h>
 #include <ripple/app/ledger/InboundLedger.h>
 #include <ripple/nodestore/impl/DatabaseShardImp.h>
diff --git a/src/ripple/overlay/Cluster.h b/src/ripple/overlay/Cluster.h
index 41489c4e0..b65cfa220 100644
--- a/src/ripple/overlay/Cluster.h
+++ b/src/ripple/overlay/Cluster.h
@@ -20,7 +20,6 @@
 #ifndef RIPPLE_OVERLAY_CLUSTER_H_INCLUDED
 #define RIPPLE_OVERLAY_CLUSTER_H_INCLUDED
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/BasicConfig.h>
diff --git a/src/ripple/overlay/impl/Cluster.cpp b/src/ripple/overlay/impl/Cluster.cpp
index 08e277cd9..d420eeafe 100644
--- a/src/ripple/overlay/impl/Cluster.cpp
+++ b/src/ripple/overlay/impl/Cluster.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
diff --git a/src/ripple/overlay/impl/ConnectAttempt.cpp b/src/ripple/overlay/impl/ConnectAttempt.cpp
index 8a3d97d36..b9c65726f 100644
--- a/src/ripple/overlay/impl/ConnectAttempt.cpp
+++ b/src/ripple/overlay/impl/ConnectAttempt.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/overlay/impl/ConnectAttempt.h>
 #include <ripple/overlay/impl/PeerImp.h>
 #include <ripple/overlay/Cluster.h>
diff --git a/src/ripple/overlay/impl/Message.cpp b/src/ripple/overlay/impl/Message.cpp
index f2eb397ec..6de4de73f 100644
--- a/src/ripple/overlay/impl/Message.cpp
+++ b/src/ripple/overlay/impl/Message.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/overlay/Message.h>
 #include <ripple/overlay/impl/TrafficCount.h>
 #include <cstdint>
diff --git a/src/ripple/overlay/impl/OverlayImpl.cpp b/src/ripple/overlay/impl/OverlayImpl.cpp
index aeb0b2b77..88e26dfc1 100644
--- a/src/ripple/overlay/impl/OverlayImpl.cpp
+++ b/src/ripple/overlay/impl/OverlayImpl.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/misc/HashRouter.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp
index ac91c3ff4..b2319f176 100644
--- a/src/ripple/overlay/impl/PeerImp.cpp
+++ b/src/ripple/overlay/impl/PeerImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/overlay/impl/PeerImp.h>
 #include <ripple/overlay/impl/Tuning.h>
 #include <ripple/app/consensus/RCLValidations.h>
diff --git a/src/ripple/overlay/impl/PeerSet.cpp b/src/ripple/overlay/impl/PeerSet.cpp
index f63a84ff4..833ac7b2b 100644
--- a/src/ripple/overlay/impl/PeerSet.cpp
+++ b/src/ripple/overlay/impl/PeerSet.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/overlay/PeerSet.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/core/JobQueue.h>
diff --git a/src/ripple/overlay/impl/TMHello.cpp b/src/ripple/overlay/impl/TMHello.cpp
index 66f029368..a828ee926 100644
--- a/src/ripple/overlay/impl/TMHello.cpp
+++ b/src/ripple/overlay/impl/TMHello.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/overlay/impl/TMHello.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/overlay/impl/TrafficCount.cpp b/src/ripple/overlay/impl/TrafficCount.cpp
index c46d6ca5c..40815d748 100644
--- a/src/ripple/overlay/impl/TrafficCount.cpp
+++ b/src/ripple/overlay/impl/TrafficCount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/overlay/impl/TrafficCount.h>
 
 namespace ripple {
diff --git a/src/ripple/peerfinder/impl/Bootcache.cpp b/src/ripple/peerfinder/impl/Bootcache.cpp
index 1d0622e59..88bae51dc 100644
--- a/src/ripple/peerfinder/impl/Bootcache.cpp
+++ b/src/ripple/peerfinder/impl/Bootcache.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/peerfinder/impl/Bootcache.h>
 #include <ripple/peerfinder/impl/iosformat.h>
 #include <ripple/peerfinder/impl/Tuning.h>
diff --git a/src/ripple/peerfinder/impl/Endpoint.cpp b/src/ripple/peerfinder/impl/Endpoint.cpp
index 13700aedb..36679c3b3 100644
--- a/src/ripple/peerfinder/impl/Endpoint.cpp
+++ b/src/ripple/peerfinder/impl/Endpoint.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/peerfinder/PeerfinderManager.h>
 
 namespace ripple {
diff --git a/src/ripple/peerfinder/impl/PeerfinderConfig.cpp b/src/ripple/peerfinder/impl/PeerfinderConfig.cpp
index d05aafb00..76e69c39e 100644
--- a/src/ripple/peerfinder/impl/PeerfinderConfig.cpp
+++ b/src/ripple/peerfinder/impl/PeerfinderConfig.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Tuning.h>
 
diff --git a/src/ripple/peerfinder/impl/PeerfinderManager.cpp b/src/ripple/peerfinder/impl/PeerfinderManager.cpp
index e7e5f1dcf..c1c85e31a 100644
--- a/src/ripple/peerfinder/impl/PeerfinderManager.cpp
+++ b/src/ripple/peerfinder/impl/PeerfinderManager.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Checker.h>
 #include <ripple/peerfinder/impl/Logic.h>
diff --git a/src/ripple/peerfinder/impl/SlotImp.cpp b/src/ripple/peerfinder/impl/SlotImp.cpp
index 9936453c4..a8d7a3848 100644
--- a/src/ripple/peerfinder/impl/SlotImp.cpp
+++ b/src/ripple/peerfinder/impl/SlotImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/peerfinder/impl/SlotImp.h>
 #include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Tuning.h>
diff --git a/src/ripple/peerfinder/impl/SourceStrings.cpp b/src/ripple/peerfinder/impl/SourceStrings.cpp
index 8aca7b585..486dbd47f 100644
--- a/src/ripple/peerfinder/impl/SourceStrings.cpp
+++ b/src/ripple/peerfinder/impl/SourceStrings.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/peerfinder/impl/SourceStrings.h>
 
 namespace ripple {
diff --git a/src/ripple/protocol/impl/AccountID.cpp b/src/ripple/protocol/impl/AccountID.cpp
index ba51f69e8..2f8d5bb06 100644
--- a/src/ripple/protocol/impl/AccountID.cpp
+++ b/src/ripple/protocol/impl/AccountID.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/digest.h>
diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp
index fd7cb20b3..42adcfe10 100644
--- a/src/ripple/protocol/impl/BuildInfo.cpp
+++ b/src/ripple/protocol/impl/BuildInfo.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/beast/core/PlatformConfig.h>
 #include <ripple/beast/core/SemanticVersion.h>
diff --git a/src/ripple/protocol/impl/ByteOrder.cpp b/src/ripple/protocol/impl/ByteOrder.cpp
index 9a14047fd..3d396bf79 100644
--- a/src/ripple/protocol/impl/ByteOrder.cpp
+++ b/src/ripple/protocol/impl/ByteOrder.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #ifdef _MSC_VER
 #include <cstdint>
diff --git a/src/ripple/protocol/impl/ErrorCodes.cpp b/src/ripple/protocol/impl/ErrorCodes.cpp
index 59bb7ae95..d83833f4f 100644
--- a/src/ripple/protocol/impl/ErrorCodes.cpp
+++ b/src/ripple/protocol/impl/ErrorCodes.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <cassert>
diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp
index 3df6e72bc..a1e9b4728 100644
--- a/src/ripple/protocol/impl/Feature.cpp
+++ b/src/ripple/protocol/impl/Feature.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/basics/contract.h>
 #include <ripple/protocol/digest.h>
diff --git a/src/ripple/protocol/impl/HashPrefix.cpp b/src/ripple/protocol/impl/HashPrefix.cpp
index 2f33bda0c..0b7529022 100644
--- a/src/ripple/protocol/impl/HashPrefix.cpp
+++ b/src/ripple/protocol/impl/HashPrefix.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/HashPrefix.h>
 
 namespace ripple {
diff --git a/src/ripple/protocol/impl/IOUAmount.cpp b/src/ripple/protocol/impl/IOUAmount.cpp
index da9ad8475..d91f52c63 100644
--- a/src/ripple/protocol/impl/IOUAmount.cpp
+++ b/src/ripple/protocol/impl/IOUAmount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/protocol/IOUAmount.h>
 #include <boost/multiprecision/cpp_int.hpp>
diff --git a/src/ripple/protocol/impl/Indexes.cpp b/src/ripple/protocol/impl/Indexes.cpp
index beb230b67..7d5f65d5d 100644
--- a/src/ripple/protocol/impl/Indexes.cpp
+++ b/src/ripple/protocol/impl/Indexes.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/digest.h>
 #include <ripple/protocol/Indexes.h>
 #include <cassert>
diff --git a/src/ripple/protocol/impl/InnerObjectFormats.cpp b/src/ripple/protocol/impl/InnerObjectFormats.cpp
index 7f334786e..8872d4caf 100755
--- a/src/ripple/protocol/impl/InnerObjectFormats.cpp
+++ b/src/ripple/protocol/impl/InnerObjectFormats.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/InnerObjectFormats.h>
 
 namespace ripple {
diff --git a/src/ripple/protocol/impl/Keylet.cpp b/src/ripple/protocol/impl/Keylet.cpp
index 772de796f..2b92c7f02 100644
--- a/src/ripple/protocol/impl/Keylet.cpp
+++ b/src/ripple/protocol/impl/Keylet.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Keylet.h>
 #include <ripple/protocol/STLedgerEntry.h>
 
diff --git a/src/ripple/protocol/impl/LedgerFormats.cpp b/src/ripple/protocol/impl/LedgerFormats.cpp
index b3be8078f..f931b0514 100644
--- a/src/ripple/protocol/impl/LedgerFormats.cpp
+++ b/src/ripple/protocol/impl/LedgerFormats.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/LedgerFormats.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/protocol/impl/PublicKey.cpp b/src/ripple/protocol/impl/PublicKey.cpp
index 5f159437f..5e7e887e0 100644
--- a/src/ripple/protocol/impl/PublicKey.cpp
+++ b/src/ripple/protocol/impl/PublicKey.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/digest.h>
 #include <ripple/protocol/impl/secp256k1.h>
diff --git a/src/ripple/protocol/impl/Quality.cpp b/src/ripple/protocol/impl/Quality.cpp
index b6e7427f0..f7afb3793 100644
--- a/src/ripple/protocol/impl/Quality.cpp
+++ b/src/ripple/protocol/impl/Quality.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Quality.h>
 #include <cassert>
 #include <limits>
diff --git a/src/ripple/protocol/impl/Rate2.cpp b/src/ripple/protocol/impl/Rate2.cpp
index 67702b994..ae5bc5212 100644
--- a/src/ripple/protocol/impl/Rate2.cpp
+++ b/src/ripple/protocol/impl/Rate2.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Quality.h>
 #include <ripple/protocol/Rate.h>
 
diff --git a/src/ripple/protocol/impl/SField.cpp b/src/ripple/protocol/impl/SField.cpp
index 5ffa78456..bddf38bea 100644
--- a/src/ripple/protocol/impl/SField.cpp
+++ b/src/ripple/protocol/impl/SField.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/SField.h>
 #include <cassert>
 #include <map>
diff --git a/src/ripple/protocol/impl/SOTemplate.cpp b/src/ripple/protocol/impl/SOTemplate.cpp
index 0edafda17..ded77c68d 100644
--- a/src/ripple/protocol/impl/SOTemplate.cpp
+++ b/src/ripple/protocol/impl/SOTemplate.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/SOTemplate.h>
 
 namespace ripple {
diff --git a/src/ripple/protocol/impl/STAccount.cpp b/src/ripple/protocol/impl/STAccount.cpp
index 3127d6494..cfb8814c3 100644
--- a/src/ripple/protocol/impl/STAccount.cpp
+++ b/src/ripple/protocol/impl/STAccount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STAccount.h>
 
 namespace ripple {
diff --git a/src/ripple/protocol/impl/STAmount.cpp b/src/ripple/protocol/impl/STAmount.cpp
index cec560d1c..4eea9ecb8 100644
--- a/src/ripple/protocol/impl/STAmount.cpp
+++ b/src/ripple/protocol/impl/STAmount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/protocol/impl/STArray.cpp b/src/ripple/protocol/impl/STArray.cpp
index 0bd7d9e83..a2ed5df6d 100644
--- a/src/ripple/protocol/impl/STArray.cpp
+++ b/src/ripple/protocol/impl/STArray.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/STBase.h>
diff --git a/src/ripple/protocol/impl/STBase.cpp b/src/ripple/protocol/impl/STBase.cpp
index 76e954193..f4028373a 100644
--- a/src/ripple/protocol/impl/STBase.cpp
+++ b/src/ripple/protocol/impl/STBase.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STBase.h>
 #include <boost/checked_delete.hpp>
 #include <cassert>
diff --git a/src/ripple/protocol/impl/STBlob.cpp b/src/ripple/protocol/impl/STBlob.cpp
index 097cc3834..e1dc2eb1d 100644
--- a/src/ripple/protocol/impl/STBlob.cpp
+++ b/src/ripple/protocol/impl/STBlob.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STBlob.h>
 #include <ripple/basics/StringUtilities.h>
 
diff --git a/src/ripple/protocol/impl/STInteger.cpp b/src/ripple/protocol/impl/STInteger.cpp
index c6a05a2f3..dd8448a18 100644
--- a/src/ripple/protocol/impl/STInteger.cpp
+++ b/src/ripple/protocol/impl/STInteger.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/LedgerFormats.h>
diff --git a/src/ripple/protocol/impl/STLedgerEntry.cpp b/src/ripple/protocol/impl/STLedgerEntry.cpp
index 9e98b8ba6..d4a5255d5 100644
--- a/src/ripple/protocol/impl/STLedgerEntry.cpp
+++ b/src/ripple/protocol/impl/STLedgerEntry.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
 #include <ripple/json/to_string.h>
diff --git a/src/ripple/protocol/impl/STObject.cpp b/src/ripple/protocol/impl/STObject.cpp
index b0e4cc264..154a1aba1 100644
--- a/src/ripple/protocol/impl/STObject.cpp
+++ b/src/ripple/protocol/impl/STObject.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STObject.h>
 #include <ripple/protocol/InnerObjectFormats.h>
 #include <ripple/protocol/STAccount.h>
diff --git a/src/ripple/protocol/impl/STParsedJSON.cpp b/src/ripple/protocol/impl/STParsedJSON.cpp
index 9173addf8..d8ef3adeb 100644
--- a/src/ripple/protocol/impl/STParsedJSON.cpp
+++ b/src/ripple/protocol/impl/STParsedJSON.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/ErrorCodes.h>
diff --git a/src/ripple/protocol/impl/STPathSet.cpp b/src/ripple/protocol/impl/STPathSet.cpp
index c782c7c1b..ddb65bc2f 100644
--- a/src/ripple/protocol/impl/STPathSet.cpp
+++ b/src/ripple/protocol/impl/STPathSet.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STPathSet.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/basics/contract.h>
diff --git a/src/ripple/protocol/impl/STTx.cpp b/src/ripple/protocol/impl/STTx.cpp
index 69780cd09..4547e5e14 100644
--- a/src/ripple/protocol/impl/STTx.cpp
+++ b/src/ripple/protocol/impl/STTx.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/protocol/impl/STValidation.cpp b/src/ripple/protocol/impl/STValidation.cpp
index 8eb44dba8..9a66ac663 100644
--- a/src/ripple/protocol/impl/STValidation.cpp
+++ b/src/ripple/protocol/impl/STValidation.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STValidation.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/basics/contract.h>
diff --git a/src/ripple/protocol/impl/STVar.cpp b/src/ripple/protocol/impl/STVar.cpp
index 6be3a667c..fa364a0e9 100644
--- a/src/ripple/protocol/impl/STVar.cpp
+++ b/src/ripple/protocol/impl/STVar.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/protocol/STAccount.h>
 #include <ripple/protocol/STAmount.h>
diff --git a/src/ripple/protocol/impl/STVector256.cpp b/src/ripple/protocol/impl/STVector256.cpp
index eff4f9246..9901ccfcd 100644
--- a/src/ripple/protocol/impl/STVector256.cpp
+++ b/src/ripple/protocol/impl/STVector256.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/protocol/impl/SecretKey.cpp b/src/ripple/protocol/impl/SecretKey.cpp
index 4b157b0e3..c0e0a97c0 100644
--- a/src/ripple/protocol/impl/SecretKey.cpp
+++ b/src/ripple/protocol/impl/SecretKey.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/strHex.h>
 #include <ripple/protocol/SecretKey.h>
 #include <ripple/protocol/digest.h>
diff --git a/src/ripple/protocol/impl/Seed.cpp b/src/ripple/protocol/impl/Seed.cpp
index 385407791..c56c7a156 100644
--- a/src/ripple/protocol/impl/Seed.cpp
+++ b/src/ripple/protocol/impl/Seed.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Seed.h>
 #include <ripple/basics/Buffer.h>
 #include <ripple/protocol/AccountID.h>
diff --git a/src/ripple/protocol/impl/Serializer.cpp b/src/ripple/protocol/impl/Serializer.cpp
index 8223f670c..a14423276 100644
--- a/src/ripple/protocol/impl/Serializer.cpp
+++ b/src/ripple/protocol/impl/Serializer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/digest.h>
diff --git a/src/ripple/protocol/impl/Sign.cpp b/src/ripple/protocol/impl/Sign.cpp
index 1555a8ec3..fb9ddcc91 100644
--- a/src/ripple/protocol/impl/Sign.cpp
+++ b/src/ripple/protocol/impl/Sign.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Sign.h>
 
 namespace ripple {
diff --git a/src/ripple/protocol/impl/TER.cpp b/src/ripple/protocol/impl/TER.cpp
index 472ea565d..23a7238a8 100644
--- a/src/ripple/protocol/impl/TER.cpp
+++ b/src/ripple/protocol/impl/TER.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/TER.h>
 #include <boost/range/adaptor/transformed.hpp>
 #include <unordered_map>
diff --git a/src/ripple/protocol/impl/TxFormats.cpp b/src/ripple/protocol/impl/TxFormats.cpp
index 1d09cd65a..8e7fc4248 100644
--- a/src/ripple/protocol/impl/TxFormats.cpp
+++ b/src/ripple/protocol/impl/TxFormats.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/TxFormats.h>
 
 namespace ripple {
diff --git a/src/ripple/protocol/impl/UintTypes.cpp b/src/ripple/protocol/impl/UintTypes.cpp
index eee35a5ae..cca6f735c 100644
--- a/src/ripple/protocol/impl/UintTypes.cpp
+++ b/src/ripple/protocol/impl/UintTypes.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Serializer.h>
 #include <ripple/protocol/SystemParameters.h>
 #include <ripple/protocol/UintTypes.h>
diff --git a/src/ripple/protocol/impl/digest.cpp b/src/ripple/protocol/impl/digest.cpp
index a82dcecdb..5ca2cdd87 100644
--- a/src/ripple/protocol/impl/digest.cpp
+++ b/src/ripple/protocol/impl/digest.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/digest.h>
 #include <type_traits>
 #include <openssl/ripemd.h>
diff --git a/src/ripple/protocol/impl/tokens.cpp b/src/ripple/protocol/impl/tokens.cpp
index db7389c30..2e7e5d340 100644
--- a/src/ripple/protocol/impl/tokens.cpp
+++ b/src/ripple/protocol/impl/tokens.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/tokens.h>
 #include <ripple/protocol/digest.h>
 #include <boost/container/small_vector.hpp>
diff --git a/src/ripple/resource/impl/Charge.cpp b/src/ripple/resource/impl/Charge.cpp
index 5009a97c7..40b5656b6 100644
--- a/src/ripple/resource/impl/Charge.cpp
+++ b/src/ripple/resource/impl/Charge.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/resource/Charge.h>
 #include <sstream>
 
diff --git a/src/ripple/resource/impl/Consumer.cpp b/src/ripple/resource/impl/Consumer.cpp
index 45eaae268..fd8127c0b 100644
--- a/src/ripple/resource/impl/Consumer.cpp
+++ b/src/ripple/resource/impl/Consumer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/resource/Consumer.h>
 #include <ripple/resource/impl/Entry.h>
 #include <ripple/resource/impl/Logic.h>
diff --git a/src/ripple/resource/impl/Fees.cpp b/src/ripple/resource/impl/Fees.cpp
index 7863bde7a..8c2ba3b3f 100644
--- a/src/ripple/resource/impl/Fees.cpp
+++ b/src/ripple/resource/impl/Fees.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/resource/Fees.h>
 
 namespace ripple {
diff --git a/src/ripple/resource/impl/ResourceManager.cpp b/src/ripple/resource/impl/ResourceManager.cpp
index 61febfa7e..9bc067236 100644
--- a/src/ripple/resource/impl/ResourceManager.cpp
+++ b/src/ripple/resource/impl/ResourceManager.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/resource/ResourceManager.h>
 #include <ripple/resource/impl/Logic.h>
 #include <ripple/basics/chrono.h>
diff --git a/src/ripple/rpc/handlers/AccountChannels.cpp b/src/ripple/rpc/handlers/AccountChannels.cpp
index ef8dd7e2e..0f4bcdc15 100644
--- a/src/ripple/rpc/handlers/AccountChannels.cpp
+++ b/src/ripple/rpc/handlers/AccountChannels.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/ledger/ReadView.h>
 #include <ripple/ledger/View.h>
diff --git a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp b/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp
index ca4e7af12..d808116e5 100644
--- a/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp
+++ b/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/paths/RippleState.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/rpc/handlers/AccountInfo.cpp b/src/ripple/rpc/handlers/AccountInfo.cpp
index 98965dbaf..5efb8127d 100644
--- a/src/ripple/rpc/handlers/AccountInfo.cpp
+++ b/src/ripple/rpc/handlers/AccountInfo.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/TxQ.h>
diff --git a/src/ripple/rpc/handlers/AccountLines.cpp b/src/ripple/rpc/handlers/AccountLines.cpp
index 1044914e6..22e5b39a4 100644
--- a/src/ripple/rpc/handlers/AccountLines.cpp
+++ b/src/ripple/rpc/handlers/AccountLines.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/paths/RippleState.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/rpc/handlers/AccountObjects.cpp b/src/ripple/rpc/handlers/AccountObjects.cpp
index 21d8b92e2..fd7ba4ce4 100644
--- a/src/ripple/rpc/handlers/AccountObjects.cpp
+++ b/src/ripple/rpc/handlers/AccountObjects.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_writer.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/rpc/handlers/AccountOffers.cpp b/src/ripple/rpc/handlers/AccountOffers.cpp
index 8ff79805e..247222a7b 100644
--- a/src/ripple/rpc/handlers/AccountOffers.cpp
+++ b/src/ripple/rpc/handlers/AccountOffers.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/json/json_value.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp
index ab69deb1b..b40a52791 100644
--- a/src/ripple/rpc/handlers/AccountTx.cpp
+++ b/src/ripple/rpc/handlers/AccountTx.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/ripple/rpc/handlers/AccountTxOld.cpp b/src/ripple/rpc/handlers/AccountTxOld.cpp
index d7fa7f5bf..be3645f4b 100644
--- a/src/ripple/rpc/handlers/AccountTxOld.cpp
+++ b/src/ripple/rpc/handlers/AccountTxOld.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/ripple/rpc/handlers/AccountTxSwitch.cpp b/src/ripple/rpc/handlers/AccountTxSwitch.cpp
index 78eb949d7..15f367ae6 100644
--- a/src/ripple/rpc/handlers/AccountTxSwitch.cpp
+++ b/src/ripple/rpc/handlers/AccountTxSwitch.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_value.h>
 #include <ripple/net/RPCErr.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/rpc/handlers/BlackList.cpp b/src/ripple/rpc/handlers/BlackList.cpp
index 1090d3ea2..eccf1e064 100644
--- a/src/ripple/rpc/handlers/BlackList.cpp
+++ b/src/ripple/rpc/handlers/BlackList.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/resource/ResourceManager.h>
diff --git a/src/ripple/rpc/handlers/BookOffers.cpp b/src/ripple/rpc/handlers/BookOffers.cpp
index 6bc26019a..ec5dc2e75 100644
--- a/src/ripple/rpc/handlers/BookOffers.cpp
+++ b/src/ripple/rpc/handlers/BookOffers.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/rpc/handlers/CanDelete.cpp b/src/ripple/rpc/handlers/CanDelete.cpp
index 6a217aff0..910eb5005 100644
--- a/src/ripple/rpc/handlers/CanDelete.cpp
+++ b/src/ripple/rpc/handlers/CanDelete.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp
index 30ef78ae0..3a9cbd637 100644
--- a/src/ripple/rpc/handlers/Connect.cpp
+++ b/src/ripple/rpc/handlers/Connect.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/core/Config.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/handlers/ConsensusInfo.cpp b/src/ripple/rpc/handlers/ConsensusInfo.cpp
index f03cdde5b..18ff78e68 100644
--- a/src/ripple/rpc/handlers/ConsensusInfo.cpp
+++ b/src/ripple/rpc/handlers/ConsensusInfo.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/json_value.h>
diff --git a/src/ripple/rpc/handlers/Feature1.cpp b/src/ripple/rpc/handlers/Feature1.cpp
index 665bbd791..30e6d4eb9 100644
--- a/src/ripple/rpc/handlers/Feature1.cpp
+++ b/src/ripple/rpc/handlers/Feature1.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/AmendmentTable.h>
diff --git a/src/ripple/rpc/handlers/Fee1.cpp b/src/ripple/rpc/handlers/Fee1.cpp
index 06d9ee8f0..5090970d2 100644
--- a/src/ripple/rpc/handlers/Fee1.cpp
+++ b/src/ripple/rpc/handlers/Fee1.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/OpenLedger.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/TxQ.h>
diff --git a/src/ripple/rpc/handlers/FetchInfo.cpp b/src/ripple/rpc/handlers/FetchInfo.cpp
index 7b57ffc26..a82230db3 100644
--- a/src/ripple/rpc/handlers/FetchInfo.cpp
+++ b/src/ripple/rpc/handlers/FetchInfo.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/json_value.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/rpc/handlers/GatewayBalances.cpp b/src/ripple/rpc/handlers/GatewayBalances.cpp
index de58e3293..239f7c554 100644
--- a/src/ripple/rpc/handlers/GatewayBalances.cpp
+++ b/src/ripple/rpc/handlers/GatewayBalances.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/paths/RippleState.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/rpc/handlers/GetCounts.cpp b/src/ripple/rpc/handlers/GetCounts.cpp
index 79c725d62..acd1e1b89 100644
--- a/src/ripple/rpc/handlers/GetCounts.cpp
+++ b/src/ripple/rpc/handlers/GetCounts.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/AcceptedLedger.h>
 #include <ripple/app/ledger/InboundLedgers.h>
 #include <ripple/app/ledger/LedgerMaster.h>
diff --git a/src/ripple/rpc/handlers/LedgerAccept.cpp b/src/ripple/rpc/handlers/LedgerAccept.cpp
index acd155437..e1be45a5b 100644
--- a/src/ripple/rpc/handlers/LedgerAccept.cpp
+++ b/src/ripple/rpc/handlers/LedgerAccept.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp b/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp
index f40557b9a..434d77268 100644
--- a/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp
+++ b/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/json/json_value.h>
diff --git a/src/ripple/rpc/handlers/LedgerClosed.cpp b/src/ripple/rpc/handlers/LedgerClosed.cpp
index ded819cba..eeccb3466 100644
--- a/src/ripple/rpc/handlers/LedgerClosed.cpp
+++ b/src/ripple/rpc/handlers/LedgerClosed.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/json_value.h>
diff --git a/src/ripple/rpc/handlers/LedgerCurrent.cpp b/src/ripple/rpc/handlers/LedgerCurrent.cpp
index 43e89802f..2b5a11868 100644
--- a/src/ripple/rpc/handlers/LedgerCurrent.cpp
+++ b/src/ripple/rpc/handlers/LedgerCurrent.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/json_value.h>
diff --git a/src/ripple/rpc/handlers/LedgerData.cpp b/src/ripple/rpc/handlers/LedgerData.cpp
index 9b418a969..c1e03824c 100644
--- a/src/ripple/rpc/handlers/LedgerData.cpp
+++ b/src/ripple/rpc/handlers/LedgerData.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerToJson.h>
 #include <ripple/ledger/ReadView.h>
 #include <ripple/protocol/ErrorCodes.h>
diff --git a/src/ripple/rpc/handlers/LedgerEntry.cpp b/src/ripple/rpc/handlers/LedgerEntry.cpp
index 0e930d6a7..a2050c939 100644
--- a/src/ripple/rpc/handlers/LedgerEntry.cpp
+++ b/src/ripple/rpc/handlers/LedgerEntry.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/basics/strHex.h>
 #include <ripple/basics/StringUtilities.h>
diff --git a/src/ripple/rpc/handlers/LedgerHandler.cpp b/src/ripple/rpc/handlers/LedgerHandler.cpp
index 2f959c3e9..04ade73d2 100644
--- a/src/ripple/rpc/handlers/LedgerHandler.cpp
+++ b/src/ripple/rpc/handlers/LedgerHandler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/rpc/handlers/LedgerHandler.h>
 #include <ripple/app/ledger/LedgerToJson.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/rpc/handlers/LedgerHeader.cpp b/src/ripple/rpc/handlers/LedgerHeader.cpp
index 7ca432610..9550460b5 100644
--- a/src/ripple/rpc/handlers/LedgerHeader.cpp
+++ b/src/ripple/rpc/handlers/LedgerHeader.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerToJson.h>
 #include <ripple/basics/strHex.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/rpc/handlers/LedgerRequest.cpp b/src/ripple/rpc/handlers/LedgerRequest.cpp
index a8c33a548..ec6bf50e2 100644
--- a/src/ripple/rpc/handlers/LedgerRequest.cpp
+++ b/src/ripple/rpc/handlers/LedgerRequest.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/InboundLedgers.h>
 #include <ripple/app/ledger/LedgerToJson.h>
 #include <ripple/app/ledger/LedgerMaster.h>
diff --git a/src/ripple/rpc/handlers/LogLevel.cpp b/src/ripple/rpc/handlers/LogLevel.cpp
index 81bf4583d..b6f8a8746 100644
--- a/src/ripple/rpc/handlers/LogLevel.cpp
+++ b/src/ripple/rpc/handlers/LogLevel.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/basics/Log.h>
 #include <ripple/json/json_value.h>
diff --git a/src/ripple/rpc/handlers/LogRotate.cpp b/src/ripple/rpc/handlers/LogRotate.cpp
index d86638bd4..87f12d8c7 100644
--- a/src/ripple/rpc/handlers/LogRotate.cpp
+++ b/src/ripple/rpc/handlers/LogRotate.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/basics/Log.h>
 #include <ripple/rpc/impl/Handler.h>
diff --git a/src/ripple/rpc/handlers/NoRippleCheck.cpp b/src/ripple/rpc/handlers/NoRippleCheck.cpp
index 23e5eeeec..31a3ca6ad 100644
--- a/src/ripple/rpc/handlers/NoRippleCheck.cpp
+++ b/src/ripple/rpc/handlers/NoRippleCheck.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/app/paths/RippleState.h>
diff --git a/src/ripple/rpc/handlers/OwnerInfo.cpp b/src/ripple/rpc/handlers/OwnerInfo.cpp
index 88e96d90f..0a974becc 100644
--- a/src/ripple/rpc/handlers/OwnerInfo.cpp
+++ b/src/ripple/rpc/handlers/OwnerInfo.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/json_value.h>
diff --git a/src/ripple/rpc/handlers/PathFind.cpp b/src/ripple/rpc/handlers/PathFind.cpp
index 92fe19db9..bba8a8f8d 100644
--- a/src/ripple/rpc/handlers/PathFind.cpp
+++ b/src/ripple/rpc/handlers/PathFind.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/ripple/rpc/handlers/PayChanClaim.cpp b/src/ripple/rpc/handlers/PayChanClaim.cpp
index b1f32b21d..62eaa70a2 100644
--- a/src/ripple/rpc/handlers/PayChanClaim.cpp
+++ b/src/ripple/rpc/handlers/PayChanClaim.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/ledger/ReadView.h>
diff --git a/src/ripple/rpc/handlers/Peers.cpp b/src/ripple/rpc/handlers/Peers.cpp
index c72d9bcbc..950bd3064 100644
--- a/src/ripple/rpc/handlers/Peers.cpp
+++ b/src/ripple/rpc/handlers/Peers.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/core/TimeKeeper.h>
diff --git a/src/ripple/rpc/handlers/Ping.cpp b/src/ripple/rpc/handlers/Ping.cpp
index e2fa69fbd..8cb5a8159 100644
--- a/src/ripple/rpc/handlers/Ping.cpp
+++ b/src/ripple/rpc/handlers/Ping.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_value.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/rpc/Role.h>
diff --git a/src/ripple/rpc/handlers/Print.cpp b/src/ripple/rpc/handlers/Print.cpp
index 06ce3aa01..d171bd9d1 100644
--- a/src/ripple/rpc/handlers/Print.cpp
+++ b/src/ripple/rpc/handlers/Print.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/json/JsonPropertyStream.h>
 #include <ripple/json/json_value.h>
diff --git a/src/ripple/rpc/handlers/Random.cpp b/src/ripple/rpc/handlers/Random.cpp
index 947358146..9f426fb83 100644
--- a/src/ripple/rpc/handlers/Random.cpp
+++ b/src/ripple/rpc/handlers/Random.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/crypto/csprng.h>
 #include <ripple/json/json_value.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/handlers/RipplePathFind.cpp b/src/ripple/rpc/handlers/RipplePathFind.cpp
index 48fab268f..c3216235a 100644
--- a/src/ripple/rpc/handlers/RipplePathFind.cpp
+++ b/src/ripple/rpc/handlers/RipplePathFind.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/paths/PathRequests.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/handlers/ServerInfo.cpp b/src/ripple/rpc/handlers/ServerInfo.cpp
index 3478d47f0..3adb50a39 100644
--- a/src/ripple/rpc/handlers/ServerInfo.cpp
+++ b/src/ripple/rpc/handlers/ServerInfo.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/json_value.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/handlers/ServerState.cpp b/src/ripple/rpc/handlers/ServerState.cpp
index 730c7d334..e0da58afc 100644
--- a/src/ripple/rpc/handlers/ServerState.cpp
+++ b/src/ripple/rpc/handlers/ServerState.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/json/json_value.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/handlers/SignFor.cpp b/src/ripple/rpc/handlers/SignFor.cpp
index 54bf3751c..6fb46ab33 100755
--- a/src/ripple/rpc/handlers/SignFor.cpp
+++ b/src/ripple/rpc/handlers/SignFor.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/ripple/rpc/handlers/SignHandler.cpp b/src/ripple/rpc/handlers/SignHandler.cpp
index aad1535de..f95ce7b42 100644
--- a/src/ripple/rpc/handlers/SignHandler.cpp
+++ b/src/ripple/rpc/handlers/SignHandler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/resource/Fees.h>
diff --git a/src/ripple/rpc/handlers/Stop.cpp b/src/ripple/rpc/handlers/Stop.cpp
index 9435b771f..79d6220f5 100644
--- a/src/ripple/rpc/handlers/Stop.cpp
+++ b/src/ripple/rpc/handlers/Stop.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/json/json_value.h>
 #include <ripple/rpc/impl/Handler.h>
diff --git a/src/ripple/rpc/handlers/Submit.cpp b/src/ripple/rpc/handlers/Submit.cpp
index 582f80f9a..e74ee824d 100644
--- a/src/ripple/rpc/handlers/Submit.cpp
+++ b/src/ripple/rpc/handlers/Submit.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/misc/HashRouter.h>
 #include <ripple/app/misc/Transaction.h>
diff --git a/src/ripple/rpc/handlers/SubmitMultiSigned.cpp b/src/ripple/rpc/handlers/SubmitMultiSigned.cpp
index a88fe1fba..96b106545 100644
--- a/src/ripple/rpc/handlers/SubmitMultiSigned.cpp
+++ b/src/ripple/rpc/handlers/SubmitMultiSigned.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/ripple/rpc/handlers/Subscribe.cpp b/src/ripple/rpc/handlers/Subscribe.cpp
index 8af4e9129..f9fe864b0 100644
--- a/src/ripple/rpc/handlers/Subscribe.cpp
+++ b/src/ripple/rpc/handlers/Subscribe.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/app/ledger/LedgerMaster.h>
diff --git a/src/ripple/rpc/handlers/TransactionEntry.cpp b/src/ripple/rpc/handlers/TransactionEntry.cpp
index 8987ab096..654098b7a 100644
--- a/src/ripple/rpc/handlers/TransactionEntry.cpp
+++ b/src/ripple/rpc/handlers/TransactionEntry.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/ledger/ReadView.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/rpc/handlers/Tx.cpp b/src/ripple/rpc/handlers/Tx.cpp
index 3ed5423c5..47c54a8df 100644
--- a/src/ripple/rpc/handlers/Tx.cpp
+++ b/src/ripple/rpc/handlers/Tx.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/ledger/TransactionMaster.h>
 #include <ripple/app/main/Application.h>
diff --git a/src/ripple/rpc/handlers/TxHistory.cpp b/src/ripple/rpc/handlers/TxHistory.cpp
index cfd984938..fc60b3309 100644
--- a/src/ripple/rpc/handlers/TxHistory.cpp
+++ b/src/ripple/rpc/handlers/TxHistory.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/Transaction.h>
 #include <ripple/core/DatabaseCon.h>
diff --git a/src/ripple/rpc/handlers/UnlList.cpp b/src/ripple/rpc/handlers/UnlList.cpp
index 4bc1d5ffe..771fd5c9c 100644
--- a/src/ripple/rpc/handlers/UnlList.cpp
+++ b/src/ripple/rpc/handlers/UnlList.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/ValidatorList.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/rpc/handlers/Unsubscribe.cpp b/src/ripple/rpc/handlers/Unsubscribe.cpp
index 7c8141b58..c8f1b61d6 100644
--- a/src/ripple/rpc/handlers/Unsubscribe.cpp
+++ b/src/ripple/rpc/handlers/Unsubscribe.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/basics/Log.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/handlers/ValidationCreate.cpp b/src/ripple/rpc/handlers/ValidationCreate.cpp
index be07ce8af..b819cf89e 100644
--- a/src/ripple/rpc/handlers/ValidationCreate.cpp
+++ b/src/ripple/rpc/handlers/ValidationCreate.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
diff --git a/src/ripple/rpc/handlers/ValidationSeed.cpp b/src/ripple/rpc/handlers/ValidationSeed.cpp
index bf2f149f0..819c51bb5 100644
--- a/src/ripple/rpc/handlers/ValidationSeed.cpp
+++ b/src/ripple/rpc/handlers/ValidationSeed.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/core/Config.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/handlers/ValidatorListSites.cpp b/src/ripple/rpc/handlers/ValidatorListSites.cpp
index 316bc1683..d51aa8214 100644
--- a/src/ripple/rpc/handlers/ValidatorListSites.cpp
+++ b/src/ripple/rpc/handlers/ValidatorListSites.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/ValidatorSite.h>
 #include <ripple/rpc/Context.h>
diff --git a/src/ripple/rpc/handlers/Validators.cpp b/src/ripple/rpc/handlers/Validators.cpp
index 090106344..0159bcddb 100644
--- a/src/ripple/rpc/handlers/Validators.cpp
+++ b/src/ripple/rpc/handlers/Validators.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/ValidatorList.h>
 #include <ripple/rpc/Context.h>
diff --git a/src/ripple/rpc/handlers/WalletPropose.cpp b/src/ripple/rpc/handlers/WalletPropose.cpp
index f2e24f863..1a896f178 100644
--- a/src/ripple/rpc/handlers/WalletPropose.cpp
+++ b/src/ripple/rpc/handlers/WalletPropose.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/strHex.h>
 #include <ripple/crypto/KeyType.h>
 #include <ripple/net/RPCErr.h>
diff --git a/src/ripple/rpc/impl/Handler.cpp b/src/ripple/rpc/impl/Handler.cpp
index c15bcac3e..26ff3b988 100644
--- a/src/ripple/rpc/impl/Handler.cpp
+++ b/src/ripple/rpc/impl/Handler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/rpc/impl/Handler.h>
 #include <ripple/rpc/handlers/Handlers.h>
 #include <ripple/rpc/handlers/Version.h>
diff --git a/src/ripple/rpc/impl/LegacyPathFind.cpp b/src/ripple/rpc/impl/LegacyPathFind.cpp
index c644e4ef3..de6a1adbd 100644
--- a/src/ripple/rpc/impl/LegacyPathFind.cpp
+++ b/src/ripple/rpc/impl/LegacyPathFind.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/core/Job.h>
diff --git a/src/ripple/rpc/impl/RPCHandler.cpp b/src/ripple/rpc/impl/RPCHandler.cpp
index 5151af425..a2d309815 100644
--- a/src/ripple/rpc/impl/RPCHandler.cpp
+++ b/src/ripple/rpc/impl/RPCHandler.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/rpc/RPCHandler.h>
 #include <ripple/rpc/impl/Tuning.h>
diff --git a/src/ripple/rpc/impl/RPCHelpers.cpp b/src/ripple/rpc/impl/RPCHelpers.cpp
index aa3d54516..882552d54 100644
--- a/src/ripple/rpc/impl/RPCHelpers.cpp
+++ b/src/ripple/rpc/impl/RPCHelpers.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/misc/Transaction.h>
 #include <ripple/ledger/View.h>
diff --git a/src/ripple/rpc/impl/Role.cpp b/src/ripple/rpc/impl/Role.cpp
index c40f885fb..512a66f80 100644
--- a/src/ripple/rpc/impl/Role.cpp
+++ b/src/ripple/rpc/impl/Role.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/rpc/Role.h>
 
 namespace ripple {
diff --git a/src/ripple/rpc/impl/ServerHandlerImp.cpp b/src/ripple/rpc/impl/ServerHandlerImp.cpp
index 8090bb099..4bfa70b65 100644
--- a/src/ripple/rpc/impl/ServerHandlerImp.cpp
+++ b/src/ripple/rpc/impl/ServerHandlerImp.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/beast/rfc2616.h>
diff --git a/src/ripple/rpc/impl/Status.cpp b/src/ripple/rpc/impl/Status.cpp
index 0b8442dfd..3f60e8dd9 100644
--- a/src/ripple/rpc/impl/Status.cpp
+++ b/src/ripple/rpc/impl/Status.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/rpc/Status.h>
 
 namespace ripple {
diff --git a/src/ripple/rpc/impl/TransactionSign.cpp b/src/ripple/rpc/impl/TransactionSign.cpp
index c3bf14a17..b3f47d0bd 100644
--- a/src/ripple/rpc/impl/TransactionSign.cpp
+++ b/src/ripple/rpc/impl/TransactionSign.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/rpc/impl/TransactionSign.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/ledger/OpenLedger.h>
diff --git a/src/ripple/server/impl/JSONRPCUtil.cpp b/src/ripple/server/impl/JSONRPCUtil.cpp
index 1017a592d..377654bda 100644
--- a/src/ripple/server/impl/JSONRPCUtil.cpp
+++ b/src/ripple/server/impl/JSONRPCUtil.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/server/impl/JSONRPCUtil.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/ripple/shamap/impl/SHAMap.cpp b/src/ripple/shamap/impl/SHAMap.cpp
index b28cae8fa..9d69fe951 100644
--- a/src/ripple/shamap/impl/SHAMap.cpp
+++ b/src/ripple/shamap/impl/SHAMap.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/shamap/SHAMap.h>
 
diff --git a/src/ripple/shamap/impl/SHAMapDelta.cpp b/src/ripple/shamap/impl/SHAMapDelta.cpp
index 309024340..82fd7de08 100644
--- a/src/ripple/shamap/impl/SHAMapDelta.cpp
+++ b/src/ripple/shamap/impl/SHAMapDelta.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/shamap/SHAMap.h>
 
diff --git a/src/ripple/shamap/impl/SHAMapItem.cpp b/src/ripple/shamap/impl/SHAMapItem.cpp
index f7badf016..ac2cb81e3 100644
--- a/src/ripple/shamap/impl/SHAMapItem.cpp
+++ b/src/ripple/shamap/impl/SHAMapItem.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Serializer.h>
 #include <ripple/shamap/SHAMapItem.h>
 
diff --git a/src/ripple/shamap/impl/SHAMapMissingNode.cpp b/src/ripple/shamap/impl/SHAMapMissingNode.cpp
index 98823528f..20f149743 100644
--- a/src/ripple/shamap/impl/SHAMapMissingNode.cpp
+++ b/src/ripple/shamap/impl/SHAMapMissingNode.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/shamap/SHAMapMissingNode.h>
 #include <ostream>
 
diff --git a/src/ripple/shamap/impl/SHAMapNodeID.cpp b/src/ripple/shamap/impl/SHAMapNodeID.cpp
index 6884c69e9..a284a1d7b 100644
--- a/src/ripple/shamap/impl/SHAMapNodeID.cpp
+++ b/src/ripple/shamap/impl/SHAMapNodeID.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/shamap/SHAMapNodeID.h>
 #include <ripple/crypto/csprng.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/shamap/impl/SHAMapSync.cpp b/src/ripple/shamap/impl/SHAMapSync.cpp
index ce7ceb2c7..e1a51e156 100644
--- a/src/ripple/shamap/impl/SHAMapSync.cpp
+++ b/src/ripple/shamap/impl/SHAMapSync.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/random.h>
 #include <ripple/shamap/SHAMap.h>
 #include <ripple/nodestore/Database.h>
diff --git a/src/ripple/shamap/impl/SHAMapTreeNode.cpp b/src/ripple/shamap/impl/SHAMapTreeNode.cpp
index ce36ac350..1aa8f4d87 100644
--- a/src/ripple/shamap/impl/SHAMapTreeNode.cpp
+++ b/src/ripple/shamap/impl/SHAMapTreeNode.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/shamap/SHAMapTreeNode.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/Log.h>
diff --git a/src/ripple/unity/app_consensus.cpp b/src/ripple/unity/app_consensus.cpp
index e716d88d0..ea342786a 100644
--- a/src/ripple/unity/app_consensus.cpp
+++ b/src/ripple/unity/app_consensus.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 
 #include <ripple/app/consensus/RCLConsensus.cpp>
 #include <ripple/app/consensus/RCLCxPeerPos.cpp>
diff --git a/src/ripple/unity/app_ledger.cpp b/src/ripple/unity/app_ledger.cpp
index d38e6d02f..374049b44 100644
--- a/src/ripple/unity/app_ledger.cpp
+++ b/src/ripple/unity/app_ledger.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/ledger/AcceptedLedger.cpp>
 #include <ripple/app/ledger/AcceptedLedgerTx.cpp>
diff --git a/src/ripple/unity/app_ledger_impl.cpp b/src/ripple/unity/app_ledger_impl.cpp
index 1ea9d02fb..d395451fa 100644
--- a/src/ripple/unity/app_ledger_impl.cpp
+++ b/src/ripple/unity/app_ledger_impl.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/ledger/impl/InboundLedger.cpp>
 #include <ripple/app/ledger/impl/InboundLedgers.cpp>
diff --git a/src/ripple/unity/app_main1.cpp b/src/ripple/unity/app_main1.cpp
index 8f87b3220..188ea41dd 100644
--- a/src/ripple/unity/app_main1.cpp
+++ b/src/ripple/unity/app_main1.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/main/Application.cpp>
 #include <ripple/app/main/BasicApp.cpp>
diff --git a/src/ripple/unity/app_main2.cpp b/src/ripple/unity/app_main2.cpp
index 35e73a214..eea371d31 100644
--- a/src/ripple/unity/app_main2.cpp
+++ b/src/ripple/unity/app_main2.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/main/LoadManager.cpp>
 #include <ripple/app/main/Main.cpp>
diff --git a/src/ripple/unity/app_misc.cpp b/src/ripple/unity/app_misc.cpp
index 4b56e546a..f48b59ccf 100644
--- a/src/ripple/unity/app_misc.cpp
+++ b/src/ripple/unity/app_misc.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/misc/CanonicalTXSet.cpp>
 #include <ripple/app/misc/FeeVoteImpl.cpp>
diff --git a/src/ripple/unity/app_misc_impl.cpp b/src/ripple/unity/app_misc_impl.cpp
index 303e44205..4dd2ba6f2 100644
--- a/src/ripple/unity/app_misc_impl.cpp
+++ b/src/ripple/unity/app_misc_impl.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/misc/impl/AccountTxPaging.cpp>
 #include <ripple/app/misc/impl/AmendmentTable.cpp>
diff --git a/src/ripple/unity/app_paths.cpp b/src/ripple/unity/app_paths.cpp
index e48209eb5..031229ac1 100644
--- a/src/ripple/unity/app_paths.cpp
+++ b/src/ripple/unity/app_paths.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/paths/RippleState.cpp>
 #include <ripple/app/paths/AccountCurrencies.cpp>
diff --git a/src/ripple/unity/app_tx.cpp b/src/ripple/unity/app_tx.cpp
index f4d9e960f..01521e7ab 100644
--- a/src/ripple/unity/app_tx.cpp
+++ b/src/ripple/unity/app_tx.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/tx/impl/apply.cpp>
 #include <ripple/app/tx/impl/applySteps.cpp>
diff --git a/src/ripple/unity/basics.cpp b/src/ripple/unity/basics.cpp
index e15ed5faf..9f00ae867 100644
--- a/src/ripple/unity/basics.cpp
+++ b/src/ripple/unity/basics.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/basics/impl/BasicConfig.cpp>
 #include <ripple/basics/impl/CheckLibraryVersions.cpp>
diff --git a/src/ripple/unity/beast.cpp b/src/ripple/unity/beast.cpp
index 7755b9eba..6fd9a651c 100644
--- a/src/ripple/unity/beast.cpp
+++ b/src/ripple/unity/beast.cpp
@@ -18,6 +18,5 @@
 //==============================================================================
 
 // MUST come first!
-#include <BeastConfig.h>
 #include <ripple/beast/core/core.unity.cpp>
 
diff --git a/src/ripple/unity/conditions.cpp b/src/ripple/unity/conditions.cpp
index 54c53bfca..767019dff 100644
--- a/src/ripple/unity/conditions.cpp
+++ b/src/ripple/unity/conditions.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/conditions/impl/Condition.cpp>
 #include <ripple/conditions/impl/Fulfillment.cpp>
diff --git a/src/ripple/unity/consensus.cpp b/src/ripple/unity/consensus.cpp
index 8554a327c..359755299 100644
--- a/src/ripple/unity/consensus.cpp
+++ b/src/ripple/unity/consensus.cpp
@@ -16,6 +16,5 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 
 #include <ripple/consensus/Consensus.cpp>
diff --git a/src/ripple/unity/core.cpp b/src/ripple/unity/core.cpp
index 139331f8b..541ef021c 100644
--- a/src/ripple/unity/core.cpp
+++ b/src/ripple/unity/core.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/core/impl/Config.cpp>
 #include <ripple/core/impl/DatabaseCon.cpp>
diff --git a/src/ripple/unity/crypto.cpp b/src/ripple/unity/crypto.cpp
index 6e3c13a4f..cbd27db37 100644
--- a/src/ripple/unity/crypto.cpp
+++ b/src/ripple/unity/crypto.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/crypto/impl/ec_key.cpp>
 #include <ripple/crypto/impl/GenerateDeterministicKey.cpp>
diff --git a/src/ripple/unity/json.cpp b/src/ripple/unity/json.cpp
index 2884001d7..d4e76515f 100644
--- a/src/ripple/unity/json.cpp
+++ b/src/ripple/unity/json.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <cassert>
 #include <cstdlib>
diff --git a/src/ripple/unity/ledger.cpp b/src/ripple/unity/ledger.cpp
index dea59e7f9..eaa0f7370 100644
--- a/src/ripple/unity/ledger.cpp
+++ b/src/ripple/unity/ledger.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/ledger/impl/ApplyStateTable.cpp>
 #include <ripple/ledger/impl/ApplyView.cpp>
diff --git a/src/ripple/unity/net.cpp b/src/ripple/unity/net.cpp
index 0fa4a655e..e9a1d4366 100644
--- a/src/ripple/unity/net.cpp
+++ b/src/ripple/unity/net.cpp
@@ -20,7 +20,6 @@
 #undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
 #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER /**/
 
-#include <BeastConfig.h>
 #include <ripple/net/impl/HTTPClient.cpp>
 #include <ripple/net/impl/InfoSub.cpp>
 #include <ripple/net/impl/RPCCall.cpp>
diff --git a/src/ripple/unity/nodestore.cpp b/src/ripple/unity/nodestore.cpp
index cf41e422d..cd9eee277 100644
--- a/src/ripple/unity/nodestore.cpp
+++ b/src/ripple/unity/nodestore.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/nodestore/backend/MemoryFactory.cpp>
 #include <ripple/nodestore/backend/NuDBFactory.cpp>
diff --git a/src/ripple/unity/overlay1.cpp b/src/ripple/unity/overlay1.cpp
index 9c3c06820..2263c1e1e 100644
--- a/src/ripple/unity/overlay1.cpp
+++ b/src/ripple/unity/overlay1.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/overlay/impl/Cluster.cpp>
 #include <ripple/overlay/impl/ConnectAttempt.cpp>
diff --git a/src/ripple/unity/overlay2.cpp b/src/ripple/unity/overlay2.cpp
index 3cb1fc6f8..aecea2e50 100644
--- a/src/ripple/unity/overlay2.cpp
+++ b/src/ripple/unity/overlay2.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/overlay/impl/PeerImp.cpp>
 #include <ripple/overlay/impl/PeerSet.cpp>
diff --git a/src/ripple/unity/peerfinder.cpp b/src/ripple/unity/peerfinder.cpp
index 503df7aaf..22cffee1c 100644
--- a/src/ripple/unity/peerfinder.cpp
+++ b/src/ripple/unity/peerfinder.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/peerfinder/impl/Bootcache.cpp>
 #include <ripple/peerfinder/impl/PeerfinderConfig.cpp>
diff --git a/src/ripple/unity/protocol.cpp b/src/ripple/unity/protocol.cpp
index c14e765aa..57a89e710 100644
--- a/src/ripple/unity/protocol.cpp
+++ b/src/ripple/unity/protocol.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/protocol/impl/AccountID.cpp>
 #include <ripple/protocol/impl/Book.cpp>
diff --git a/src/ripple/unity/resource.cpp b/src/ripple/unity/resource.cpp
index cb5c5233d..607fd7857 100644
--- a/src/ripple/unity/resource.cpp
+++ b/src/ripple/unity/resource.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/resource/impl/Charge.cpp>
 #include <ripple/resource/impl/Consumer.cpp>
diff --git a/src/ripple/unity/rocksdb.cpp b/src/ripple/unity/rocksdb.cpp
index c7e11bde1..1e60162b8 100644
--- a/src/ripple/unity/rocksdb.cpp
+++ b/src/ripple/unity/rocksdb.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/unity/rocksdb.h>
 
diff --git a/src/ripple/unity/rocksdb.h b/src/ripple/unity/rocksdb.h
index 0a38b36f6..1002563ce 100644
--- a/src/ripple/unity/rocksdb.h
+++ b/src/ripple/unity/rocksdb.h
@@ -30,7 +30,6 @@
 #endif
 #endif
 
-#ifndef RIPPLE_ROCKSDB_AVAILABLE
 #if BEAST_WIN32
 # define ROCKSDB_PLATFORM_WINDOWS
 #else
@@ -44,6 +43,8 @@
 #  define OS_LINUX
 # endif
 #endif
+
+#ifndef RIPPLE_ROCKSDB_AVAILABLE
 # if BEAST_WIN32
 #  define RIPPLE_ROCKSDB_AVAILABLE 0
 # else
diff --git a/src/ripple/unity/rpcx1.cpp b/src/ripple/unity/rpcx1.cpp
index a023be833..d3e062f60 100644
--- a/src/ripple/unity/rpcx1.cpp
+++ b/src/ripple/unity/rpcx1.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 // This has to be included early to prevent an obscure MSVC compile error
 #include <boost/asio/deadline_timer.hpp>
diff --git a/src/ripple/unity/rpcx2.cpp b/src/ripple/unity/rpcx2.cpp
index 5bc0ac566..5c0f3e873 100644
--- a/src/ripple/unity/rpcx2.cpp
+++ b/src/ripple/unity/rpcx2.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 // This has to be included early to prevent an obscure MSVC compile error
 #include <boost/asio/deadline_timer.hpp>
diff --git a/src/ripple/unity/secp256k1.cpp b/src/ripple/unity/secp256k1.cpp
index cb2dd8e01..daf207e88 100644
--- a/src/ripple/unity/secp256k1.cpp
+++ b/src/ripple/unity/secp256k1.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #define USE_NUM_NONE
 #define USE_FIELD_10X26
diff --git a/src/ripple/unity/server.cpp b/src/ripple/unity/server.cpp
index 9d4598f7e..fea728e49 100644
--- a/src/ripple/unity/server.cpp
+++ b/src/ripple/unity/server.cpp
@@ -21,7 +21,6 @@
 #include <ripple/server/README.md>
 #endif
 
-#include <BeastConfig.h>
 
 #include <ripple/server/impl/JSONRPCUtil.cpp>
 #include <ripple/server/impl/Port.cpp>
diff --git a/src/ripple/unity/shamap.cpp b/src/ripple/unity/shamap.cpp
index 525a32159..e779d4e36 100644
--- a/src/ripple/unity/shamap.cpp
+++ b/src/ripple/unity/shamap.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/shamap/impl/SHAMap.cpp>
 #include <ripple/shamap/impl/SHAMapDelta.cpp>
 #include <ripple/shamap/impl/SHAMapItem.cpp>
diff --git a/src/ripple/unity/snappy.cpp b/src/ripple/unity/snappy.cpp
index cd6657fca..0bc51aacc 100644
--- a/src/ripple/unity/snappy.cpp
+++ b/src/ripple/unity/snappy.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/beast/core/Config.h>
 
 #ifdef _MSC_VER
diff --git a/src/ripple/unity/soci.cpp b/src/ripple/unity/soci.cpp
index d3fcf5c2c..a72cf1d2a 100644
--- a/src/ripple/unity/soci.cpp
+++ b/src/ripple/unity/soci.cpp
@@ -22,7 +22,6 @@
 #pragma clang diagnostic ignored "-Wdeprecated"
 #endif
 
-#include <BeastConfig.h>
 
 // Core soci
 #include <core/common.cpp>
diff --git a/src/ripple/unity/soci_ripple.cpp b/src/ripple/unity/soci_ripple.cpp
index 6ac16f520..cbaec0f3f 100644
--- a/src/ripple/unity/soci_ripple.cpp
+++ b/src/ripple/unity/soci_ripple.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/core/impl/DummySociDynamicBackend.cpp>
 #include <ripple/core/impl/SociDB.cpp>
diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp
index 638837044..04c00b23b 100644
--- a/src/test/app/AmendmentTable_test.cpp
+++ b/src/test/app/AmendmentTable_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/app/misc/AmendmentTable.h>
 #include <ripple/basics/BasicConfig.h>
diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp
index 777070b77..8929e15d1 100644
--- a/src/test/app/Check_test.cpp
+++ b/src/test/app/Check_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp
index 9331e8760..f05aa3d4d 100644
--- a/src/test/app/CrossingLimits_test.cpp
+++ b/src/test/app/CrossingLimits_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp
index 55245bf75..299b15bb3 100644
--- a/src/test/app/DeliverMin_test.cpp
+++ b/src/test/app/DeliverMin_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp
index 0946bc5b9..5db10bd16 100644
--- a/src/test/app/DepositAuth_test.cpp
+++ b/src/test/app/DepositAuth_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/basics/contract.h>
diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp
index 348fcbe6d..58003ff29 100644
--- a/src/test/app/Discrepancy_test.cpp
+++ b/src/test/app/Discrepancy_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/PathSet.h>
diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp
index c500340a1..d077e600b 100644
--- a/src/test/app/Escrow_test.cpp
+++ b/src/test/app/Escrow_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/app/tx/applySteps.h>
 #include <ripple/ledger/Directory.h>
diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp
index 35bca0903..b655da7dc 100644
--- a/src/test/app/Flow_test.cpp
+++ b/src/test/app/Flow_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/impl/Steps.h>
diff --git a/src/test/app/HashRouter_test.cpp b/src/test/app/HashRouter_test.cpp
index 0247db65c..2803861a7 100644
--- a/src/test/app/HashRouter_test.cpp
+++ b/src/test/app/HashRouter_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/HashRouter.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp
index c51d8ef97..bc5b02b75 100644
--- a/src/test/app/LedgerHistory_test.cpp
+++ b/src/test/app/LedgerHistory_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/LedgerHistory.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/tx/apply.h>
diff --git a/src/test/app/LedgerLoad_test.cpp b/src/test/app/LedgerLoad_test.cpp
index 2f78206d0..a751a6d1e 100644
--- a/src/test/app/LedgerLoad_test.cpp
+++ b/src/test/app/LedgerLoad_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/beast/unit_test.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp
index 76761cedd..d505af709 100644
--- a/src/test/app/LoadFeeTrack_test.cpp
+++ b/src/test/app/LoadFeeTrack_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/core/Config.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp
index e02b4a374..0dde40e98 100644
--- a/src/test/app/MultiSign_test.cpp
+++ b/src/test/app/MultiSign_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>     // jss:: definitions
 #include <ripple/protocol/Feature.h>
 #include <test/jtx.h>
diff --git a/src/test/app/OfferStream_test.cpp b/src/test/app/OfferStream_test.cpp
index f7072faa3..4b407acd4 100644
--- a/src/test/app/OfferStream_test.cpp
+++ b/src/test/app/OfferStream_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/impl/OfferStream.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index 11ff2b0d0..bd30abc9d 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 #include <test/jtx/PathSet.h>
diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp
index 62040198e..a50d13716 100644
--- a/src/test/app/OversizeMeta_test.cpp
+++ b/src/test/app/OversizeMeta_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <algorithm>
diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp
index 13965181c..a62749bea 100644
--- a/src/test/app/Path_test.cpp
+++ b/src/test/app/Path_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/AccountCurrencies.h>
 #include <ripple/basics/contract.h>
 #include <ripple/core/JobQueue.h>
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index be6fd0311..855ec24d6 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/Indexes.h>
diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp
index 14c109fc3..682d0549d 100644
--- a/src/test/app/PayStrand_test.cpp
+++ b/src/test/app/PayStrand_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/RippleCalc.h>
 #include <ripple/app/paths/impl/Steps.h>
diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp
index 541a085d5..cffee4df7 100644
--- a/src/test/app/PseudoTx_test.cpp
+++ b/src/test/app/PseudoTx_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/tx/apply.h>
 #include <ripple/protocol/STAccount.h>
 #include <string>
diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp
index fe5094f4b..0deac4ca5 100644
--- a/src/test/app/RCLValidations_test.cpp
+++ b/src/test/app/RCLValidations_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/consensus/RCLValidations.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/basics/Log.h>
diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp
index b9e9e5fd9..aaacf2f35 100644
--- a/src/test/app/Regression_test.cpp
+++ b/src/test/app/Regression_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
 #include <ripple/app/tx/apply.h>
diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp
index aa1fb07f9..bc4ebfdb2 100644
--- a/src/test/app/SHAMapStore_test.cpp
+++ b/src/test/app/SHAMapStore_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/Application.h>
 #include <ripple/app/misc/SHAMapStore.h>
 #include <ripple/core/ConfigSections.h>
diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp
index 7d2e475c6..d466495cc 100644
--- a/src/test/app/SetAuth_test.cpp
+++ b/src/test/app/SetAuth_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp
index f117d41d5..2bb096688 100644
--- a/src/test/app/Ticket_test.cpp
+++ b/src/test/app/Ticket_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp
index 3108ce7cd..78081357f 100644
--- a/src/test/app/Transaction_ordering_test.cpp
+++ b/src/test/app/Transaction_ordering_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <test/jtx.h>
diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp
index 774ffa719..7c5cb761f 100644
--- a/src/test/app/TrustAndBalance_test.cpp
+++ b/src/test/app/TrustAndBalance_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/test/basics/Buffer_test.cpp b/src/test/basics/Buffer_test.cpp
index 9a29d0d01..c3ee9faec 100644
--- a/src/test/basics/Buffer_test.cpp
+++ b/src/test/basics/Buffer_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Buffer.h>
 #include <ripple/beast/unit_test.h>
 #include <cstdint>
diff --git a/src/test/basics/CheckLibraryVersions_test.cpp b/src/test/basics/CheckLibraryVersions_test.cpp
index 1d7e69f28..5531d8e6c 100644
--- a/src/test/basics/CheckLibraryVersions_test.cpp
+++ b/src/test/basics/CheckLibraryVersions_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/CheckLibraryVersions.h>
 #include <ripple/basics/impl/CheckLibraryVersionsImpl.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/basics/DetectCrash_test.cpp b/src/test/basics/DetectCrash_test.cpp
index 27213db8c..529b2bfa0 100644
--- a/src/test/basics/DetectCrash_test.cpp
+++ b/src/test/basics/DetectCrash_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <beast/unit_test/suite.hpp>
 
 #include <exception>
diff --git a/src/test/basics/KeyCache_test.cpp b/src/test/basics/KeyCache_test.cpp
index 7c4fb6c48..b743b0471 100644
--- a/src/test/basics/KeyCache_test.cpp
+++ b/src/test/basics/KeyCache_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/KeyCache.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/basics/RangeSet_test.cpp b/src/test/basics/RangeSet_test.cpp
index d1d386276..37d933885 100644
--- a/src/test/basics/RangeSet_test.cpp
+++ b/src/test/basics/RangeSet_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/RangeSet.h>
 #include <ripple/beast/unit_test.h>
 #include <boost/archive/binary_iarchive.hpp>
diff --git a/src/test/basics/Slice_test.cpp b/src/test/basics/Slice_test.cpp
index 655b8c790..0d5834824 100644
--- a/src/test/basics/Slice_test.cpp
+++ b/src/test/basics/Slice_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Slice.h>
 #include <ripple/beast/unit_test.h>
 #include <array>
diff --git a/src/test/basics/StringUtilities_test.cpp b/src/test/basics/StringUtilities_test.cpp
index 8380de5b6..ad1634baa 100644
--- a/src/test/basics/StringUtilities_test.cpp
+++ b/src/test/basics/StringUtilities_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Slice.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/basics/ToString.h>
diff --git a/src/test/basics/TaggedCache_test.cpp b/src/test/basics/TaggedCache_test.cpp
index 7595bffca..27e80f933 100644
--- a/src/test/basics/TaggedCache_test.cpp
+++ b/src/test/basics/TaggedCache_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/TaggedCache.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/basics/base_uint_test.cpp b/src/test/basics/base_uint_test.cpp
index 8da8dc25c..726957359 100644
--- a/src/test/basics/base_uint_test.cpp
+++ b/src/test/basics/base_uint_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/base_uint.h>
 #include <ripple/basics/hardened_hash.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/basics/contract_test.cpp b/src/test/basics/contract_test.cpp
index fe822c0fd..57e04979f 100644
--- a/src/test/basics/contract_test.cpp
+++ b/src/test/basics/contract_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/beast/unit_test.h>
 #include <string>
diff --git a/src/test/basics/hardened_hash_test.cpp b/src/test/basics/hardened_hash_test.cpp
index 4ecd6e214..2469f5b86 100644
--- a/src/test/basics/hardened_hash_test.cpp
+++ b/src/test/basics/hardened_hash_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/hardened_hash.h>
 #include <ripple/beast/unit_test.h>
 #include <boost/functional/hash.hpp>
diff --git a/src/test/basics/mulDiv_test.cpp b/src/test/basics/mulDiv_test.cpp
index 3a7ca6d6b..622fb0dda 100644
--- a/src/test/basics/mulDiv_test.cpp
+++ b/src/test/basics/mulDiv_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/mulDiv.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/basics/tagged_integer_test.cpp b/src/test/basics/tagged_integer_test.cpp
index 1a86b45ba..ca083a79c 100644
--- a/src/test/basics/tagged_integer_test.cpp
+++ b/src/test/basics/tagged_integer_test.cpp
@@ -18,7 +18,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/tagged_integer.h>
 #include <ripple/beast/unit_test.h>
 #include <type_traits>
diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp
index 7b91f5153..61a66bd18 100644
--- a/src/test/beast/IPEndpoint_test.cpp
+++ b/src/test/beast/IPEndpoint_test.cpp
@@ -20,7 +20,6 @@
 // MODULES: ../impl/IPEndpoint.cpp ../impl/IPAddressV4.cpp ../impl/IPAddressV6.cpp
 
 #if BEAST_INCLUDE_BEASTCONFIG
-#include "../../BeastConfig.h"
 #endif
 
 #include <ripple/beast/net/IPEndpoint.h>
diff --git a/src/test/beast/beast_CurrentThreadName_test.cpp b/src/test/beast/beast_CurrentThreadName_test.cpp
index 7b5055354..c3a29014f 100644
--- a/src/test/beast/beast_CurrentThreadName_test.cpp
+++ b/src/test/beast/beast_CurrentThreadName_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/beast/core/CurrentThreadName.h>
 #include <ripple/beast/unit_test.h>
 #include <atomic>
diff --git a/src/test/consensus/ByzantineFailureSim_test.cpp b/src/test/consensus/ByzantineFailureSim_test.cpp
index e05ea7b47..a3857cf85 100644
--- a/src/test/consensus/ByzantineFailureSim_test.cpp
+++ b/src/test/consensus/ByzantineFailureSim_test.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/beast/clock/manual_clock.h>
 #include <ripple/beast/unit_test.h>
 #include <test/csf.h>
diff --git a/src/test/consensus/Consensus_test.cpp b/src/test/consensus/Consensus_test.cpp
index 93bf57bd0..da3c7fa4d 100644
--- a/src/test/consensus/Consensus_test.cpp
+++ b/src/test/consensus/Consensus_test.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/beast/clock/manual_clock.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/consensus/Consensus.h>
diff --git a/src/test/consensus/DistributedValidatorsSim_test.cpp b/src/test/consensus/DistributedValidatorsSim_test.cpp
index 2423f9e65..558ead706 100644
--- a/src/test/consensus/DistributedValidatorsSim_test.cpp
+++ b/src/test/consensus/DistributedValidatorsSim_test.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/beast/clock/manual_clock.h>
 #include <ripple/beast/unit_test.h>
 #include <test/csf.h>
diff --git a/src/test/consensus/LedgerTiming_test.cpp b/src/test/consensus/LedgerTiming_test.cpp
index 8c036ab9d..0839d9899 100644
--- a/src/test/consensus/LedgerTiming_test.cpp
+++ b/src/test/consensus/LedgerTiming_test.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/consensus/LedgerTiming.h>
 
@@ -127,4 +126,4 @@ class LedgerTiming_test : public beast::unit_test::suite
 
 BEAST_DEFINE_TESTSUITE(LedgerTiming, consensus, ripple);
 } // test
-} // ripple
\ No newline at end of file
+} // ripple
diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp
index 651bf1038..2708ff80d 100644
--- a/src/test/consensus/LedgerTrie_test.cpp
+++ b/src/test/consensus/LedgerTrie_test.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/consensus/LedgerTrie.h>
 #include <test/csf/ledgers.h>
diff --git a/src/test/consensus/ScaleFreeSim_test.cpp b/src/test/consensus/ScaleFreeSim_test.cpp
index 79d268dac..700f4a3ca 100644
--- a/src/test/consensus/ScaleFreeSim_test.cpp
+++ b/src/test/consensus/ScaleFreeSim_test.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/beast/clock/manual_clock.h>
 #include <ripple/beast/unit_test.h>
 #include <test/csf.h>
diff --git a/src/test/consensus/Validations_test.cpp b/src/test/consensus/Validations_test.cpp
index 4301a3bbd..c4c1517c4 100644
--- a/src/test/consensus/Validations_test.cpp
+++ b/src/test/consensus/Validations_test.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <ripple/basics/tagged_integer.h>
 #include <ripple/beast/clock/manual_clock.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp
index 406cac47a..bd5612501 100644
--- a/src/test/core/ClosureCounter_test.cpp
+++ b/src/test/core/ClosureCounter_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/ClosureCounter.h>
 #include <ripple/beast/unit_test.h>
 #include <test/jtx/Env.h>
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index abc1a5199..54a4f409e 100644
--- a/src/test/core/Config_test.cpp
+++ b/src/test/core/Config_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/core/Config.h>
 #include <ripple/core/ConfigSections.h>
diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp
index 27ef08ef3..a6c0c436c 100644
--- a/src/test/core/Coroutine_test.cpp
+++ b/src/test/core/Coroutine_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
 #include <test/jtx.h>
 #include <chrono>
diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp
index 11f355dd6..ec8c72d53 100644
--- a/src/test/core/JobQueue_test.cpp
+++ b/src/test/core/JobQueue_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/beast/unit_test.h>
 #include <test/jtx/Env.h>
diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp
index 66033c4ef..988113cd5 100644
--- a/src/test/core/SociDB_test.cpp
+++ b/src/test/core/SociDB_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <ripple/core/ConfigSections.h>
 #include <ripple/core/SociDB.h>
diff --git a/src/test/core/TerminateHandler_test.cpp b/src/test/core/TerminateHandler_test.cpp
index 003e55e04..e9dc4f737 100644
--- a/src/test/core/TerminateHandler_test.cpp
+++ b/src/test/core/TerminateHandler_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/TerminateHandler.h>
 #include <ripple/beast/core/CurrentThreadName.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/csf/BasicNetwork_test.cpp b/src/test/csf/BasicNetwork_test.cpp
index 808c8a9ec..1f93067e5 100644
--- a/src/test/csf/BasicNetwork_test.cpp
+++ b/src/test/csf/BasicNetwork_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/beast/unit_test.h>
 #include <set>
 #include <test/csf/BasicNetwork.h>
diff --git a/src/test/csf/Digraph_test.cpp b/src/test/csf/Digraph_test.cpp
index c86ba7f95..b2735b9bd 100644
--- a/src/test/csf/Digraph_test.cpp
+++ b/src/test/csf/Digraph_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/beast/unit_test.h>
 #include <test/csf/Digraph.h>
 #include <vector>
diff --git a/src/test/csf/Histogram_test.cpp b/src/test/csf/Histogram_test.cpp
index 65abc138f..66cdc2597 100644
--- a/src/test/csf/Histogram_test.cpp
+++ b/src/test/csf/Histogram_test.cpp
@@ -18,7 +18,6 @@
 //==============================================================================
 
 
-#include <BeastConfig.h>
 #include <ripple/beast/unit_test.h>
 #include <test/csf/Histogram.h>
 
diff --git a/src/test/csf/Scheduler_test.cpp b/src/test/csf/Scheduler_test.cpp
index fd58a7441..40187060f 100644
--- a/src/test/csf/Scheduler_test.cpp
+++ b/src/test/csf/Scheduler_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/beast/unit_test.h>
 #include <test/csf/Scheduler.h>
 #include <set>
diff --git a/src/test/csf/impl/Sim.cpp b/src/test/csf/impl/Sim.cpp
index bb3bb1a78..c8f5e50a4 100644
--- a/src/test/csf/impl/Sim.cpp
+++ b/src/test/csf/impl/Sim.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <test/csf/Sim.h>
 
 namespace ripple {
diff --git a/src/test/csf/impl/ledgers.cpp b/src/test/csf/impl/ledgers.cpp
index 1fffb9025..f3a9e032f 100644
--- a/src/test/csf/impl/ledgers.cpp
+++ b/src/test/csf/impl/ledgers.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <test/csf/ledgers.h>
 #include <algorithm>
 
diff --git a/src/test/json/Object_test.cpp b/src/test/json/Object_test.cpp
index 729224731..eab87b540 100644
--- a/src/test/json/Object_test.cpp
+++ b/src/test/json/Object_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/Object.h>
 #include <test/json/TestOutputSuite.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/json/Output_test.cpp b/src/test/json/Output_test.cpp
index 6adf2fb24..b1544df4b 100644
--- a/src/test/json/Output_test.cpp
+++ b/src/test/json/Output_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/json/json_writer.h>
 #include <test/json/TestOutputSuite.h>
diff --git a/src/test/json/Writer_test.cpp b/src/test/json/Writer_test.cpp
index 80159208a..ced65f6fc 100644
--- a/src/test/json/Writer_test.cpp
+++ b/src/test/json/Writer_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_writer.h>
 #include <ripple/json/Writer.h>
 #include <test/json/TestOutputSuite.h>
diff --git a/src/test/json/json_value_test.cpp b/src/test/json/json_value_test.cpp
index c5e70f15a..67b53f32c 100644
--- a/src/test/json/json_value_test.cpp
+++ b/src/test/json/json_value_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/json/json_value.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/json/json_writer.h>
diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp
index 1bf13b036..63fbc788c 100644
--- a/src/test/jtx/Env_test.cpp
+++ b/src/test/jtx/Env_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <test/jtx.h>
 #include <ripple/json/to_string.h>
diff --git a/src/test/jtx/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp
index 910166968..85c6b06b5 100644
--- a/src/test/jtx/WSClient_test.cpp
+++ b/src/test/jtx/WSClient_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/WSClient.h>
 #include <test/jtx.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp
index a0ee21508..cf820c7f5 100644
--- a/src/test/jtx/impl/Account.cpp
+++ b/src/test/jtx/impl/Account.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 #include <ripple/protocol/types.h>
diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp
index 37b034c13..f10e1d59a 100644
--- a/src/test/jtx/impl/Env.cpp
+++ b/src/test/jtx/impl/Env.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/balance.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/fee.h>
diff --git a/src/test/jtx/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp
index a09fa7af4..9c54a2cc9 100644
--- a/src/test/jtx/impl/JSONRPCClient.cpp
+++ b/src/test/jtx/impl/JSONRPCClient.cpp
@@ -16,7 +16,6 @@
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
-#include <BeastConfig.h>
 #include <test/jtx/JSONRPCClient.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/json/to_string.h>
diff --git a/src/test/jtx/impl/ManualTimeKeeper.cpp b/src/test/jtx/impl/ManualTimeKeeper.cpp
index 48c81f4cf..08d00bf62 100644
--- a/src/test/jtx/impl/ManualTimeKeeper.cpp
+++ b/src/test/jtx/impl/ManualTimeKeeper.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/ManualTimeKeeper.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp
index 9f5de744b..9c468c86a 100644
--- a/src/test/jtx/impl/WSClient.cpp
+++ b/src/test/jtx/impl/WSClient.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/WSClient.h>
 #include <test/jtx.h>
 #include <ripple/json/json_reader.h>
diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp
index fefa1a8c3..9e9cb155a 100644
--- a/src/test/jtx/impl/amount.cpp
+++ b/src/test/jtx/impl/amount.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 #include <cassert>
diff --git a/src/test/jtx/impl/balance.cpp b/src/test/jtx/impl/balance.cpp
index c0e4f502d..d4918e8cb 100644
--- a/src/test/jtx/impl/balance.cpp
+++ b/src/test/jtx/impl/balance.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/balance.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/delivermin.cpp b/src/test/jtx/impl/delivermin.cpp
index 8589a5a7a..b990efb7a 100644
--- a/src/test/jtx/impl/delivermin.cpp
+++ b/src/test/jtx/impl/delivermin.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/delivermin.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/fee.cpp b/src/test/jtx/impl/fee.cpp
index 7b31539d4..1d7c12246 100644
--- a/src/test/jtx/impl/fee.cpp
+++ b/src/test/jtx/impl/fee.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/fee.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp
index c292233bc..ba41afd52 100644
--- a/src/test/jtx/impl/flags.cpp
+++ b/src/test/jtx/impl/flags.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/flags.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/jtx_json.cpp b/src/test/jtx/impl/jtx_json.cpp
index 9e1a16b43..06694f7db 100644
--- a/src/test/jtx/impl/jtx_json.cpp
+++ b/src/test/jtx/impl/jtx_json.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/jtx_json.h>
 #include <test/jtx/utility.h>
 #include <ripple/json/json_reader.h>
diff --git a/src/test/jtx/impl/memo.cpp b/src/test/jtx/impl/memo.cpp
index bf8f4a747..c841aaa07 100644
--- a/src/test/jtx/impl/memo.cpp
+++ b/src/test/jtx/impl/memo.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/memo.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/test/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp
index a637c2d98..82c72ef2b 100644
--- a/src/test/jtx/impl/multisign.cpp
+++ b/src/test/jtx/impl/multisign.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/multisign.h>
 #include <test/jtx/utility.h>
 #include <ripple/protocol/HashPrefix.h>
diff --git a/src/test/jtx/impl/offer.cpp b/src/test/jtx/impl/offer.cpp
index 700af15a5..d319e5c9d 100644
--- a/src/test/jtx/impl/offer.cpp
+++ b/src/test/jtx/impl/offer.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/offer.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/owners.cpp b/src/test/jtx/impl/owners.cpp
index 87348b1be..88d6517c3 100644
--- a/src/test/jtx/impl/owners.cpp
+++ b/src/test/jtx/impl/owners.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/owners.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/paths.cpp b/src/test/jtx/impl/paths.cpp
index 9a0aa33f7..4d1655c91 100644
--- a/src/test/jtx/impl/paths.cpp
+++ b/src/test/jtx/impl/paths.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/paths/Pathfinder.h>
 #include <test/jtx/paths.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/test/jtx/impl/pay.cpp b/src/test/jtx/impl/pay.cpp
index 23b8a54b7..56611213d 100644
--- a/src/test/jtx/impl/pay.cpp
+++ b/src/test/jtx/impl/pay.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/pay.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/TxFlags.h>
diff --git a/src/test/jtx/impl/quality2.cpp b/src/test/jtx/impl/quality2.cpp
index 5b0ab49f4..7e15876fb 100644
--- a/src/test/jtx/impl/quality2.cpp
+++ b/src/test/jtx/impl/quality2.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/quality.h>
 #include <ripple/protocol/SField.h>
 #include <ripple/protocol/Quality.h>
diff --git a/src/test/jtx/impl/rate.cpp b/src/test/jtx/impl/rate.cpp
index 534bba3f9..cdec3134c 100644
--- a/src/test/jtx/impl/rate.cpp
+++ b/src/test/jtx/impl/rate.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/rate.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/basics/contract.h>
diff --git a/src/test/jtx/impl/regkey.cpp b/src/test/jtx/impl/regkey.cpp
index 3e96f1921..bbd4ef7e7 100644
--- a/src/test/jtx/impl/regkey.cpp
+++ b/src/test/jtx/impl/regkey.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/regkey.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/sendmax.cpp b/src/test/jtx/impl/sendmax.cpp
index 82f32a89e..75acbbd7f 100644
--- a/src/test/jtx/impl/sendmax.cpp
+++ b/src/test/jtx/impl/sendmax.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/sendmax.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/seq.cpp b/src/test/jtx/impl/seq.cpp
index 08b994767..9115d1c73 100644
--- a/src/test/jtx/impl/seq.cpp
+++ b/src/test/jtx/impl/seq.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/seq.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/sig.cpp b/src/test/jtx/impl/sig.cpp
index a3dd797af..04b546c31 100644
--- a/src/test/jtx/impl/sig.cpp
+++ b/src/test/jtx/impl/sig.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/sig.h>
 #include <test/jtx/utility.h>
 
diff --git a/src/test/jtx/impl/tag.cpp b/src/test/jtx/impl/tag.cpp
index a8d0bc451..5219b32c9 100644
--- a/src/test/jtx/impl/tag.cpp
+++ b/src/test/jtx/impl/tag.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/tag.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/ticket.cpp b/src/test/jtx/impl/ticket.cpp
index 68e8213ec..addb6a25e 100644
--- a/src/test/jtx/impl/ticket.cpp
+++ b/src/test/jtx/impl/ticket.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/ticket.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/trust.cpp b/src/test/jtx/impl/trust.cpp
index 508fa21b6..48d8ec6e0 100644
--- a/src/test/jtx/impl/trust.cpp
+++ b/src/test/jtx/impl/trust.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/trust.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/basics/contract.h>
diff --git a/src/test/jtx/impl/txflags.cpp b/src/test/jtx/impl/txflags.cpp
index 7a2faa579..a771106d3 100644
--- a/src/test/jtx/impl/txflags.cpp
+++ b/src/test/jtx/impl/txflags.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/txflags.h>
 #include <ripple/protocol/JsonFields.h>
 
diff --git a/src/test/jtx/impl/utility.cpp b/src/test/jtx/impl/utility.cpp
index 26b233a4c..9eae7ad4d 100644
--- a/src/test/jtx/impl/utility.cpp
+++ b/src/test/jtx/impl/utility.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx/utility.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/HashPrefix.h>
diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp
index ede079368..f9781f29f 100644
--- a/src/test/ledger/BookDirs_test.cpp
+++ b/src/test/ledger/BookDirs_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/ledger/BookDirs.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/test/ledger/CashDiff_test.cpp b/src/test/ledger/CashDiff_test.cpp
index b8e33fab7..c7a73f6d2 100644
--- a/src/test/ledger/CashDiff_test.cpp
+++ b/src/test/ledger/CashDiff_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/CashDiff.h>
 #include <ripple/protocol/STAmount.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/ledger/Invariants_test.cpp b/src/test/ledger/Invariants_test.cpp
index c59d9de0c..c2ecc5451 100644
--- a/src/test/ledger/Invariants_test.cpp
+++ b/src/test/ledger/Invariants_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <ripple/beast/utility/Journal.h>
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index 4f894972f..46fd42bec 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/ledger/ApplyViewImpl.h>
 #include <ripple/ledger/PaymentSandbox.h>
 #include <test/jtx/PathSet.h>
diff --git a/src/test/ledger/PendingSaves_test.cpp b/src/test/ledger/PendingSaves_test.cpp
index 549f74e74..e0479ff86 100644
--- a/src/test/ledger/PendingSaves_test.cpp
+++ b/src/test/ledger/PendingSaves_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/PendingSaves.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/ledger/SHAMapV2_test.cpp b/src/test/ledger/SHAMapV2_test.cpp
index 64228694c..259d87bc1 100644
--- a/src/test/ledger/SHAMapV2_test.cpp
+++ b/src/test/ledger/SHAMapV2_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <test/jtx.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp
index 90972adfa..663bb0eac 100644
--- a/src/test/ledger/SkipList_test.cpp
+++ b/src/test/ledger/SkipList_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/basics/Log.h>
 #include <ripple/ledger/View.h>
diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp
index 2c5d8f2fb..dec4a0ab6 100644
--- a/src/test/ledger/View_test.cpp
+++ b/src/test/ledger/View_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/app/ledger/Ledger.h>
 #include <ripple/ledger/ApplyViewImpl.h>
diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp
index 15fbe0787..5e1a62f58 100644
--- a/src/test/nodestore/Backend_test.cpp
+++ b/src/test/nodestore/Backend_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/unity/rocksdb.h>
 #include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp
index d361c42a3..0fcebc122 100644
--- a/src/test/nodestore/Basics_test.cpp
+++ b/src/test/nodestore/Basics_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp
index e87d9bd66..10168f0f1 100644
--- a/src/test/nodestore/Database_test.cpp
+++ b/src/test/nodestore/Database_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index b62bd7d3b..f674833d3 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/nodestore/TestBase.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp
index ad1930f43..bc72a7ae9 100644
--- a/src/test/nodestore/import_test.cpp
+++ b/src/test/nodestore/import_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/nodestore/impl/codec.h>
 #include <ripple/beast/clock/basic_seconds_clock.h>
diff --git a/src/test/overlay/TMHello_test.cpp b/src/test/overlay/TMHello_test.cpp
index 1b1b2fa29..32ca68074 100644
--- a/src/test/overlay/TMHello_test.cpp
+++ b/src/test/overlay/TMHello_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/overlay/impl/TMHello.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp
index 71244c009..897c16614 100644
--- a/src/test/overlay/cluster_test.cpp
+++ b/src/test/overlay/cluster_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/BasicConfig.h>
 #include <test/jtx/TestSuite.h>
 #include <ripple/overlay/Cluster.h>
diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp
index 80c111913..688a7e65a 100644
--- a/src/test/overlay/short_read_test.cpp
+++ b/src/test/overlay/short_read_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/make_SSLContext.h>
 #include <ripple/beast/core/CurrentThreadName.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp
index 03fe78f7a..6f40fe1ed 100644
--- a/src/test/peerfinder/Livecache_test.cpp
+++ b/src/test/peerfinder/Livecache_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/peerfinder/impl/Livecache.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp
index c64227792..494e8173a 100644
--- a/src/test/peerfinder/PeerFinder_test.cpp
+++ b/src/test/peerfinder/PeerFinder_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/Slice.h>
 #include <ripple/protocol/PublicKey.h>
diff --git a/src/test/protocol/BuildInfo_test.cpp b/src/test/protocol/BuildInfo_test.cpp
index c0817b90d..cc42621cc 100644
--- a/src/test/protocol/BuildInfo_test.cpp
+++ b/src/test/protocol/BuildInfo_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/beast/core/SemanticVersion.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/protocol/IOUAmount_test.cpp b/src/test/protocol/IOUAmount_test.cpp
index ea360ab6a..77fea38c0 100644
--- a/src/test/protocol/IOUAmount_test.cpp
+++ b/src/test/protocol/IOUAmount_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/IOUAmount.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/protocol/InnerObjectFormats_test.cpp b/src/test/protocol/InnerObjectFormats_test.cpp
index f17dc80c5..4a0ae6b25 100644
--- a/src/test/protocol/InnerObjectFormats_test.cpp
+++ b/src/test/protocol/InnerObjectFormats_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/protocol/InnerObjectFormats.h>
 #include <ripple/protocol/ErrorCodes.h>          // RPC::containsError
diff --git a/src/test/protocol/Issue_test.cpp b/src/test/protocol/Issue_test.cpp
index 3acf46b0b..f3ea95fe6 100644
--- a/src/test/protocol/Issue_test.cpp
+++ b/src/test/protocol/Issue_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/UnorderedContainers.h>
 #include <ripple/protocol/Book.h>
 #include <ripple/protocol/Issue.h>
diff --git a/src/test/protocol/PublicKey_test.cpp b/src/test/protocol/PublicKey_test.cpp
index 1a3ff40b1..954f4680d 100644
--- a/src/test/protocol/PublicKey_test.cpp
+++ b/src/test/protocol/PublicKey_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/SecretKey.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/protocol/Quality_test.cpp b/src/test/protocol/Quality_test.cpp
index fc92ce1a1..39776bda9 100644
--- a/src/test/protocol/Quality_test.cpp
+++ b/src/test/protocol/Quality_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Quality.h>
 #include <ripple/beast/unit_test.h>
 #include <type_traits>
diff --git a/src/test/protocol/STAccount_test.cpp b/src/test/protocol/STAccount_test.cpp
index a63ba681c..abeb3fd3e 100644
--- a/src/test/protocol/STAccount_test.cpp
+++ b/src/test/protocol/STAccount_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/STAccount.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/protocol/STAmount_test.cpp b/src/test/protocol/STAmount_test.cpp
index 33fe1c0b9..58f6282ab 100644
--- a/src/test/protocol/STAmount_test.cpp
+++ b/src/test/protocol/STAmount_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/random.h>
 #include <ripple/protocol/STAmount.h>
diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp
index 4ab578de4..befae933a 100644
--- a/src/test/protocol/STObject_test.cpp
+++ b/src/test/protocol/STObject_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/SecretKey.h>
diff --git a/src/test/protocol/STTx_test.cpp b/src/test/protocol/STTx_test.cpp
index d20a9db0f..62ef9cd58 100644
--- a/src/test/protocol/STTx_test.cpp
+++ b/src/test/protocol/STTx_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Sign.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/STParsedJSON.h>
diff --git a/src/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp
index f31c13595..09b6410d4 100644
--- a/src/test/protocol/STValidation_test.cpp
+++ b/src/test/protocol/STValidation_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/SecretKey.h>
diff --git a/src/test/protocol/SecretKey_test.cpp b/src/test/protocol/SecretKey_test.cpp
index 47f4d81cf..ad9f34891 100644
--- a/src/test/protocol/SecretKey_test.cpp
+++ b/src/test/protocol/SecretKey_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/crypto/csprng.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/SecretKey.h>
diff --git a/src/test/protocol/Seed_test.cpp b/src/test/protocol/Seed_test.cpp
index f397f2f75..e8b695ecf 100644
--- a/src/test/protocol/Seed_test.cpp
+++ b/src/test/protocol/Seed_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/random.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/SecretKey.h>
diff --git a/src/test/protocol/TER_test.cpp b/src/test/protocol/TER_test.cpp
index 77949d0c3..4cbaa0f68 100644
--- a/src/test/protocol/TER_test.cpp
+++ b/src/test/protocol/TER_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/TER.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/protocol/XRPAmount_test.cpp b/src/test/protocol/XRPAmount_test.cpp
index ca2ad12ab..07a9676ef 100644
--- a/src/test/protocol/XRPAmount_test.cpp
+++ b/src/test/protocol/XRPAmount_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/XRPAmount.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/protocol/digest_test.cpp b/src/test/protocol/digest_test.cpp
index 7e6cc46d3..690a18d1a 100644
--- a/src/test/protocol/digest_test.cpp
+++ b/src/test/protocol/digest_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/digest.h>
 #include <ripple/beast/utility/rngfill.h>
 #include <ripple/beast/xor_shift_engine.h>
diff --git a/src/test/protocol/types_test.cpp b/src/test/protocol/types_test.cpp
index c04541e8c..a7eff4260 100644
--- a/src/test/protocol/types_test.cpp
+++ b/src/test/protocol/types_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/types.h>
 #include <ripple/beast/unit_test.h>
 
diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp
index 7199b4542..0efbd97e6 100644
--- a/src/test/resource/Logic_test.cpp
+++ b/src/test/resource/Logic_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/random.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/rpc/AccountLinesRPC_test.cpp b/src/test/rpc/AccountLinesRPC_test.cpp
index c7e2dc3b8..1c59b6a25 100644
--- a/src/test/rpc/AccountLinesRPC_test.cpp
+++ b/src/test/rpc/AccountLinesRPC_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/TxFlags.h>
diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp
index 93ef81716..985c4d75a 100644
--- a/src/test/rpc/Book_test.cpp
+++ b/src/test/rpc/Book_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/protocol/Indexes.h>
 #include <test/jtx/WSClient.h>
diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp
index e5cb35bc5..87b09cdbe 100644
--- a/src/test/rpc/Feature_test.cpp
+++ b/src/test/rpc/Feature_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <test/jtx.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp
index 04cfa71bd..34959b5fb 100644
--- a/src/test/rpc/GatewayBalances_test.cpp
+++ b/src/test/rpc/GatewayBalances_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/JsonFields.h>
 #include <test/jtx/WSClient.h>
diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp
index 90b5e66ec..52c26732f 100644
--- a/src/test/rpc/JSONRPC_test.cpp
+++ b/src/test/rpc/JSONRPC_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/app/misc/TxQ.h>
 #include <ripple/basics/contract.h>
diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp
index 0924f83c8..8e0ba7b6b 100644
--- a/src/test/rpc/KeyGeneration_test.cpp
+++ b/src/test/rpc/KeyGeneration_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/StringUtilities.h>
 #include <test/jtx/TestSuite.h>
 #include <ripple/json/json_value.h>
diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp
index 3f28b079b..1dec0225b 100644
--- a/src/test/rpc/LedgerRPC_test.cpp
+++ b/src/test/rpc/LedgerRPC_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/misc/TxQ.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/Feature.h>
diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp
index 1ad630497..990d3c1ab 100644
--- a/src/test/rpc/LedgerRequestRPC_test.cpp
+++ b/src/test/rpc/LedgerRequestRPC_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/JsonFields.h>
 #include <test/jtx.h>
diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp
index efb3d37c3..cdf6a364a 100644
--- a/src/test/rpc/RPCOverload_test.cpp
+++ b/src/test/rpc/RPCOverload_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>
 #include <test/jtx/WSClient.h>
 #include <test/jtx/JSONRPCClient.h>
diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp
index 7c2f9c1bd..930564a3e 100644
--- a/src/test/rpc/RobustTransaction_test.cpp
+++ b/src/test/rpc/RobustTransaction_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/protocol/JsonFields.h>
 #include <test/jtx.h>
diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp
index bb032a63f..c9130f9f7 100644
--- a/src/test/rpc/ServerInfo_test.cpp
+++ b/src/test/rpc/ServerInfo_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/protocol/JsonFields.h>
 #include <test/jtx.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp
index 41851f1bc..5272efac5 100644
--- a/src/test/rpc/Status_test.cpp
+++ b/src/test/rpc/Status_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/rpc/Status.h>
 #include <ripple/basics/contract.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp
index e4b34e392..9b8b0a51b 100644
--- a/src/test/rpc/Subscribe_test.cpp
+++ b/src/test/rpc/Subscribe_test.cpp
@@ -15,7 +15,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/LoadManager.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/app/misc/NetworkOPs.h>
diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp
index 8a1bbe351..be6761ec1 100644
--- a/src/test/rpc/ValidatorRPC_test.cpp
+++ b/src/test/rpc/ValidatorRPC_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/app/main/BasicApp.h>
 #include <ripple/app/misc/ValidatorSite.h>
 #include <ripple/beast/unit_test.h>
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index cf9c484f7..8a65547ee 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/rpc/ServerHandler.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/app/misc/LoadFeeTrack.h>
diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp
index f3e18de9f..c9f1189f3 100644
--- a/src/test/server/Server_test.cpp
+++ b/src/test/server/Server_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/basics/make_SSLContext.h>
 #include <ripple/beast/rfc2616.h>
 #include <ripple/server/Server.h>
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index bcc794ea7..c1ef616e2 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/shamap/SHAMap.h>
 #include <test/shamap/common.h>
 #include <ripple/protocol/digest.h>
diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp
index d105bdd97..174bc060d 100644
--- a/src/test/shamap/SHAMapSync_test.cpp
+++ b/src/test/shamap/SHAMapSync_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/shamap/SHAMap.h>
 #include <ripple/shamap/SHAMapItem.h>
 #include <test/shamap/common.h>
diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp
index 4f7f85027..516e2b0d2 100644
--- a/src/test/shamap/SHAMap_test.cpp
+++ b/src/test/shamap/SHAMap_test.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 #include <ripple/shamap/SHAMap.h>
 #include <test/shamap/common.h>
 #include <ripple/basics/Blob.h>
diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h
index 7f4aeafce..98698706f 100644
--- a/src/test/shamap/common.h
+++ b/src/test/shamap/common.h
@@ -20,7 +20,6 @@
 #ifndef RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED
 #define RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED
 
-#include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/nodestore/DatabaseShard.h>
 #include <ripple/nodestore/DummyScheduler.h>
diff --git a/src/test/unity/csf_unity.cpp b/src/test/unity/csf_unity.cpp
index 71bd173ce..398a9f010 100644
--- a/src/test/unity/csf_unity.cpp
+++ b/src/test/unity/csf_unity.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <test/csf/Digraph_test.cpp>
 #include <test/csf/Histogram_test.cpp>
diff --git a/src/test/unity/jtx_unity1.cpp b/src/test/unity/jtx_unity1.cpp
index 037b90dae..178ab9913 100644
--- a/src/test/unity/jtx_unity1.cpp
+++ b/src/test/unity/jtx_unity1.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <test/jtx/Env_test.cpp>
 #include <test/jtx/WSClient_test.cpp>
diff --git a/src/test/unity/jtx_unity2.cpp b/src/test/unity/jtx_unity2.cpp
index a2be737f9..36313924c 100644
--- a/src/test/unity/jtx_unity2.cpp
+++ b/src/test/unity/jtx_unity2.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-#include <BeastConfig.h>
 
 #include <test/jtx/impl/offer.cpp>
 #include <test/jtx/impl/owners.cpp>