diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp
index 7a014447ef..5a79ef54a1 100644
--- a/nano/core_test/confirmation_height.cpp
+++ b/nano/core_test/confirmation_height.cpp
@@ -5,8 +5,6 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/format.hpp>
-
 using namespace std::chrono_literals;
 
 namespace
diff --git a/nano/core_test/logger.cpp b/nano/core_test/logger.cpp
index 663cfac2db..4a318b9cca 100644
--- a/nano/core_test/logger.cpp
+++ b/nano/core_test/logger.cpp
@@ -5,8 +5,6 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/filesystem.hpp>
-
 #include <chrono>
 #include <regex>
 #include <thread>
diff --git a/nano/core_test/message_deserializer.cpp b/nano/core_test/message_deserializer.cpp
index d1e717e466..a81e35b782 100644
--- a/nano/core_test/message_deserializer.cpp
+++ b/nano/core_test/message_deserializer.cpp
@@ -4,8 +4,6 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/none.hpp>
-
 #include <memory>
 #include <vector>
 
diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
index 0213b57880..df74e26b1e 100644
--- a/nano/core_test/node.cpp
+++ b/nano/core_test/node.cpp
@@ -13,8 +13,6 @@
 #include <gtest/gtest.h>
 
 #include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/optional.hpp>
 
 #include <fstream>
 #include <numeric>
diff --git a/nano/core_test/signal_manager.cpp b/nano/core_test/signal_manager.cpp
index c0e6369101..fe3383945f 100644
--- a/nano/core_test/signal_manager.cpp
+++ b/nano/core_test/signal_manager.cpp
@@ -15,8 +15,6 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/format.hpp>
-
 #include <csignal>
 #include <iostream>
 #include <thread>
diff --git a/nano/core_test/socket.cpp b/nano/core_test/socket.cpp
index ea716bb3e1..840065336b 100644
--- a/nano/core_test/socket.cpp
+++ b/nano/core_test/socket.cpp
@@ -1,7 +1,5 @@
 #include <nano/boost/asio/ip/address_v6.hpp>
-#include <nano/boost/asio/ip/network_v6.hpp>
 #include <nano/lib/thread_runner.hpp>
-#include <nano/lib/threading.hpp>
 #include <nano/node/transport/socket.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp
index 3c835e209e..5bcc2c669a 100644
--- a/nano/core_test/wallet.cpp
+++ b/nano/core_test/wallet.cpp
@@ -1,14 +1,11 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/thread_runner.hpp>
-#include <nano/lib/threading.hpp>
 #include <nano/store/lmdb/wallet_value.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
 
 #include <gtest/gtest.h>
 
-#include <boost/filesystem.hpp>
-
 using namespace std::chrono_literals;
 unsigned constexpr nano::wallet_store::version_current;
 
diff --git a/nano/rpc_test/common.hpp b/nano/rpc_test/common.hpp
index 90d03129e9..ad436339a8 100644
--- a/nano/rpc_test/common.hpp
+++ b/nano/rpc_test/common.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/http.hpp>
diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp
index 5416292cb0..7bc01449b7 100644
--- a/nano/rpc_test/rpc.cpp
+++ b/nano/rpc_test/rpc.cpp
@@ -2,7 +2,6 @@
 #include <nano/boost/beast/http.hpp>
 #include <nano/lib/rpcconfig.hpp>
 #include <nano/lib/thread_runner.hpp>
-#include <nano/lib/threading.hpp>
 #include <nano/node/ipc/ipc_server.hpp>
 #include <nano/node/json_handler.hpp>
 #include <nano/node/node_rpc_config.hpp>
diff --git a/nano/secure/network_filter.hpp b/nano/secure/network_filter.hpp
index ebad77aad4..7604acfc4b 100644
--- a/nano/secure/network_filter.hpp
+++ b/nano/secure/network_filter.hpp
@@ -3,8 +3,6 @@
 
 #include <nano/lib/numbers.hpp>
 
-#include <mutex>
-
 #include <cryptopp/seckey.h>
 #include <cryptopp/siphash.h>
 
diff --git a/nano/slow_test/bootstrap.cpp b/nano/slow_test/bootstrap.cpp
index b722cf73e1..b500e4a009 100644
--- a/nano/slow_test/bootstrap.cpp
+++ b/nano/slow_test/bootstrap.cpp
@@ -14,9 +14,6 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/format.hpp>
-
-#include <map>
 #include <thread>
 
 using namespace std::chrono_literals;
diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp
index 740383a83c..f4a2f4b041 100644
--- a/nano/slow_test/node.cpp
+++ b/nano/slow_test/node.cpp
@@ -1,6 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/thread_runner.hpp>
-#include <nano/lib/threading.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/make_store.hpp>
 #include <nano/node/scheduler/component.hpp>
@@ -17,7 +16,6 @@
 #include <boost/format.hpp>
 #include <boost/unordered_set.hpp>
 
-#include <numeric>
 #include <random>
 
 using namespace std::chrono_literals;
diff --git a/nano/test_common/ledger.hpp b/nano/test_common/ledger.hpp
index 17bafae687..6d64e170e4 100644
--- a/nano/test_common/ledger.hpp
+++ b/nano/test_common/ledger.hpp
@@ -2,7 +2,6 @@
 
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/stats.hpp>
-#include <nano/node/common.hpp>
 #include <nano/secure/ledger.hpp>
 
 namespace nano
diff --git a/nano/test_common/rate_observer.hpp b/nano/test_common/rate_observer.hpp
index 56f54d1e87..9239057812 100644
--- a/nano/test_common/rate_observer.hpp
+++ b/nano/test_common/rate_observer.hpp
@@ -6,7 +6,6 @@
 #include <chrono>
 #include <string>
 #include <thread>
-#include <utility>
 #include <vector>
 
 namespace nano::test
diff --git a/nano/test_common/telemetry.hpp b/nano/test_common/telemetry.hpp
index e6a3dfd458..3efdd06cf6 100644
--- a/nano/test_common/telemetry.hpp
+++ b/nano/test_common/telemetry.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <cstdint>
-
 namespace nano
 {
 class node;
diff --git a/nano/test_common/testutil.hpp b/nano/test_common/testutil.hpp
index 6a5ab1e379..a335887316 100644
--- a/nano/test_common/testutil.hpp
+++ b/nano/test_common/testutil.hpp
@@ -1,10 +1,8 @@
 #pragma once
 
-#include <nano/lib/errors.hpp>
 #include <nano/lib/locks.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/node/transport/channel.hpp>
-#include <nano/node/transport/transport.hpp>
 
 #include <gtest/gtest.h>