diff --git a/src/etl/CacheLoaderSettings.cpp b/src/etl/CacheLoaderSettings.cpp
index c52f3b89..5992170d 100644
--- a/src/etl/CacheLoaderSettings.cpp
+++ b/src/etl/CacheLoaderSettings.cpp
@@ -22,9 +22,6 @@
 #include "util/config/Config.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/base_uint.h>
-#include <ripple/basics/strHex.h>
 
 #include <cstddef>
 #include <string>
diff --git a/src/etl/impl/SubscriptionSource.cpp b/src/etl/impl/SubscriptionSource.cpp
index 369cd8f3..4f970a89 100644
--- a/src/etl/impl/SubscriptionSource.cpp
+++ b/src/etl/impl/SubscriptionSource.cpp
@@ -29,20 +29,13 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/post.hpp>
 #include <boost/asio/spawn.hpp>
-#include <boost/asio/ssl/error.hpp>
-#include <boost/asio/strand.hpp>
 #include <boost/asio/use_future.hpp>
-#include <boost/beast/http/field.hpp>
 #include <boost/json/object.hpp>
 #include <boost/json/parse.hpp>
 #include <boost/json/serialize.hpp>
 #include <boost/json/value_to.hpp>
-#include <boost/lexical_cast.hpp>
 #include <fmt/core.h>
-#include <openssl/err.h>
 #include <ripple/protocol/jss.h>
 
 #include <algorithm>
diff --git a/src/util/log/Logger.cpp b/src/util/log/Logger.cpp
index de14d256..f9151ed8 100644
--- a/src/util/log/Logger.cpp
+++ b/src/util/log/Logger.cpp
@@ -31,7 +31,6 @@
 #include <boost/log/attributes/attribute_value_set.hpp>
 #include <boost/log/core/core.hpp>
 #include <boost/log/expressions/filter.hpp>
-#include <boost/log/expressions/predicates/channel_severity_filter.hpp>
 #include <boost/log/keywords/auto_flush.hpp>
 #include <boost/log/keywords/file_name.hpp>
 #include <boost/log/keywords/filter.hpp>
diff --git a/src/util/requests/impl/SslContext.cpp b/src/util/requests/impl/SslContext.cpp
index bcfb9637..9eef6d18 100644
--- a/src/util/requests/impl/SslContext.cpp
+++ b/src/util/requests/impl/SslContext.cpp
@@ -20,7 +20,6 @@
 #include "util/requests/impl/SslContext.hpp"
 
 #include "util/Expected.hpp"
-#include "util/log/Logger.hpp"
 #include "util/requests/Types.hpp"
 
 #include <boost/asio/buffer.hpp>
diff --git a/unittests/data/cassandra/RetryPolicyTests.cpp b/unittests/data/cassandra/RetryPolicyTests.cpp
index b79dfc59..8979a085 100644
--- a/unittests/data/cassandra/RetryPolicyTests.cpp
+++ b/unittests/data/cassandra/RetryPolicyTests.cpp
@@ -21,7 +21,6 @@
 #include "data/cassandra/impl/RetryPolicy.hpp"
 #include "util/Fixtures.hpp"
 
-#include <boost/asio/io_context.hpp>
 #include <cassandra.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
diff --git a/unittests/etl/CacheLoaderSettingsTests.cpp b/unittests/etl/CacheLoaderSettingsTests.cpp
index 273d703a..e9b100d0 100644
--- a/unittests/etl/CacheLoaderSettingsTests.cpp
+++ b/unittests/etl/CacheLoaderSettingsTests.cpp
@@ -20,9 +20,7 @@
 #include "etl/CacheLoaderSettings.hpp"
 #include "util/config/Config.hpp"
 
-#include <boost/json.hpp>
 #include <boost/json/parse.hpp>
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace json = boost::json;
diff --git a/unittests/etl/CacheLoaderTests.cpp b/unittests/etl/CacheLoaderTests.cpp
index 3fec5bca..8c348f3f 100644
--- a/unittests/etl/CacheLoaderTests.cpp
+++ b/unittests/etl/CacheLoaderTests.cpp
@@ -27,12 +27,9 @@
 #include "util/async/context/BasicExecutionContext.hpp"
 #include "util/config/Config.hpp"
 
-#include <boost/json.hpp>
 #include <boost/json/parse.hpp>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/base_uint.h>
 
 #include <vector>
 
@@ -120,7 +117,7 @@ TEST_P(ParametrizedCacheLoaderTest, LoadCacheWithDifferentSettings)
     EXPECT_CALL(cache, setFull).Times(1);
 
     async::CoroExecutionContext ctx{settings.numThreads};
-    etl::impl::CursorProvider provider{backend, settings.numCacheDiffs};
+    etl::impl::CursorProvider const provider{backend, settings.numCacheDiffs};
 
     etl::impl::CacheLoaderImpl<MockCache> loader{
         ctx, backend, cache, SEQ, settings.numCacheMarkers, settings.cachePageFetchSize, provider.getCursors(SEQ)
@@ -148,9 +145,9 @@ TEST_P(ParametrizedCacheLoaderTest, AutomaticallyCancelledAndAwaitedInDestructor
     EXPECT_CALL(cache, setFull).Times(AtMost(1));
 
     async::CoroExecutionContext ctx{settings.numThreads};
-    etl::impl::CursorProvider provider{backend, settings.numCacheDiffs};
+    etl::impl::CursorProvider const provider{backend, settings.numCacheDiffs};
 
-    etl::impl::CacheLoaderImpl<MockCache> loader{
+    etl::impl::CacheLoaderImpl<MockCache> const loader{
         ctx, backend, cache, SEQ, settings.numCacheMarkers, settings.cachePageFetchSize, provider.getCursors(SEQ)
     };
 
diff --git a/unittests/etl/CursorProviderTests.cpp b/unittests/etl/CursorProviderTests.cpp
index 3d9d6117..40da9dc8 100644
--- a/unittests/etl/CursorProviderTests.cpp
+++ b/unittests/etl/CursorProviderTests.cpp
@@ -24,8 +24,6 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/base_uint.h>
 
 #include <cstddef>
 
diff --git a/unittests/etl/SubscriptionSourceTests.cpp b/unittests/etl/SubscriptionSourceTests.cpp
index 93e13758..2dd3c0c5 100644
--- a/unittests/etl/SubscriptionSourceTests.cpp
+++ b/unittests/etl/SubscriptionSourceTests.cpp
@@ -23,10 +23,8 @@
 #include "util/MockSubscriptionManager.hpp"
 #include "util/TestWsServer.hpp"
 
-#include <boost/asio/executor_work_guard.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/spawn.hpp>
-#include <boost/json.hpp>
 #include <boost/json/object.hpp>
 #include <boost/json/serialize.hpp>
 #include <gmock/gmock.h>
@@ -36,7 +34,6 @@
 #include <memory>
 #include <optional>
 #include <string>
-#include <thread>
 #include <utility>
 
 using namespace etl::impl;
diff --git a/unittests/util/TestWsServer.cpp b/unittests/util/TestWsServer.cpp
index 122d0818..0d553c06 100644
--- a/unittests/util/TestWsServer.cpp
+++ b/unittests/util/TestWsServer.cpp
@@ -33,7 +33,6 @@
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/role.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
-#include <boost/beast/version.hpp>
 #include <boost/beast/websocket/error.hpp>
 #include <boost/beast/websocket/rfc6455.hpp>
 #include <boost/beast/websocket/stream_base.hpp>
diff --git a/unittests/util/async/AnyStopTokenTests.cpp b/unittests/util/async/AnyStopTokenTests.cpp
index f45ea528..fe66e373 100644
--- a/unittests/util/async/AnyStopTokenTests.cpp
+++ b/unittests/util/async/AnyStopTokenTests.cpp
@@ -20,7 +20,6 @@
 #include "util/async/AnyStopToken.hpp"
 
 #include <boost/asio/spawn.hpp>
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 using namespace util::async;
diff --git a/unittests/util/requests/WsConnectionTests.cpp b/unittests/util/requests/WsConnectionTests.cpp
index 52bb471d..dfa2a7bf 100644
--- a/unittests/util/requests/WsConnectionTests.cpp
+++ b/unittests/util/requests/WsConnectionTests.cpp
@@ -23,20 +23,13 @@
 #include "util/requests/Types.hpp"
 #include "util/requests/WsConnection.hpp"
 
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/post.hpp>
 #include <boost/asio/spawn.hpp>
-#include <boost/asio/strand.hpp>
-#include <boost/asio/use_future.hpp>
 #include <boost/beast/http/field.hpp>
 #include <gtest/gtest.h>
-#include <openssl/ssl.h>
 
 #include <chrono>
 #include <cstddef>
-#include <iostream>
 #include <optional>
-#include <ostream>
 #include <string>
 #include <thread>
 #include <vector>