diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
index c806bfb7da..710e4e9674 100644
--- a/src/ripple/app/main/Main.cpp
+++ b/src/ripple/app/main/Main.cpp
@@ -35,7 +35,7 @@
 #include <ripple/rpc/RPCHandler.h>
 
 #ifdef ENABLE_TESTS
-#include <ripple/beast/unit_test/match.hpp>
+#include <ripple/beast/unit_test/match.h>
 #include <test/unit_test/multi_runner.h>
 #endif  // ENABLE_TESTS
 
diff --git a/src/ripple/app/paths/AMMLiquidity.h b/src/ripple/app/paths/AMMLiquidity.h
index f1be112b2d..60155dbf13 100644
--- a/src/ripple/app/paths/AMMLiquidity.h
+++ b/src/ripple/app/paths/AMMLiquidity.h
@@ -20,14 +20,14 @@
 #ifndef RIPPLE_APP_TX_AMMLIQUIDITY_H_INCLUDED
 #define RIPPLE_APP_TX_AMMLIQUIDITY_H_INCLUDED
 
-#include "ripple/app/misc/AMMHelpers.h"
-#include "ripple/app/misc/AMMUtils.h"
-#include "ripple/app/paths/AMMContext.h"
-#include "ripple/basics/Log.h"
-#include "ripple/ledger/ReadView.h"
-#include "ripple/ledger/View.h"
-#include "ripple/protocol/Quality.h"
-#include "ripple/protocol/STLedgerEntry.h"
+#include <ripple/app/misc/AMMHelpers.h>
+#include <ripple/app/misc/AMMUtils.h>
+#include <ripple/app/paths/AMMContext.h>
+#include <ripple/basics/Log.h>
+#include <ripple/ledger/ReadView.h>
+#include <ripple/ledger/View.h>
+#include <ripple/protocol/Quality.h>
+#include <ripple/protocol/STLedgerEntry.h>
 
 namespace ripple {
 
diff --git a/src/ripple/beast/unit_test.h b/src/ripple/beast/unit_test.h
index b80c188def..70747ea341 100644
--- a/src/ripple/beast/unit_test.h
+++ b/src/ripple/beast/unit_test.h
@@ -20,16 +20,16 @@
 #ifndef BEAST_UNIT_TEST_H_INCLUDED
 #define BEAST_UNIT_TEST_H_INCLUDED
 
-#include <ripple/beast/unit_test/amount.hpp>
-#include <ripple/beast/unit_test/global_suites.hpp>
-#include <ripple/beast/unit_test/match.hpp>
-#include <ripple/beast/unit_test/recorder.hpp>
-#include <ripple/beast/unit_test/reporter.hpp>
-#include <ripple/beast/unit_test/results.hpp>
-#include <ripple/beast/unit_test/runner.hpp>
-#include <ripple/beast/unit_test/suite.hpp>
-#include <ripple/beast/unit_test/suite_info.hpp>
-#include <ripple/beast/unit_test/suite_list.hpp>
+#include <ripple/beast/unit_test/amount.h>
+#include <ripple/beast/unit_test/global_suites.h>
+#include <ripple/beast/unit_test/match.h>
+#include <ripple/beast/unit_test/recorder.h>
+#include <ripple/beast/unit_test/reporter.h>
+#include <ripple/beast/unit_test/results.h>
+#include <ripple/beast/unit_test/runner.h>
+#include <ripple/beast/unit_test/suite.h>
+#include <ripple/beast/unit_test/suite_info.h>
+#include <ripple/beast/unit_test/suite_list.h>
 
 #ifndef BEAST_EXPECT
 #define BEAST_EXPECT_S1(x) #x
diff --git a/src/ripple/beast/unit_test/global_suites.h b/src/ripple/beast/unit_test/global_suites.h
index d1ee4d1773..3fcdcc052b 100644
--- a/src/ripple/beast/unit_test/global_suites.h
+++ b/src/ripple/beast/unit_test/global_suites.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
 #define BEAST_UNIT_TEST_GLOBAL_SUITES_HPP
 
-#include <ripple/beast/unit_test/suite_list.hpp>
+#include <ripple/beast/unit_test/suite_list.h>
 
 namespace beast {
 namespace unit_test {
diff --git a/src/ripple/beast/unit_test/match.h b/src/ripple/beast/unit_test/match.h
index e5b341b338..306bc56998 100644
--- a/src/ripple/beast/unit_test/match.h
+++ b/src/ripple/beast/unit_test/match.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_MATCH_HPP
 #define BEAST_UNIT_TEST_MATCH_HPP
 
-#include <ripple/beast/unit_test/suite_info.hpp>
+#include <ripple/beast/unit_test/suite_info.h>
 #include <string>
 
 namespace beast {
diff --git a/src/ripple/beast/unit_test/recorder.h b/src/ripple/beast/unit_test/recorder.h
index 5aa1f71249..439e194c33 100644
--- a/src/ripple/beast/unit_test/recorder.h
+++ b/src/ripple/beast/unit_test/recorder.h
@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_RECORDER_HPP
 #define BEAST_UNIT_TEST_RECORDER_HPP
 
-#include <ripple/beast/unit_test/results.hpp>
-#include <ripple/beast/unit_test/runner.hpp>
+#include <ripple/beast/unit_test/results.h>
+#include <ripple/beast/unit_test/runner.h>
 
 namespace beast {
 namespace unit_test {
diff --git a/src/ripple/beast/unit_test/reporter.h b/src/ripple/beast/unit_test/reporter.h
index a61ff0460c..76b65a8b1e 100644
--- a/src/ripple/beast/unit_test/reporter.h
+++ b/src/ripple/beast/unit_test/reporter.h
@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_REPORTER_HPP
 #define BEAST_UNIT_TEST_REPORTER_HPP
 
-#include <ripple/beast/unit_test/amount.hpp>
-#include <ripple/beast/unit_test/recorder.hpp>
+#include <ripple/beast/unit_test/amount.h>
+#include <ripple/beast/unit_test/recorder.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 #include <algorithm>
diff --git a/src/ripple/beast/unit_test/results.h b/src/ripple/beast/unit_test/results.h
index c9478a7f47..dd43fb17a7 100644
--- a/src/ripple/beast/unit_test/results.h
+++ b/src/ripple/beast/unit_test/results.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_RESULTS_HPP
 #define BEAST_UNIT_TEST_RESULTS_HPP
 
-#include <ripple/beast/unit_test/detail/const_container.hpp>
+#include <ripple/beast/unit_test/detail/const_container.h>
 
 #include <string>
 #include <vector>
diff --git a/src/ripple/beast/unit_test/runner.h b/src/ripple/beast/unit_test/runner.h
index f8d8f99be4..bdee7aee5a 100644
--- a/src/ripple/beast/unit_test/runner.h
+++ b/src/ripple/beast/unit_test/runner.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 #define BEAST_UNIT_TEST_RUNNER_H_INCLUDED
 
-#include <ripple/beast/unit_test/suite_info.hpp>
+#include <ripple/beast/unit_test/suite_info.h>
 #include <boost/assert.hpp>
 #include <mutex>
 #include <ostream>
diff --git a/src/ripple/beast/unit_test/suite.h b/src/ripple/beast/unit_test/suite.h
index 6a6c03ccb6..23c4c4fad1 100644
--- a/src/ripple/beast/unit_test/suite.h
+++ b/src/ripple/beast/unit_test/suite.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_SUITE_HPP
 #define BEAST_UNIT_TEST_SUITE_HPP
 
-#include <ripple/beast/unit_test/runner.hpp>
+#include <ripple/beast/unit_test/runner.h>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/throw_exception.hpp>
@@ -646,7 +646,7 @@ suite::run(runner& r)
 #define BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(Class, Module, Library, Priority)
 
 #else
-#include <ripple/beast/unit_test/global_suites.hpp>
+#include <ripple/beast/unit_test/global_suites.h>
 #define BEAST_DEFINE_TESTSUITE(Class, Module, Library) \
     BEAST_DEFINE_TESTSUITE_INSERT(Class, Module, Library, false, 0)
 #define BEAST_DEFINE_TESTSUITE_MANUAL(Class, Module, Library) \
diff --git a/src/ripple/beast/unit_test/suite_list.h b/src/ripple/beast/unit_test/suite_list.h
index 5f0541db84..a1aed563c7 100644
--- a/src/ripple/beast/unit_test/suite_list.h
+++ b/src/ripple/beast/unit_test/suite_list.h
@@ -8,8 +8,8 @@
 #ifndef BEAST_UNIT_TEST_SUITE_LIST_HPP
 #define BEAST_UNIT_TEST_SUITE_LIST_HPP
 
-#include <ripple/beast/unit_test/detail/const_container.hpp>
-#include <ripple/beast/unit_test/suite_info.hpp>
+#include <ripple/beast/unit_test/detail/const_container.h>
+#include <ripple/beast/unit_test/suite_info.h>
 #include <boost/assert.hpp>
 #include <set>
 #include <typeindex>
diff --git a/src/ripple/beast/unit_test/thread.h b/src/ripple/beast/unit_test/thread.h
index 3fd22a30cb..8b2d024a84 100644
--- a/src/ripple/beast/unit_test/thread.h
+++ b/src/ripple/beast/unit_test/thread.h
@@ -8,7 +8,7 @@
 #ifndef BEAST_UNIT_TEST_THREAD_HPP
 #define BEAST_UNIT_TEST_THREAD_HPP
 
-#include <ripple/beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.h>
 #include <functional>
 #include <thread>
 #include <utility>
diff --git a/src/ripple/overlay/impl/TxMetrics.cpp b/src/ripple/overlay/impl/TxMetrics.cpp
index f77f746b3d..c9b826e9a3 100644
--- a/src/ripple/overlay/impl/TxMetrics.cpp
+++ b/src/ripple/overlay/impl/TxMetrics.cpp
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#include "ripple/overlay/impl/TxMetrics.h"
-#include "ripple/protocol/jss.h"
+#include <ripple/overlay/impl/TxMetrics.h>
+#include <ripple/protocol/jss.h>
 
 #include <numeric>
 
diff --git a/src/ripple/overlay/impl/TxMetrics.h b/src/ripple/overlay/impl/TxMetrics.h
index a37d7e7a48..d70cadee1b 100644
--- a/src/ripple/overlay/impl/TxMetrics.h
+++ b/src/ripple/overlay/impl/TxMetrics.h
@@ -20,8 +20,8 @@
 #ifndef RIPPLE_OVERLAY_TXMETRICS_H_INCLUDED
 #define RIPPLE_OVERLAY_TXMETRICS_H_INCLUDED
 
-#include "ripple/json/json_value.h"
-#include "ripple/protocol/messages.h"
+#include <ripple/json/json_value.h>
+#include <ripple/protocol/messages.h>
 
 #include <boost/circular_buffer.hpp>
 
diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp
index 55c15e54fc..ae17b8e0d4 100644
--- a/src/test/app/PayStrand_test.cpp
+++ b/src/test/app/PayStrand_test.cpp
@@ -15,6 +15,7 @@
 */
 //==============================================================================
 
+#include <ripple/app/paths/AMMContext.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/RippleCalc.h>
 #include <ripple/app/paths/impl/Steps.h>
@@ -26,7 +27,6 @@
 #include <ripple/ledger/Sandbox.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/jss.h>
-#include "ripple/app/paths/AMMContext.h"
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
 
diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp
index b76ea72354..ae537a4565 100644
--- a/src/test/app/TheoreticalQuality_test.cpp
+++ b/src/test/app/TheoreticalQuality_test.cpp
@@ -17,6 +17,7 @@
 */
 //==============================================================================
 
+#include <ripple/app/paths/AMMContext.h>
 #include <ripple/app/paths/Flow.h>
 #include <ripple/app/paths/impl/Steps.h>
 #include <ripple/app/paths/impl/StrandFlow.h>
@@ -28,7 +29,6 @@
 #include <ripple/ledger/Sandbox.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/jss.h>
-#include "ripple/app/paths/AMMContext.h"
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
 
diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp
index e2816f0609..a0837782a9 100644
--- a/src/test/app/XChain_test.cpp
+++ b/src/test/app/XChain_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.h>
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/Indexes.h>
 #include <ripple/protocol/Issue.h>
diff --git a/src/test/basics/DetectCrash_test.cpp b/src/test/basics/DetectCrash_test.cpp
index 300c948527..70f0bdb83b 100644
--- a/src/test/basics/DetectCrash_test.cpp
+++ b/src/test/basics/DetectCrash_test.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.h>
 
 #include <exception>
 
diff --git a/src/test/beast/beast_io_latency_probe_test.cpp b/src/test/beast/beast_io_latency_probe_test.cpp
index b2bf67b10b..32206ced7f 100644
--- a/src/test/beast/beast_io_latency_probe_test.cpp
+++ b/src/test/beast/beast_io_latency_probe_test.cpp
@@ -19,7 +19,7 @@
 #include <ripple/beast/asio/io_latency_probe.h>
 #include <ripple/beast/unit_test.h>
 
-#include <ripple/beast/test/yield_to.hpp>
+#include <ripple/beast/test/yield_to.h>
 
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/deadline_timer.hpp>
diff --git a/src/test/beast/define_print.cpp b/src/test/beast/define_print.cpp
index af51aeee55..3f527907a3 100644
--- a/src/test/beast/define_print.cpp
+++ b/src/test/beast/define_print.cpp
@@ -5,9 +5,9 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <ripple/beast/unit_test/amount.hpp>
-#include <ripple/beast/unit_test/global_suites.hpp>
-#include <ripple/beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/amount.h>
+#include <ripple/beast/unit_test/global_suites.h>
+#include <ripple/beast/unit_test/suite.h>
 #include <string>
 
 // Include this .cpp in your project to gain access to the printing suite
diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h
index ad831d110e..7831713382 100644
--- a/src/test/jtx/AMMTest.h
+++ b/src/test/jtx/AMMTest.h
@@ -19,7 +19,7 @@
 #ifndef RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED
 #define RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED
 
-#include <ripple/beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.h>
 #include <ripple/protocol/Feature.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index 931ad79883..61cfb0994d 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/basics/ByteUtilities.h>
 #include <ripple/basics/safe_cast.h>
 #include <ripple/beast/unit_test.h>
-#include <ripple/beast/unit_test/thread.hpp>
+#include <ripple/beast/unit_test/thread.h>
 #include <ripple/beast/utility/temp_dir.h>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/nodestore/DummyScheduler.h>
diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp
index daa316e566..feabe69b64 100644
--- a/src/test/peerfinder/PeerFinder_test.cpp
+++ b/src/test/peerfinder/PeerFinder_test.cpp
@@ -20,7 +20,7 @@
 #include <ripple/basics/Slice.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/beast/unit_test.h>
-#include <ripple/beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.h>
 #include <ripple/core/Config.h>
 #include <ripple/peerfinder/impl/Logic.h>
 #include <ripple/protocol/PublicKey.h>
diff --git a/src/test/protocol/ApiVersion_test.cpp b/src/test/protocol/ApiVersion_test.cpp
index f4aba9e996..81ff0184e1 100644
--- a/src/test/protocol/ApiVersion_test.cpp
+++ b/src/test/protocol/ApiVersion_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/beast/unit_test.h>
-#include <ripple/beast/unit_test/suite.hpp>
+#include <ripple/beast/unit_test/suite.h>
 #include <ripple/json/json_value.h>
 #include <ripple/protocol/ApiVersion.h>
 
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index 684532c4fc..249b0fd451 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -21,7 +21,7 @@
 #include <ripple/app/misc/LoadFeeTrack.h>
 #include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/basics/base64.h>
-#include <ripple/beast/test/yield_to.hpp>
+#include <ripple/beast/test/yield_to.h>
 #include <ripple/json/json_reader.h>
 #include <ripple/rpc/ServerHandler.h>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp
index c1111e4cfe..cd84c3c999 100644
--- a/src/test/unit_test/multi_runner.cpp
+++ b/src/test/unit_test/multi_runner.cpp
@@ -19,7 +19,7 @@
 
 #include <test/unit_test/multi_runner.h>
 
-#include <ripple/beast/unit_test/amount.hpp>
+#include <ripple/beast/unit_test/amount.h>
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/src/test/unit_test/multi_runner.h b/src/test/unit_test/multi_runner.h
index 57d6d33f9e..c003a99f99 100644
--- a/src/test/unit_test/multi_runner.h
+++ b/src/test/unit_test/multi_runner.h
@@ -20,8 +20,8 @@
 #ifndef TEST_UNIT_TEST_MULTI_RUNNER_H
 #define TEST_UNIT_TEST_MULTI_RUNNER_H
 
-#include <ripple/beast/unit_test/global_suites.hpp>
-#include <ripple/beast/unit_test/runner.hpp>
+#include <ripple/beast/unit_test/global_suites.h>
+#include <ripple/beast/unit_test/runner.h>
 #include <boost/beast/core/static_string.hpp>
 
 #include <boost/container/static_vector.hpp>