From 39e4c3968922ce8c28b760cdaffae64a3c802e50 Mon Sep 17 00:00:00 2001
From: RickiNano <81099017+RickiNano@users.noreply.github.com>
Date: Fri, 13 Jan 2023 22:25:59 +0100
Subject: [PATCH] Removed all unnecessary usings

---
 nano/node/active_transactions.cpp            | 3 ---
 nano/node/active_transactions.hpp            | 7 -------
 nano/node/block_arrival.hpp                  | 2 --
 nano/node/blockprocessor.hpp                 | 7 -------
 nano/node/bootstrap/block_deserializer.hpp   | 2 --
 nano/node/bootstrap/bootstrap.cpp            | 2 --
 nano/node/bootstrap/bootstrap_attempt.cpp    | 6 ------
 nano/node/bootstrap/bootstrap_bulk_pull.hpp  | 1 -
 nano/node/bootstrap/bootstrap_lazy.cpp       | 1 -
 nano/node/bootstrap/bootstrap_lazy.hpp       | 4 ----
 nano/node/bootstrap/bootstrap_server.cpp     | 2 --
 nano/node/bootstrap/bootstrap_server.hpp     | 1 -
 nano/node/common.cpp                         | 7 -------
 nano/node/common.hpp                         | 3 ---
 nano/node/confirmation_height_bounded.cpp    | 1 -
 nano/node/confirmation_height_processor.cpp  | 2 --
 nano/node/confirmation_height_processor.hpp  | 2 --
 nano/node/daemonconfig.cpp                   | 1 -
 nano/node/distributed_work.cpp               | 1 -
 nano/node/distributed_work.hpp               | 4 ----
 nano/node/distributed_work_factory.hpp       | 1 -
 nano/node/gap_cache.hpp                      | 2 --
 nano/node/hinted_scheduler.hpp               | 5 -----
 nano/node/ipc/action_handler.cpp             | 2 --
 nano/node/ipc/action_handler.hpp             | 7 -------
 nano/node/ipc/flatbuffers_handler.cpp        | 3 ---
 nano/node/ipc/ipc_access_config.hpp          | 1 -
 nano/node/ipc/ipc_broker.hpp                 | 3 ---
 nano/node/ipc/ipc_server.cpp                 | 3 ---
 nano/node/ipc/ipc_server.hpp                 | 1 -
 nano/node/lmdb/lmdb.cpp                      | 2 --
 nano/node/lmdb/lmdb_txn.hpp                  | 2 --
 nano/node/messages.cpp                       | 2 --
 nano/node/network.cpp                        | 4 ----
 nano/node/node.cpp                           | 2 --
 nano/node/node_rpc_config.cpp                | 1 -
 nano/node/online_reps.hpp                    | 1 -
 nano/node/openclwork.cpp                     | 1 -
 nano/node/portmapping.hpp                    | 2 --
 nano/node/repcrawler.hpp                     | 1 -
 nano/node/request_aggregator.cpp             | 1 -
 nano/node/rocksdb/rocksdb.cpp                | 3 ---
 nano/node/rocksdb/rocksdb.hpp                | 1 -
 nano/node/rocksdb/rocksdb_iterator.hpp       | 1 -
 nano/node/rocksdb/rocksdb_txn.hpp            | 2 --
 nano/node/signatures.cpp                     | 1 -
 nano/node/signatures.hpp                     | 1 -
 nano/node/socket.cpp                         | 3 ---
 nano/node/socket.hpp                         | 3 ---
 nano/node/telemetry.cpp                      | 1 -
 nano/node/transport/message_deserializer.hpp | 2 --
 nano/node/transport/tcp_server.cpp           | 1 -
 nano/node/transport/tcp_server.hpp           | 1 -
 nano/node/transport/transport.cpp            | 3 ---
 nano/node/transport/transport.hpp            | 1 -
 nano/node/transport/udp.cpp                  | 1 -
 nano/node/unchecked_map.cpp                  | 2 --
 nano/node/unchecked_map.hpp                  | 2 --
 nano/node/vote_cache.hpp                     | 5 -----
 nano/node/vote_processor.cpp                 | 1 -
 nano/node/vote_processor.hpp                 | 1 -
 nano/node/voting.hpp                         | 1 -
 nano/node/websocket.hpp                      | 1 -
 nano/node/write_database_queue.hpp           | 1 -
 64 files changed, 145 deletions(-)

diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp
index da7804472..7eb1ff025 100644
--- a/nano/node/active_transactions.cpp
+++ b/nano/node/active_transactions.cpp
@@ -8,9 +8,6 @@
 #include <nano/secure/store.hpp>
 
 #include <boost/format.hpp>
-#include <boost/variant/get.hpp>
-
-#include <numeric>
 
 using namespace std::chrono;
 
diff --git a/nano/node/active_transactions.hpp b/nano/node/active_transactions.hpp
index f422d115c..ddf8b5b35 100644
--- a/nano/node/active_transactions.hpp
+++ b/nano/node/active_transactions.hpp
@@ -2,27 +2,20 @@
 
 #include <nano/lib/numbers.hpp>
 #include <nano/node/election.hpp>
-#include <nano/node/inactive_cache_information.hpp>
-#include <nano/node/inactive_cache_status.hpp>
 #include <nano/node/voting.hpp>
 #include <nano/secure/common.hpp>
 
-#include <boost/circular_buffer.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/member.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/random_access_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index_container.hpp>
-#include <boost/optional.hpp>
-#include <boost/thread/thread.hpp>
 
 #include <atomic>
 #include <condition_variable>
 #include <deque>
 #include <memory>
 #include <unordered_map>
-#include <unordered_set>
 
 namespace mi = boost::multi_index;
 
diff --git a/nano/node/block_arrival.hpp b/nano/node/block_arrival.hpp
index 1c3c7baed..71aa39463 100644
--- a/nano/node/block_arrival.hpp
+++ b/nano/node/block_arrival.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <nano/lib/threading.hpp>
 #include <nano/secure/common.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/member.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index_container.hpp>
 
diff --git a/nano/node/blockprocessor.hpp b/nano/node/blockprocessor.hpp
index 590ba22b2..fd590ca3d 100644
--- a/nano/node/blockprocessor.hpp
+++ b/nano/node/blockprocessor.hpp
@@ -4,16 +4,9 @@
 #include <nano/node/state_block_signature_verification.hpp>
 #include <nano/secure/common.hpp>
 
-#include <boost/multi_index/hashed_index.hpp>
-#include <boost/multi_index/member.hpp>
-#include <boost/multi_index/ordered_index.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
-#include <boost/multi_index_container.hpp>
-
 #include <chrono>
 #include <memory>
 #include <thread>
-#include <unordered_set>
 
 namespace nano
 {
diff --git a/nano/node/bootstrap/block_deserializer.hpp b/nano/node/bootstrap/block_deserializer.hpp
index 84720bae0..a7ce9e244 100644
--- a/nano/node/bootstrap/block_deserializer.hpp
+++ b/nano/node/bootstrap/block_deserializer.hpp
@@ -2,8 +2,6 @@
 
 #include <nano/lib/blocks.hpp>
 
-#include <boost/system/error_code.hpp>
-
 #include <memory>
 #include <vector>
 
diff --git a/nano/node/bootstrap/bootstrap.cpp b/nano/node/bootstrap/bootstrap.cpp
index 03941b02f..7e3e08c26 100644
--- a/nano/node/bootstrap/bootstrap.cpp
+++ b/nano/node/bootstrap/bootstrap.cpp
@@ -5,8 +5,6 @@
 #include <nano/node/common.hpp>
 #include <nano/node/node.hpp>
 
-#include <boost/format.hpp>
-
 #include <algorithm>
 #include <memory>
 
diff --git a/nano/node/bootstrap/bootstrap_attempt.cpp b/nano/node/bootstrap/bootstrap_attempt.cpp
index ff62e8960..93bb94ebd 100644
--- a/nano/node/bootstrap/bootstrap_attempt.cpp
+++ b/nano/node/bootstrap/bootstrap_attempt.cpp
@@ -1,17 +1,11 @@
-#include <nano/crypto_lib/random_pool.hpp>
 #include <nano/node/bootstrap/bootstrap.hpp>
 #include <nano/node/bootstrap/bootstrap_attempt.hpp>
 #include <nano/node/bootstrap/bootstrap_bulk_push.hpp>
-#include <nano/node/bootstrap/bootstrap_frontier.hpp>
-#include <nano/node/common.hpp>
 #include <nano/node/node.hpp>
-#include <nano/node/transport/tcp.hpp>
 #include <nano/node/websocket.hpp>
 
 #include <boost/format.hpp>
 
-#include <algorithm>
-
 constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit;
 constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit_dev;
 
diff --git a/nano/node/bootstrap/bootstrap_bulk_pull.hpp b/nano/node/bootstrap/bootstrap_bulk_pull.hpp
index 5a8114a8a..35a09f096 100644
--- a/nano/node/bootstrap/bootstrap_bulk_pull.hpp
+++ b/nano/node/bootstrap/bootstrap_bulk_pull.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nano/node/common.hpp>
 #include <nano/node/messages.hpp>
 #include <nano/node/socket.hpp>
 
diff --git a/nano/node/bootstrap/bootstrap_lazy.cpp b/nano/node/bootstrap/bootstrap_lazy.cpp
index e93d8817c..ac73270a6 100644
--- a/nano/node/bootstrap/bootstrap_lazy.cpp
+++ b/nano/node/bootstrap/bootstrap_lazy.cpp
@@ -2,7 +2,6 @@
 #include <nano/node/bootstrap/bootstrap_lazy.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/node.hpp>
-#include <nano/node/transport/tcp.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/nano/node/bootstrap/bootstrap_lazy.hpp b/nano/node/bootstrap/bootstrap_lazy.hpp
index 541dda94e..d355eb796 100644
--- a/nano/node/bootstrap/bootstrap_lazy.hpp
+++ b/nano/node/bootstrap/bootstrap_lazy.hpp
@@ -2,13 +2,9 @@
 
 #include <nano/node/bootstrap/bootstrap_attempt.hpp>
 
-#include <boost/multi_index/hashed_index.hpp>
-#include <boost/multi_index/member.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index_container.hpp>
 
 #include <atomic>
-#include <queue>
 #include <unordered_set>
 
 namespace mi = boost::multi_index;
diff --git a/nano/node/bootstrap/bootstrap_server.cpp b/nano/node/bootstrap/bootstrap_server.cpp
index 068dee18c..048f4a468 100644
--- a/nano/node/bootstrap/bootstrap_server.cpp
+++ b/nano/node/bootstrap/bootstrap_server.cpp
@@ -3,8 +3,6 @@
 #include <nano/secure/ledger.hpp>
 #include <nano/secure/store.hpp>
 
-#include <boost/asio/error.hpp>
-
 // TODO: Make threads configurable
 nano::bootstrap_server::bootstrap_server (nano::store & store_a, nano::ledger & ledger_a, nano::network_constants const & network_constants_a, nano::stat & stats_a) :
 	store{ store_a },
diff --git a/nano/node/bootstrap/bootstrap_server.hpp b/nano/node/bootstrap/bootstrap_server.hpp
index 2a111511b..b164ad436 100644
--- a/nano/node/bootstrap/bootstrap_server.hpp
+++ b/nano/node/bootstrap/bootstrap_server.hpp
@@ -5,7 +5,6 @@
 #include <nano/node/messages.hpp>
 
 #include <memory>
-#include <queue>
 #include <utility>
 
 namespace nano
diff --git a/nano/node/common.cpp b/nano/node/common.cpp
index f7947c4f1..c242c6102 100644
--- a/nano/node/common.cpp
+++ b/nano/node/common.cpp
@@ -1,6 +1,5 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/memory.hpp>
-#include <nano/lib/work.hpp>
 #include <nano/node/active_transactions.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/election.hpp>
@@ -8,13 +7,7 @@
 #include <nano/node/wallet.hpp>
 #include <nano/secure/buffer.hpp>
 
-#include <boost/endian/conversion.hpp>
 #include <boost/format.hpp>
-#include <boost/pool/pool_alloc.hpp>
-#include <boost/variant/get.hpp>
-
-#include <numeric>
-#include <sstream>
 
 std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::dev;
 std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::beta;
diff --git a/nano/node/common.hpp b/nano/node/common.hpp
index f3290dc46..80bfbfe3e 100644
--- a/nano/node/common.hpp
+++ b/nano/node/common.hpp
@@ -2,11 +2,8 @@
 
 #include <nano/boost/asio/ip/tcp.hpp>
 #include <nano/boost/asio/ip/udp.hpp>
-#include <nano/crypto_lib/random_pool.hpp>
-#include <nano/lib/asio.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/memory.hpp>
-#include <nano/lib/stats.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/network_filter.hpp>
 
diff --git a/nano/node/confirmation_height_bounded.cpp b/nano/node/confirmation_height_bounded.cpp
index c314a8db7..86a9e3d9c 100644
--- a/nano/node/confirmation_height_bounded.cpp
+++ b/nano/node/confirmation_height_bounded.cpp
@@ -6,7 +6,6 @@
 #include <nano/secure/ledger.hpp>
 
 #include <boost/format.hpp>
-#include <boost/optional.hpp>
 
 #include <numeric>
 
diff --git a/nano/node/confirmation_height_processor.cpp b/nano/node/confirmation_height_processor.cpp
index 3f7527bfc..df4be6c49 100644
--- a/nano/node/confirmation_height_processor.cpp
+++ b/nano/node/confirmation_height_processor.cpp
@@ -9,8 +9,6 @@
 
 #include <boost/thread/latch.hpp>
 
-#include <numeric>
-
 nano::confirmation_height_processor::confirmation_height_processor (nano::ledger & ledger_a, nano::write_database_queue & write_database_queue_a, std::chrono::milliseconds batch_separate_pending_min_time_a, nano::logging const & logging_a, nano::logger_mt & logger_a, boost::latch & latch, confirmation_height_mode mode_a) :
 	ledger (ledger_a),
 	write_database_queue (write_database_queue_a),
diff --git a/nano/node/confirmation_height_processor.hpp b/nano/node/confirmation_height_processor.hpp
index 8b7d9e9a9..a32b48f38 100644
--- a/nano/node/confirmation_height_processor.hpp
+++ b/nano/node/confirmation_height_processor.hpp
@@ -9,12 +9,10 @@
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>
-#include <boost/multi_index/member.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index_container.hpp>
 
 #include <condition_variable>
-#include <mutex>
 #include <thread>
 #include <unordered_set>
 
diff --git a/nano/node/daemonconfig.cpp b/nano/node/daemonconfig.cpp
index b7df1ebf2..60312d853 100644
--- a/nano/node/daemonconfig.cpp
+++ b/nano/node/daemonconfig.cpp
@@ -1,7 +1,6 @@
 #include <nano/lib/config.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/tomlconfig.hpp>
-#include <nano/lib/walletconfig.hpp>
 #include <nano/node/daemonconfig.hpp>
 
 #include <sstream>
diff --git a/nano/node/distributed_work.cpp b/nano/node/distributed_work.cpp
index 10890757f..f4842053b 100644
--- a/nano/node/distributed_work.cpp
+++ b/nano/node/distributed_work.cpp
@@ -1,5 +1,4 @@
 #include <nano/boost/asio/bind_executor.hpp>
-#include <nano/boost/asio/post.hpp>
 #include <nano/node/distributed_work.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/websocket.hpp>
diff --git a/nano/node/distributed_work.hpp b/nano/node/distributed_work.hpp
index 2dcf11cee..e8772b3c6 100644
--- a/nano/node/distributed_work.hpp
+++ b/nano/node/distributed_work.hpp
@@ -9,10 +9,6 @@
 #include <nano/lib/work.hpp>
 #include <nano/node/common.hpp>
 
-#include <boost/optional.hpp>
-
-#include <mutex>
-
 using request_type = boost::beast::http::request<boost::beast::http::string_body>;
 
 namespace boost
diff --git a/nano/node/distributed_work_factory.hpp b/nano/node/distributed_work_factory.hpp
index 8de9aa0cc..ae626ead0 100644
--- a/nano/node/distributed_work_factory.hpp
+++ b/nano/node/distributed_work_factory.hpp
@@ -4,7 +4,6 @@
 
 #include <atomic>
 #include <functional>
-#include <mutex>
 #include <unordered_map>
 #include <vector>
 
diff --git a/nano/node/gap_cache.hpp b/nano/node/gap_cache.hpp
index 95402f5df..cd26dd282 100644
--- a/nano/node/gap_cache.hpp
+++ b/nano/node/gap_cache.hpp
@@ -7,12 +7,10 @@
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/ordered_index.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index_container.hpp>
 
 #include <chrono>
 #include <memory>
-#include <mutex>
 #include <vector>
 
 namespace nano
diff --git a/nano/node/hinted_scheduler.hpp b/nano/node/hinted_scheduler.hpp
index 899714839..07e377a6c 100644
--- a/nano/node/hinted_scheduler.hpp
+++ b/nano/node/hinted_scheduler.hpp
@@ -2,15 +2,10 @@
 
 #include <nano/lib/locks.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/lib/timer.hpp>
-#include <nano/lib/utility.hpp>
 #include <nano/secure/common.hpp>
 
 #include <condition_variable>
-#include <memory>
-#include <queue>
 #include <thread>
-#include <vector>
 
 namespace nano
 {
diff --git a/nano/node/ipc/action_handler.cpp b/nano/node/ipc/action_handler.cpp
index db191f77b..bacc87c31 100644
--- a/nano/node/ipc/action_handler.cpp
+++ b/nano/node/ipc/action_handler.cpp
@@ -5,8 +5,6 @@
 #include <nano/node/ipc/ipc_server.hpp>
 #include <nano/node/node.hpp>
 
-#include <iostream>
-
 namespace
 {
 nano::account parse_account (std::string const & account, bool & out_is_deprecated_format)
diff --git a/nano/node/ipc/action_handler.hpp b/nano/node/ipc/action_handler.hpp
index 2c8425901..9ff3f0619 100644
--- a/nano/node/ipc/action_handler.hpp
+++ b/nano/node/ipc/action_handler.hpp
@@ -6,19 +6,12 @@
 
 #include <boost/optional.hpp>
 
-#include <chrono>
-#include <cstddef>
-#include <cstdint>
 #include <functional>
 #include <memory>
-#include <type_traits>
 #include <unordered_map>
 
 #include <flatbuffers/flatbuffers.h>
 #include <flatbuffers/idl.h>
-#include <flatbuffers/minireflect.h>
-#include <flatbuffers/registry.h>
-#include <flatbuffers/util.h>
 
 namespace nano
 {
diff --git a/nano/node/ipc/flatbuffers_handler.cpp b/nano/node/ipc/flatbuffers_handler.cpp
index a5bd7d902..3c8507cb7 100644
--- a/nano/node/ipc/flatbuffers_handler.cpp
+++ b/nano/node/ipc/flatbuffers_handler.cpp
@@ -9,12 +9,9 @@
 
 #include <iostream>
 #include <sstream>
-#include <unordered_map>
 
 #include <flatbuffers/flatbuffers.h>
 #include <flatbuffers/idl.h>
-#include <flatbuffers/minireflect.h>
-#include <flatbuffers/registry.h>
 #include <flatbuffers/util.h>
 
 namespace
diff --git a/nano/node/ipc/ipc_access_config.hpp b/nano/node/ipc/ipc_access_config.hpp
index eba06d648..2f87a2ea1 100644
--- a/nano/node/ipc/ipc_access_config.hpp
+++ b/nano/node/ipc/ipc_access_config.hpp
@@ -5,7 +5,6 @@
 #include <nano/lib/locks.hpp>
 
 #include <string>
-#include <thread>
 #include <unordered_map>
 #include <unordered_set>
 
diff --git a/nano/node/ipc/ipc_broker.hpp b/nano/node/ipc/ipc_broker.hpp
index 5f56023be..c9619ba28 100644
--- a/nano/node/ipc/ipc_broker.hpp
+++ b/nano/node/ipc/ipc_broker.hpp
@@ -6,9 +6,6 @@
 #include <nano/node/ipc/ipc_broker.hpp>
 #include <nano/node/node_rpc_config.hpp>
 
-#include <atomic>
-#include <mutex>
-
 namespace flatbuffers
 {
 class Parser;
diff --git a/nano/node/ipc/ipc_server.cpp b/nano/node/ipc/ipc_server.cpp
index ad2c0ddb3..7712871db 100644
--- a/nano/node/ipc/ipc_server.cpp
+++ b/nano/node/ipc/ipc_server.cpp
@@ -7,10 +7,8 @@
 #include <nano/lib/locks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/node/common.hpp>
 #include <nano/node/ipc/action_handler.hpp>
 #include <nano/node/ipc/flatbuffers_handler.hpp>
-#include <nano/node/ipc/flatbuffers_util.hpp>
 #include <nano/node/ipc/ipc_server.hpp>
 #include <nano/node/json_handler.hpp>
 #include <nano/node/node.hpp>
@@ -21,7 +19,6 @@
 
 #include <atomic>
 #include <chrono>
-#include <list>
 
 #include <flatbuffers/flatbuffers.h>
 
diff --git a/nano/node/ipc/ipc_server.hpp b/nano/node/ipc/ipc_server.hpp
index dbd60c894..7a60e982e 100644
--- a/nano/node/ipc/ipc_server.hpp
+++ b/nano/node/ipc/ipc_server.hpp
@@ -9,7 +9,6 @@
 
 #include <atomic>
 #include <memory>
-#include <mutex>
 
 namespace flatbuffers
 {
diff --git a/nano/node/lmdb/lmdb.cpp b/nano/node/lmdb/lmdb.cpp
index 848c119ae..2ecb3a237 100644
--- a/nano/node/lmdb/lmdb.cpp
+++ b/nano/node/lmdb/lmdb.cpp
@@ -1,4 +1,3 @@
-#include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/lmdb/lmdb.hpp>
@@ -9,7 +8,6 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
-#include <boost/polymorphic_cast.hpp>
 
 #include <queue>
 
diff --git a/nano/node/lmdb/lmdb_txn.hpp b/nano/node/lmdb/lmdb_txn.hpp
index 6e0a4893e..884da8b4f 100644
--- a/nano/node/lmdb/lmdb_txn.hpp
+++ b/nano/node/lmdb/lmdb_txn.hpp
@@ -7,8 +7,6 @@
 #include <boost/property_tree/ptree_fwd.hpp>
 #include <boost/stacktrace/stacktrace_fwd.hpp>
 
-#include <mutex>
-
 #include <lmdb/libraries/liblmdb/lmdb.h>
 
 namespace nano
diff --git a/nano/node/messages.cpp b/nano/node/messages.cpp
index 31a254cd2..08a2796d1 100644
--- a/nano/node/messages.cpp
+++ b/nano/node/messages.cpp
@@ -12,9 +12,7 @@
 #include <boost/endian/conversion.hpp>
 #include <boost/format.hpp>
 #include <boost/pool/pool_alloc.hpp>
-#include <boost/variant/get.hpp>
 
-#include <numeric>
 #include <sstream>
 
 /*
diff --git a/nano/node/network.cpp b/nano/node/network.cpp
index 681450d3a..645747969 100644
--- a/nano/node/network.cpp
+++ b/nano/node/network.cpp
@@ -5,11 +5,7 @@
 #include <nano/node/telemetry.hpp>
 #include <nano/secure/buffer.hpp>
 
-#include <boost/asio/steady_timer.hpp>
 #include <boost/format.hpp>
-#include <boost/variant/get.hpp>
-
-#include <numeric>
 
 nano::network::network (nano::node & node_a, uint16_t port_a) :
 	id (nano::network_constants::active_network),
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index e6dd60497..78d150e64 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -7,9 +7,7 @@
 #include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/node/telemetry.hpp>
 #include <nano/node/websocket.hpp>
-#include <nano/rpc/rpc.hpp>
 #include <nano/secure/buffer.hpp>
-#include <nano/test_common/system.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/property_tree/json_parser.hpp>
diff --git a/nano/node/node_rpc_config.cpp b/nano/node/node_rpc_config.cpp
index e4bb2cc3d..719640910 100644
--- a/nano/node/node_rpc_config.cpp
+++ b/nano/node/node_rpc_config.cpp
@@ -1,4 +1,3 @@
-#include <nano/lib/config.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/tomlconfig.hpp>
 #include <nano/node/node_rpc_config.hpp>
diff --git a/nano/node/online_reps.hpp b/nano/node/online_reps.hpp
index 9e327ef3d..add5328a0 100644
--- a/nano/node/online_reps.hpp
+++ b/nano/node/online_reps.hpp
@@ -10,7 +10,6 @@
 #include <boost/multi_index_container.hpp>
 
 #include <memory>
-#include <unordered_set>
 #include <vector>
 
 namespace nano
diff --git a/nano/node/openclwork.cpp b/nano/node/openclwork.cpp
index ba722f73b..8389a19fb 100644
--- a/nano/node/openclwork.cpp
+++ b/nano/node/openclwork.cpp
@@ -7,7 +7,6 @@
 #include <boost/format.hpp>
 
 #include <array>
-#include <iostream>
 #include <string>
 #include <vector>
 
diff --git a/nano/node/portmapping.hpp b/nano/node/portmapping.hpp
index 7c355074f..27fe146f1 100644
--- a/nano/node/portmapping.hpp
+++ b/nano/node/portmapping.hpp
@@ -2,8 +2,6 @@
 
 #include <miniupnp/miniupnpc/include/miniupnpc.h>
 
-#include <mutex>
-
 namespace nano
 {
 class node;
diff --git a/nano/node/repcrawler.hpp b/nano/node/repcrawler.hpp
index 7186c944e..06c8645b5 100644
--- a/nano/node/repcrawler.hpp
+++ b/nano/node/repcrawler.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nano/node/common.hpp>
 #include <nano/node/transport/transport.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
diff --git a/nano/node/request_aggregator.cpp b/nano/node/request_aggregator.cpp
index 27ba5c390..9aa6144fb 100644
--- a/nano/node/request_aggregator.cpp
+++ b/nano/node/request_aggregator.cpp
@@ -5,7 +5,6 @@
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/request_aggregator.hpp>
-#include <nano/node/transport/udp.hpp>
 #include <nano/node/voting.hpp>
 #include <nano/node/wallet.hpp>
 #include <nano/secure/ledger.hpp>
diff --git a/nano/node/rocksdb/rocksdb.cpp b/nano/node/rocksdb/rocksdb.cpp
index 13713a909..1ee667f05 100644
--- a/nano/node/rocksdb/rocksdb.cpp
+++ b/nano/node/rocksdb/rocksdb.cpp
@@ -1,10 +1,8 @@
-#include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/rocksdbconfig.hpp>
 #include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/node/rocksdb/rocksdb_iterator.hpp>
 #include <nano/node/rocksdb/rocksdb_txn.hpp>
 
-#include <boost/endian/conversion.hpp>
 #include <boost/format.hpp>
 #include <boost/polymorphic_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -14,7 +12,6 @@
 #include <rocksdb/slice_transform.h>
 #include <rocksdb/utilities/backup_engine.h>
 #include <rocksdb/utilities/transaction.h>
-#include <rocksdb/utilities/transaction_db.h>
 
 namespace
 {
diff --git a/nano/node/rocksdb/rocksdb.hpp b/nano/node/rocksdb/rocksdb.hpp
index 34bdaf79d..60ee13334 100644
--- a/nano/node/rocksdb/rocksdb.hpp
+++ b/nano/node/rocksdb/rocksdb.hpp
@@ -23,7 +23,6 @@
 #include <rocksdb/slice.h>
 #include <rocksdb/table.h>
 #include <rocksdb/utilities/optimistic_transaction_db.h>
-#include <rocksdb/utilities/transaction.h>
 
 namespace nano
 {
diff --git a/nano/node/rocksdb/rocksdb_iterator.hpp b/nano/node/rocksdb/rocksdb_iterator.hpp
index 1845a9818..c4d401370 100644
--- a/nano/node/rocksdb/rocksdb_iterator.hpp
+++ b/nano/node/rocksdb/rocksdb_iterator.hpp
@@ -6,7 +6,6 @@
 #include <rocksdb/filter_policy.h>
 #include <rocksdb/options.h>
 #include <rocksdb/slice.h>
-#include <rocksdb/utilities/optimistic_transaction_db.h>
 #include <rocksdb/utilities/transaction.h>
 
 namespace
diff --git a/nano/node/rocksdb/rocksdb_txn.hpp b/nano/node/rocksdb/rocksdb_txn.hpp
index a5a7c1c6c..f77463da8 100644
--- a/nano/node/rocksdb/rocksdb_txn.hpp
+++ b/nano/node/rocksdb/rocksdb_txn.hpp
@@ -3,9 +3,7 @@
 #include <nano/secure/store.hpp>
 
 #include <rocksdb/db.h>
-#include <rocksdb/filter_policy.h>
 #include <rocksdb/options.h>
-#include <rocksdb/slice.h>
 #include <rocksdb/utilities/optimistic_transaction_db.h>
 #include <rocksdb/utilities/transaction.h>
 
diff --git a/nano/node/signatures.cpp b/nano/node/signatures.cpp
index 4af3c2db0..595623d3c 100644
--- a/nano/node/signatures.cpp
+++ b/nano/node/signatures.cpp
@@ -1,5 +1,4 @@
 #include <nano/boost/asio/post.hpp>
-#include <nano/lib/locks.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/node/signatures.hpp>
 
diff --git a/nano/node/signatures.hpp b/nano/node/signatures.hpp
index eb3e3294d..f1aa9f90c 100644
--- a/nano/node/signatures.hpp
+++ b/nano/node/signatures.hpp
@@ -5,7 +5,6 @@
 
 #include <atomic>
 #include <future>
-#include <mutex>
 
 namespace nano
 {
diff --git a/nano/node/socket.cpp b/nano/node/socket.cpp
index 926ec52f6..dbfaafa63 100644
--- a/nano/node/socket.cpp
+++ b/nano/node/socket.cpp
@@ -1,8 +1,5 @@
 #include <nano/boost/asio/bind_executor.hpp>
-#include <nano/boost/asio/dispatch.hpp>
-#include <nano/boost/asio/ip/address.hpp>
 #include <nano/boost/asio/ip/address_v6.hpp>
-#include <nano/boost/asio/ip/network_v6.hpp>
 #include <nano/boost/asio/read.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/socket.hpp>
diff --git a/nano/node/socket.hpp b/nano/node/socket.hpp
index 90cac64b7..213b0ad6d 100644
--- a/nano/node/socket.hpp
+++ b/nano/node/socket.hpp
@@ -4,10 +4,7 @@
 #include <nano/boost/asio/strand.hpp>
 #include <nano/lib/asio.hpp>
 
-#include <boost/optional.hpp>
-
 #include <chrono>
-#include <deque>
 #include <map>
 #include <memory>
 #include <vector>
diff --git a/nano/node/telemetry.cpp b/nano/node/telemetry.cpp
index 23d50de15..abb1c5d7e 100644
--- a/nano/node/telemetry.cpp
+++ b/nano/node/telemetry.cpp
@@ -5,7 +5,6 @@
 #include <nano/node/telemetry.hpp>
 #include <nano/node/transport/transport.hpp>
 #include <nano/node/unchecked_map.hpp>
-#include <nano/secure/buffer.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/secure/store.hpp>
 
diff --git a/nano/node/transport/message_deserializer.hpp b/nano/node/transport/message_deserializer.hpp
index bfacf2739..0ca6f0a2c 100644
--- a/nano/node/transport/message_deserializer.hpp
+++ b/nano/node/transport/message_deserializer.hpp
@@ -4,8 +4,6 @@
 #include <nano/node/messages.hpp>
 #include <nano/node/socket.hpp>
 
-#include <boost/system/error_code.hpp>
-
 #include <memory>
 #include <vector>
 
diff --git a/nano/node/transport/tcp_server.cpp b/nano/node/transport/tcp_server.cpp
index 557734f0c..854e8ddd2 100644
--- a/nano/node/transport/tcp_server.cpp
+++ b/nano/node/transport/tcp_server.cpp
@@ -7,7 +7,6 @@
 #include <nano/node/transport/tcp_server.hpp>
 
 #include <boost/format.hpp>
-#include <boost/variant/get.hpp>
 
 nano::transport::tcp_listener::tcp_listener (uint16_t port_a, nano::node & node_a) :
 	node (node_a),
diff --git a/nano/node/transport/tcp_server.hpp b/nano/node/transport/tcp_server.hpp
index 6ba2d2399..6504bbc56 100644
--- a/nano/node/transport/tcp_server.hpp
+++ b/nano/node/transport/tcp_server.hpp
@@ -5,7 +5,6 @@
 #include <nano/node/socket.hpp>
 
 #include <atomic>
-#include <queue>
 
 namespace nano
 {
diff --git a/nano/node/transport/transport.cpp b/nano/node/transport/transport.cpp
index 129477c10..f25d4581c 100644
--- a/nano/node/transport/transport.cpp
+++ b/nano/node/transport/transport.cpp
@@ -1,6 +1,5 @@
 #include <nano/node/common.hpp>
 #include <nano/node/node.hpp>
-#include <nano/node/transport/inproc.hpp>
 #include <nano/node/transport/transport.hpp>
 
 #include <boost/asio/ip/address.hpp>
@@ -8,8 +7,6 @@
 #include <boost/asio/ip/address_v6.hpp>
 #include <boost/format.hpp>
 
-#include <numeric>
-
 nano::endpoint nano::transport::map_endpoint_to_v6 (nano::endpoint const & endpoint_a)
 {
 	auto endpoint_l (endpoint_a);
diff --git a/nano/node/transport/transport.hpp b/nano/node/transport/transport.hpp
index 02b60df24..5d1b7ed95 100644
--- a/nano/node/transport/transport.hpp
+++ b/nano/node/transport/transport.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <nano/lib/locks.hpp>
-#include <nano/lib/rate_limiting.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/node/bandwidth_limiter.hpp>
 #include <nano/node/common.hpp>
diff --git a/nano/node/transport/udp.cpp b/nano/node/transport/udp.cpp
index d10bf4949..49849f02f 100644
--- a/nano/node/transport/udp.cpp
+++ b/nano/node/transport/udp.cpp
@@ -1,5 +1,4 @@
 #include <nano/boost/asio/bind_executor.hpp>
-#include <nano/boost/asio/dispatch.hpp>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/node/node.hpp>
diff --git a/nano/node/unchecked_map.cpp b/nano/node/unchecked_map.cpp
index 0e9cae0cc..923863149 100644
--- a/nano/node/unchecked_map.cpp
+++ b/nano/node/unchecked_map.cpp
@@ -4,8 +4,6 @@
 #include <nano/node/unchecked_map.hpp>
 #include <nano/secure/store.hpp>
 
-#include <boost/range/join.hpp>
-
 nano::unchecked_map::unchecked_map (nano::store & store, bool const & disable_delete) :
 	store{ store },
 	disable_delete{ disable_delete },
diff --git a/nano/node/unchecked_map.hpp b/nano/node/unchecked_map.hpp
index b699594ea..30fc3e96f 100644
--- a/nano/node/unchecked_map.hpp
+++ b/nano/node/unchecked_map.hpp
@@ -10,9 +10,7 @@
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index_container.hpp>
 
-#include <atomic>
 #include <thread>
-#include <unordered_map>
 
 namespace mi = boost::multi_index;
 
diff --git a/nano/node/vote_cache.hpp b/nano/node/vote_cache.hpp
index 379f008bb..a29443b0e 100644
--- a/nano/node/vote_cache.hpp
+++ b/nano/node/vote_cache.hpp
@@ -2,22 +2,17 @@
 
 #include <nano/lib/locks.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/lib/timer.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/secure/common.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/ordered_index.hpp>
-#include <boost/multi_index/random_access_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index_container.hpp>
 
-#include <condition_variable>
 #include <memory>
 #include <optional>
-#include <queue>
-#include <thread>
 #include <vector>
 
 namespace mi = boost::multi_index;
diff --git a/nano/node/vote_processor.cpp b/nano/node/vote_processor.cpp
index 5a1d30f0b..628098b9b 100644
--- a/nano/node/vote_processor.cpp
+++ b/nano/node/vote_processor.cpp
@@ -11,7 +11,6 @@
 #include <nano/node/vote_processor.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
-#include <nano/secure/store.hpp>
 
 #include <boost/format.hpp>
 
diff --git a/nano/node/vote_processor.hpp b/nano/node/vote_processor.hpp
index 20b550de8..56a696413 100644
--- a/nano/node/vote_processor.hpp
+++ b/nano/node/vote_processor.hpp
@@ -6,7 +6,6 @@
 
 #include <deque>
 #include <memory>
-#include <mutex>
 #include <thread>
 #include <unordered_set>
 
diff --git a/nano/node/voting.hpp b/nano/node/voting.hpp
index 53928b08b..ff852b86e 100644
--- a/nano/node/voting.hpp
+++ b/nano/node/voting.hpp
@@ -15,7 +15,6 @@
 
 #include <condition_variable>
 #include <deque>
-#include <mutex>
 #include <thread>
 
 namespace mi = boost::multi_index;
diff --git a/nano/node/websocket.hpp b/nano/node/websocket.hpp
index f4569e5c5..f3bc9fc29 100644
--- a/nano/node/websocket.hpp
+++ b/nano/node/websocket.hpp
@@ -12,7 +12,6 @@
 
 #include <deque>
 #include <memory>
-#include <mutex>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/nano/node/write_database_queue.hpp b/nano/node/write_database_queue.hpp
index cb0bab08d..4443eca6c 100644
--- a/nano/node/write_database_queue.hpp
+++ b/nano/node/write_database_queue.hpp
@@ -5,7 +5,6 @@
 #include <condition_variable>
 #include <deque>
 #include <functional>
-#include <mutex>
 
 namespace nano
 {