diff --git a/nano/core_test/active_transactions.cpp b/nano/core_test/active_transactions.cpp
index dc59f954f..2b1bc50d0 100644
--- a/nano/core_test/active_transactions.cpp
+++ b/nano/core_test/active_transactions.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/scheduler/component.hpp>
diff --git a/nano/core_test/backlog.cpp b/nano/core_test/backlog.cpp
index facbf0b53..fa58f702c 100644
--- a/nano/core_test/backlog.cpp
+++ b/nano/core_test/backlog.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/active_transactions.hpp>
 #include <nano/test_common/chains.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/block.cpp b/nano/core_test/block.cpp
index 2b6692082..b187f63bb 100644
--- a/nano/core_test/block.cpp
+++ b/nano/core_test/block.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/node/common.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp
index 56f1c838f..2b96b65b2 100644
--- a/nano/core_test/block_store.cpp
+++ b/nano/core_test/block_store.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/lmdbconfig.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats.hpp>
diff --git a/nano/core_test/blockprocessor.cpp b/nano/core_test/blockprocessor.cpp
index 38ccdc65b..381cd1a91 100644
--- a/nano/core_test/blockprocessor.cpp
+++ b/nano/core_test/blockprocessor.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/blockbuilders.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/secure/common.hpp>
diff --git a/nano/core_test/bootstrap.cpp b/nano/core_test/bootstrap.cpp
index d1fbbb375..27c78bb20 100644
--- a/nano/core_test/bootstrap.cpp
+++ b/nano/core_test/bootstrap.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/bootstrap/block_deserializer.hpp>
 #include <nano/node/bootstrap/bootstrap_frontier.hpp>
 #include <nano/node/bootstrap/bootstrap_lazy.hpp>
diff --git a/nano/core_test/bootstrap_ascending.cpp b/nano/core_test/bootstrap_ascending.cpp
index a9ca25845..257b35c60 100644
--- a/nano/core_test/bootstrap_ascending.cpp
+++ b/nano/core_test/bootstrap_ascending.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/tomlconfig.hpp>
diff --git a/nano/core_test/bootstrap_server.cpp b/nano/core_test/bootstrap_server.cpp
index 9be0f8eb9..80abdd800 100644
--- a/nano/core_test/bootstrap_server.cpp
+++ b/nano/core_test/bootstrap_server.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/test_common/chains.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp
index 906c6bc2d..b0d3c4169 100644
--- a/nano/core_test/confirmation_height.cpp
+++ b/nano/core_test/confirmation_height.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/make_store.hpp>
diff --git a/nano/core_test/confirmation_solicitor.cpp b/nano/core_test/confirmation_solicitor.cpp
index c47ae54e8..6cad12213 100644
--- a/nano/core_test/confirmation_solicitor.cpp
+++ b/nano/core_test/confirmation_solicitor.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/confirmation_solicitor.hpp>
 #include <nano/node/transport/inproc.hpp>
diff --git a/nano/core_test/conflicts.cpp b/nano/core_test/conflicts.cpp
index 644388bdb..65ff27d1f 100644
--- a/nano/core_test/conflicts.cpp
+++ b/nano/core_test/conflicts.cpp
@@ -1,4 +1,4 @@
-
+#include <nano/lib/blocks.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/core_test/election.cpp b/nano/core_test/election.cpp
index fc193cc65..d008489f1 100644
--- a/nano/core_test/election.cpp
+++ b/nano/core_test/election.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/core_test/election_scheduler.cpp b/nano/core_test/election_scheduler.cpp
index af028dd99..b2af2740b 100644
--- a/nano/core_test/election_scheduler.cpp
+++ b/nano/core_test/election_scheduler.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/frontiers_confirmation.cpp b/nano/core_test/frontiers_confirmation.cpp
index 76812a6bc..9d476ed35 100644
--- a/nano/core_test/frontiers_confirmation.cpp
+++ b/nano/core_test/frontiers_confirmation.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/active_transactions.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp
index eb29e207d..616324a6a 100644
--- a/nano/core_test/ledger.cpp
+++ b/nano/core_test/ledger.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/threading.hpp>
diff --git a/nano/core_test/memory_pool.cpp b/nano/core_test/memory_pool.cpp
index 3e5049bc0..1d9c1fc1b 100644
--- a/nano/core_test/memory_pool.cpp
+++ b/nano/core_test/memory_pool.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/memory.hpp>
 #include <nano/node/active_transactions.hpp>
 #include <nano/secure/common.hpp>
diff --git a/nano/core_test/message.cpp b/nano/core_test/message.cpp
index 102af44db..3053bbf04 100644
--- a/nano/core_test/message.cpp
+++ b/nano/core_test/message.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/network.hpp>
diff --git a/nano/core_test/message_deserializer.cpp b/nano/core_test/message_deserializer.cpp
index 271330491..44e9fa06d 100644
--- a/nano/core_test/message_deserializer.cpp
+++ b/nano/core_test/message_deserializer.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/transport/message_deserializer.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/core_test/network.cpp b/nano/core_test/network.cpp
index e6a514b9a..2e15d5ef9 100644
--- a/nano/core_test/network.cpp
+++ b/nano/core_test/network.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/scheduler/component.hpp>
diff --git a/nano/core_test/network_filter.cpp b/nano/core_test/network_filter.cpp
index ae7f47e83..a886ae956 100644
--- a/nano/core_test/network_filter.cpp
+++ b/nano/core_test/network_filter.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/node/common.hpp>
 #include <nano/secure/common.hpp>
diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
index fa999b31b..28dcae3dd 100644
--- a/nano/core_test/node.cpp
+++ b/nano/core_test/node.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/core_test/optimistic_scheduler.cpp b/nano/core_test/optimistic_scheduler.cpp
index 0f03c04fc..789eb66b3 100644
--- a/nano/core_test/optimistic_scheduler.cpp
+++ b/nano/core_test/optimistic_scheduler.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/election.hpp>
 #include <nano/test_common/chains.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/processor_service.cpp b/nano/core_test/processor_service.cpp
index 9a9f33b10..959495d1d 100644
--- a/nano/core_test/processor_service.cpp
+++ b/nano/core_test/processor_service.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/work.hpp>
diff --git a/nano/core_test/request_aggregator.cpp b/nano/core_test/request_aggregator.cpp
index dff321552..94f6d8c1b 100644
--- a/nano/core_test/request_aggregator.cpp
+++ b/nano/core_test/request_aggregator.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/request_aggregator.hpp>
 #include <nano/node/transport/inproc.hpp>
diff --git a/nano/core_test/scheduler_buckets.cpp b/nano/core_test/scheduler_buckets.cpp
index 0b3aff238..43912e29b 100644
--- a/nano/core_test/scheduler_buckets.cpp
+++ b/nano/core_test/scheduler_buckets.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/scheduler/buckets.hpp>
 #include <nano/secure/common.hpp>
 
diff --git a/nano/core_test/system.cpp b/nano/core_test/system.cpp
index 8ac65cc76..b89524e8d 100644
--- a/nano/core_test/system.cpp
+++ b/nano/core_test/system.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/node/transport/inproc.hpp>
 #include <nano/test_common/network.hpp>
diff --git a/nano/core_test/unchecked_map.cpp b/nano/core_test/unchecked_map.cpp
index 3688b6f5e..105ee3131 100644
--- a/nano/core_test/unchecked_map.cpp
+++ b/nano/core_test/unchecked_map.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/blockbuilders.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/node/unchecked_map.hpp>
 #include <nano/secure/common.hpp>
diff --git a/nano/core_test/vote_processor.cpp b/nano/core_test/vote_processor.cpp
index c19a89534..1da68596e 100644
--- a/nano/core_test/vote_processor.cpp
+++ b/nano/core_test/vote_processor.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/transport/inproc.hpp>
 #include <nano/node/vote_processor.hpp>
diff --git a/nano/core_test/voting.cpp b/nano/core_test/voting.cpp
index cc95dd846..cf210e3a1 100644
--- a/nano/core_test/voting.cpp
+++ b/nano/core_test/voting.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/voting.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp
index 3c9802c63..079eb007c 100644
--- a/nano/core_test/wallet.cpp
+++ b/nano/core_test/wallet.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/store/lmdb/wallet_value.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp
index 38009cdb1..f624f70de 100644
--- a/nano/core_test/wallets.cpp
+++ b/nano/core_test/wallets.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/store/versioning.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/core_test/websocket.cpp b/nano/core_test/websocket.cpp
index 317d999e7..0735b5e4d 100644
--- a/nano/core_test/websocket.cpp
+++ b/nano/core_test/websocket.cpp
@@ -1,4 +1,5 @@
 #include <nano/core_test/fakes/websocket_client.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/node/transport/fake.hpp>
 #include <nano/node/websocket.hpp>
 #include <nano/test_common/network.hpp>
diff --git a/nano/lib/block_sideband.hpp b/nano/lib/block_sideband.hpp
index dc7e8a428..871f9bfcf 100644
--- a/nano/lib/block_sideband.hpp
+++ b/nano/lib/block_sideband.hpp
@@ -7,6 +7,7 @@
 #include <nano/lib/timer.hpp>
 
 #include <cstdint>
+#include <memory>
 
 namespace nano
 {
diff --git a/nano/lib/blockbuilders.cpp b/nano/lib/blockbuilders.cpp
index 69b375eb1..d8fa600f8 100644
--- a/nano/lib/blockbuilders.cpp
+++ b/nano/lib/blockbuilders.cpp
@@ -1,4 +1,7 @@
 #include <nano/lib/blockbuilders.hpp>
+#include <nano/lib/blocks.hpp>
+#include <nano/lib/errors.hpp>
+#include <nano/lib/utility.hpp>
 
 #include <unordered_map>
 
diff --git a/nano/lib/blockbuilders.hpp b/nano/lib/blockbuilders.hpp
index 077d58401..1471c9bb2 100644
--- a/nano/lib/blockbuilders.hpp
+++ b/nano/lib/blockbuilders.hpp
@@ -1,9 +1,18 @@
 #pragma once
 
-#include <nano/lib/blocks.hpp>
+#include <nano/lib/numbers.hpp>
 
 #include <memory>
 
+namespace nano
+{
+class change_block;
+class send_block;
+class state_block;
+class open_block;
+class receive_block;
+}
+
 namespace nano
 {
 /** Flags to track builder state */
diff --git a/nano/lib/blocks.cpp b/nano/lib/blocks.cpp
index 0ad893339..688e614d1 100644
--- a/nano/lib/blocks.cpp
+++ b/nano/lib/blocks.cpp
@@ -13,6 +13,12 @@
 #include <cryptopp/words.h>
 #include <magic_enum.hpp>
 
+size_t constexpr nano::send_block::size;
+size_t constexpr nano::receive_block::size;
+size_t constexpr nano::open_block::size;
+size_t constexpr nano::change_block::size;
+size_t constexpr nano::state_block::size;
+
 /** Compare blocks, first by type, then content. This is an optimization over dynamic_cast, which is very slow on some platforms. */
 namespace
 {
diff --git a/nano/lib/blocks.hpp b/nano/lib/blocks.hpp
index 514adedfa..0cb6969ca 100644
--- a/nano/lib/blocks.hpp
+++ b/nano/lib/blocks.hpp
@@ -83,8 +83,6 @@ public: // Logging
 	virtual void operator() (nano::object_stream &) const;
 };
 
-using block_list_t = std::vector<std::shared_ptr<nano::block>>;
-
 class send_hashables
 {
 public:
diff --git a/nano/load_test/entry.cpp b/nano/load_test/entry.cpp
index e41e376ab..13f56e38c 100644
--- a/nano/load_test/entry.cpp
+++ b/nano/load_test/entry.cpp
@@ -4,6 +4,7 @@
 #include <nano/boost/beast/core/flat_buffer.hpp>
 #include <nano/boost/beast/http.hpp>
 #include <nano/boost/process/child.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/threading.hpp>
diff --git a/nano/nano_node/entry.cpp b/nano/nano_node/entry.cpp
index 744df8d63..42a79a8a2 100644
--- a/nano/nano_node/entry.cpp
+++ b/nano/nano_node/entry.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/cli.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/utility.hpp>
diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp
index 585bb4280..2545c5d41 100644
--- a/nano/node/active_transactions.cpp
+++ b/nano/node/active_transactions.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/node/active_transactions.hpp>
 #include <nano/node/confirmation_height_processor.hpp>
diff --git a/nano/node/blockprocessor.cpp b/nano/node/blockprocessor.cpp
index 24ed80677..731a000f7 100644
--- a/nano/node/blockprocessor.cpp
+++ b/nano/node/blockprocessor.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/node/blockprocessor.hpp>
diff --git a/nano/node/blockprocessor.hpp b/nano/node/blockprocessor.hpp
index 3cc7663c2..f0dae027c 100644
--- a/nano/node/blockprocessor.hpp
+++ b/nano/node/blockprocessor.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/secure/common.hpp>
 
@@ -10,6 +9,13 @@
 #include <optional>
 #include <thread>
 
+namespace nano
+{
+class block;
+class node;
+class write_database_queue;
+}
+
 namespace nano::store
 {
 class write_transaction;
@@ -17,8 +23,6 @@ class write_transaction;
 
 namespace nano
 {
-class node;
-class write_database_queue;
 
 enum class block_source
 {
diff --git a/nano/node/bootstrap/block_deserializer.hpp b/nano/node/bootstrap/block_deserializer.hpp
index 9e53aa790..98499200d 100644
--- a/nano/node/bootstrap/block_deserializer.hpp
+++ b/nano/node/bootstrap/block_deserializer.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include <nano/lib/blocks.hpp>
+#include <nano/lib/block_type.hpp>
+
+#include <boost/system/error_code.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/nano/node/bootstrap/bootstrap_attempt.cpp b/nano/node/bootstrap/bootstrap_attempt.cpp
index 4057dd8e0..390d50267 100644
--- a/nano/node/bootstrap/bootstrap_attempt.cpp
+++ b/nano/node/bootstrap/bootstrap_attempt.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/bootstrap/bootstrap.hpp>
 #include <nano/node/bootstrap/bootstrap_attempt.hpp>
 #include <nano/node/bootstrap/bootstrap_bulk_push.hpp>
diff --git a/nano/node/bootstrap/bootstrap_bulk_pull.cpp b/nano/node/bootstrap/bootstrap_bulk_pull.cpp
index 276e64418..cad42863b 100644
--- a/nano/node/bootstrap/bootstrap_bulk_pull.cpp
+++ b/nano/node/bootstrap/bootstrap_bulk_pull.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/bootstrap/block_deserializer.hpp>
 #include <nano/node/bootstrap/bootstrap.hpp>
 #include <nano/node/bootstrap/bootstrap_bulk_pull.hpp>
diff --git a/nano/node/bootstrap/bootstrap_bulk_push.cpp b/nano/node/bootstrap/bootstrap_bulk_push.cpp
index 5ff069ba1..8a1e81118 100644
--- a/nano/node/bootstrap/bootstrap_bulk_push.cpp
+++ b/nano/node/bootstrap/bootstrap_bulk_push.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/bootstrap/bootstrap_attempt.hpp>
 #include <nano/node/bootstrap/bootstrap_bulk_push.hpp>
 #include <nano/node/bootstrap/bootstrap_legacy.hpp>
diff --git a/nano/node/bootstrap/bootstrap_frontier.hpp b/nano/node/bootstrap/bootstrap_frontier.hpp
index 1f6575cd0..75ee9c1ab 100644
--- a/nano/node/bootstrap/bootstrap_frontier.hpp
+++ b/nano/node/bootstrap/bootstrap_frontier.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
+#include <nano/lib/numbers.hpp>
+
 #include <deque>
 #include <future>
+#include <memory>
 
 namespace nano
 {
diff --git a/nano/node/bootstrap/bootstrap_lazy.cpp b/nano/node/bootstrap/bootstrap_lazy.cpp
index d69916a9c..2c524c3f6 100644
--- a/nano/node/bootstrap/bootstrap_lazy.cpp
+++ b/nano/node/bootstrap/bootstrap_lazy.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/bootstrap/bootstrap.hpp>
 #include <nano/node/bootstrap/bootstrap_lazy.hpp>
 #include <nano/node/common.hpp>
diff --git a/nano/node/bootstrap/bootstrap_server.cpp b/nano/node/bootstrap/bootstrap_server.cpp
index 5585212fd..91ba1838b 100644
--- a/nano/node/bootstrap/bootstrap_server.cpp
+++ b/nano/node/bootstrap/bootstrap_server.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/bootstrap/bootstrap_server.hpp>
 #include <nano/node/transport/channel.hpp>
diff --git a/nano/node/bootstrap_ascending/service.cpp b/nano/node/bootstrap_ascending/service.cpp
index 1ab136284..909d643a2 100644
--- a/nano/node/bootstrap_ascending/service.cpp
+++ b/nano/node/bootstrap_ascending/service.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats_enums.hpp>
 #include <nano/node/blockprocessor.hpp>
 #include <nano/node/bootstrap_ascending/service.hpp>
diff --git a/nano/node/cli.cpp b/nano/node/cli.cpp
index bc829fcbb..984f1656f 100644
--- a/nano/node/cli.cpp
+++ b/nano/node/cli.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/cli.hpp>
 #include <nano/lib/tlsconfig.hpp>
 #include <nano/lib/tomlconfig.hpp>
diff --git a/nano/node/confirmation_height_bounded.cpp b/nano/node/confirmation_height_bounded.cpp
index 26cc21b42..53c3ffbf3 100644
--- a/nano/node/confirmation_height_bounded.cpp
+++ b/nano/node/confirmation_height_bounded.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/node/confirmation_height_bounded.hpp>
 #include <nano/node/write_database_queue.hpp>
diff --git a/nano/node/confirmation_height_processor.cpp b/nano/node/confirmation_height_processor.cpp
index 4b9d9d82a..e60816444 100644
--- a/nano/node/confirmation_height_processor.cpp
+++ b/nano/node/confirmation_height_processor.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/thread_roles.hpp>
 #include <nano/lib/utility.hpp>
@@ -239,3 +240,8 @@ nano::block_hash nano::confirmation_height_processor::current () const
 	nano::lock_guard<nano::mutex> lk (mutex);
 	return original_block ? original_block->hash () : 0;
 }
+
+std::reference_wrapper<nano::block_hash const> nano::confirmation_height_processor::block_wrapper::hash () const
+{
+	return block->hash ();
+}
diff --git a/nano/node/confirmation_height_processor.hpp b/nano/node/confirmation_height_processor.hpp
index d31267833..828a61611 100644
--- a/nano/node/confirmation_height_processor.hpp
+++ b/nano/node/confirmation_height_processor.hpp
@@ -65,10 +65,7 @@ private:
 		{
 		}
 
-		std::reference_wrapper<nano::block_hash const> hash () const
-		{
-			return block->hash ();
-		}
+		std::reference_wrapper<nano::block_hash const> hash () const;
 
 		std::shared_ptr<nano::block> block;
 	};
diff --git a/nano/node/confirmation_height_unbounded.cpp b/nano/node/confirmation_height_unbounded.cpp
index 18c1e0dc2..03c4c42a2 100644
--- a/nano/node/confirmation_height_unbounded.cpp
+++ b/nano/node/confirmation_height_unbounded.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/node/confirmation_height_unbounded.hpp>
 #include <nano/node/write_database_queue.hpp>
diff --git a/nano/node/confirmation_solicitor.cpp b/nano/node/confirmation_solicitor.cpp
index cece99c53..feb782453 100644
--- a/nano/node/confirmation_solicitor.cpp
+++ b/nano/node/confirmation_solicitor.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/confirmation_solicitor.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/nodeconfig.hpp>
diff --git a/nano/node/election.cpp b/nano/node/election.cpp
index d967201d2..d01d3718b 100644
--- a/nano/node/election.cpp
+++ b/nano/node/election.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/confirmation_solicitor.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/network.hpp>
@@ -801,4 +802,4 @@ void nano::election_extended_status::operator() (nano::object_stream & obs) cons
 		obs.write ("hash", block->hash ().to_string ());
 		obs.write ("amount", amount);
 	});
-}
\ No newline at end of file
+}
diff --git a/nano/node/epoch_upgrader.cpp b/nano/node/epoch_upgrader.cpp
index 9072b5329..48007b355 100644
--- a/nano/node/epoch_upgrader.cpp
+++ b/nano/node/epoch_upgrader.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/node/epoch_upgrader.hpp>
 #include <nano/node/node.hpp>
diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp
index ec02593e0..16344c4cb 100644
--- a/nano/node/json_handler.cpp
+++ b/nano/node/json_handler.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/json_error_response.hpp>
 #include <nano/lib/timer.hpp>
diff --git a/nano/node/local_block_broadcaster.cpp b/nano/node/local_block_broadcaster.cpp
index 0e5097e59..59c0e4dff 100644
--- a/nano/node/local_block_broadcaster.cpp
+++ b/nano/node/local_block_broadcaster.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/blockprocessor.hpp>
@@ -167,4 +168,9 @@ std::unique_ptr<nano::container_info_component> nano::local_block_broadcaster::c
 	auto composite = std::make_unique<container_info_composite> (name);
 	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "local", local_blocks.size (), sizeof (decltype (local_blocks)::value_type) }));
 	return composite;
-}
\ No newline at end of file
+}
+
+nano::block_hash nano::local_block_broadcaster::local_entry::hash () const
+{
+	return block->hash ();
+}
diff --git a/nano/node/local_block_broadcaster.hpp b/nano/node/local_block_broadcaster.hpp
index 486fe8551..b4e7093dd 100644
--- a/nano/node/local_block_broadcaster.hpp
+++ b/nano/node/local_block_broadcaster.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nano/lib/blocks.hpp>
 #include <nano/lib/locks.hpp>
 #include <nano/lib/processing_queue.hpp>
 #include <nano/node/bandwidth_limiter.hpp>
@@ -66,10 +65,7 @@ private:
 		std::chrono::steady_clock::time_point const arrival;
 		mutable std::chrono::steady_clock::time_point last_broadcast{}; // Not part of any index
 
-		nano::block_hash hash () const
-		{
-			return block->hash ();
-		}
+		nano::block_hash hash () const;
 	};
 
 	// clang-format off
diff --git a/nano/node/messages.hpp b/nano/node/messages.hpp
index 4e9401af2..11d96d6ba 100644
--- a/nano/node/messages.hpp
+++ b/nano/node/messages.hpp
@@ -2,7 +2,6 @@
 
 #include <nano/lib/asio.hpp>
 #include <nano/lib/block_uniquer.hpp>
-#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/errors.hpp>
 #include <nano/lib/jsonconfig.hpp>
diff --git a/nano/node/network.cpp b/nano/node/network.cpp
index 0c9cf2268..5da1940e0 100644
--- a/nano/node/network.cpp
+++ b/nano/node/network.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool_shuffle.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/bootstrap_ascending/service.hpp>
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index b202b8b01..77651c6b5 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/lib/tomlconfig.hpp>
 #include <nano/lib/utility.hpp>
diff --git a/nano/node/nodeconfig.cpp b/nano/node/nodeconfig.cpp
index 175d78477..beb93cb4f 100644
--- a/nano/node/nodeconfig.cpp
+++ b/nano/node/nodeconfig.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/rpcconfig.hpp>
@@ -560,4 +561,4 @@ nano::account nano::node_config::random_representative () const
 	std::size_t index (nano::random_pool::generate_word32 (0, static_cast<CryptoPP::word32> (preconfigured_representatives.size () - 1)));
 	auto result (preconfigured_representatives[index]);
 	return result;
-}
\ No newline at end of file
+}
diff --git a/nano/node/request_aggregator.cpp b/nano/node/request_aggregator.cpp
index 452f0e0ba..f822ace91 100644
--- a/nano/node/request_aggregator.cpp
+++ b/nano/node/request_aggregator.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/node/active_transactions.hpp>
 #include <nano/node/common.hpp>
diff --git a/nano/node/scheduler/optimistic.cpp b/nano/node/scheduler/optimistic.cpp
index bd5247957..8672d976e 100644
--- a/nano/node/scheduler/optimistic.cpp
+++ b/nano/node/scheduler/optimistic.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/tomlconfig.hpp>
 #include <nano/node/node.hpp>
diff --git a/nano/node/scheduler/priority.cpp b/nano/node/scheduler/priority.cpp
index c503601a9..f5525895a 100644
--- a/nano/node/scheduler/priority.cpp
+++ b/nano/node/scheduler/priority.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/scheduler/buckets.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/node/telemetry.cpp b/nano/node/telemetry.cpp
index e1fe6ece9..5e5b15fd2 100644
--- a/nano/node/telemetry.cpp
+++ b/nano/node/telemetry.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/node/network.hpp>
@@ -439,4 +440,4 @@ nano::telemetry_data nano::consolidate_telemetry_data (std::vector<nano::telemet
 	consolidated_data.maker = boost::lexical_cast<uint8_t> (version_fragments[4]);
 
 	return consolidated_data;
-}
\ No newline at end of file
+}
diff --git a/nano/node/unchecked_map.cpp b/nano/node/unchecked_map.cpp
index b20651d79..4d65a40d2 100644
--- a/nano/node/unchecked_map.cpp
+++ b/nano/node/unchecked_map.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/locks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/stats_enums.hpp>
diff --git a/nano/node/voting.cpp b/nano/node/voting.cpp
index 9ea31745d..9967f7edb 100644
--- a/nano/node/voting.cpp
+++ b/nano/node/voting.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/network.hpp>
diff --git a/nano/node/wallet.cpp b/nano/node/wallet.cpp
index e1c2d7a83..53380f4b3 100644
--- a/nano/node/wallet.cpp
+++ b/nano/node/wallet.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/node/websocket.cpp b/nano/node/websocket.cpp
index c2b3af2f9..dbd16637a 100644
--- a/nano/node/websocket.cpp
+++ b/nano/node/websocket.cpp
@@ -1,6 +1,7 @@
 #include <nano/boost/asio/bind_executor.hpp>
 #include <nano/boost/asio/dispatch.hpp>
 #include <nano/boost/asio/strand.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/tlsconfig.hpp>
 #include <nano/lib/work.hpp>
@@ -1078,4 +1079,4 @@ void nano::websocket_server::stop ()
 	{
 		server->stop ();
 	}
-}
\ No newline at end of file
+}
diff --git a/nano/node/websocket.hpp b/nano/node/websocket.hpp
index 6bb7426a0..4b58bae7f 100644
--- a/nano/node/websocket.hpp
+++ b/nano/node/websocket.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nano/lib/blocks.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/work.hpp>
 #include <nano/node/common.hpp>
@@ -20,6 +19,7 @@
 
 namespace nano
 {
+class block;
 class wallets;
 class logger;
 class vote;
diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp
index efd112cd7..e189c5855 100644
--- a/nano/qt/qt.cpp
+++ b/nano/qt/qt.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/qt/qt.hpp>
 
diff --git a/nano/qt_test/qt.cpp b/nano/qt_test/qt.cpp
index 3f1972bd1..6ff9e931f 100644
--- a/nano/qt_test/qt.cpp
+++ b/nano/qt_test/qt.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/make_store.hpp>
 #include <nano/qt/qt.hpp>
 #include <nano/test_common/network.hpp>
diff --git a/nano/rpc_test/receivable.cpp b/nano/rpc_test/receivable.cpp
index 81563180d..658216169 100644
--- a/nano/rpc_test/receivable.cpp
+++ b/nano/rpc_test/receivable.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/ipc/ipc_server.hpp>
 #include <nano/rpc/rpc_request_processor.hpp>
 #include <nano/rpc_test/common.hpp>
diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp
index da0b1af1a..f6fe1b065 100644
--- a/nano/rpc_test/rpc.cpp
+++ b/nano/rpc_test/rpc.cpp
@@ -1,5 +1,6 @@
 #include <nano/boost/beast/core/flat_buffer.hpp>
 #include <nano/boost/beast/http.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/rpcconfig.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/threading.hpp>
diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp
index d34f9daf0..091e45fcc 100644
--- a/nano/secure/common.cpp
+++ b/nano/secure/common.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/timer.hpp>
@@ -17,12 +18,6 @@
 #include <cryptopp/words.h>
 #include <magic_enum.hpp>
 
-size_t constexpr nano::send_block::size;
-size_t constexpr nano::receive_block::size;
-size_t constexpr nano::open_block::size;
-size_t constexpr nano::change_block::size;
-size_t constexpr nano::state_block::size;
-
 nano::networks nano::network_constants::active_network = nano::networks::ACTIVE_NETWORK;
 
 namespace
diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp
index 2e183267d..9ce685825 100644
--- a/nano/secure/common.hpp
+++ b/nano/secure/common.hpp
@@ -2,7 +2,6 @@
 
 #include <nano/crypto/blake2/blake2.h>
 #include <nano/lib/blockbuilders.hpp>
-#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/epoch.hpp>
 #include <nano/lib/numbers.hpp>
diff --git a/nano/secure/ledger.cpp b/nano/secure/ledger.cpp
index d7464f4e0..92f76a405 100644
--- a/nano/secure/ledger.cpp
+++ b/nano/secure/ledger.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/rep_weights.hpp>
 #include <nano/lib/stats.hpp>
diff --git a/nano/secure/network_filter.cpp b/nano/secure/network_filter.cpp
index 059cddb30..c60a11174 100644
--- a/nano/secure/network_filter.cpp
+++ b/nano/secure/network_filter.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/locks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/secure/common.hpp>
diff --git a/nano/secure/utility.cpp b/nano/secure/utility.cpp
index d7e263d81..07d647246 100644
--- a/nano/secure/utility.cpp
+++ b/nano/secure/utility.cpp
@@ -2,6 +2,8 @@
 #include <nano/secure/utility.hpp>
 #include <nano/secure/working.hpp>
 
+#include <boost/system/error_code.hpp>
+
 #include <random>
 
 static std::vector<std::filesystem::path> all_unique_paths;
diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp
index b9b8e4ed4..7aa3a4d34 100644
--- a/nano/slow_test/node.cpp
+++ b/nano/slow_test/node.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/slow_test/vote_cache.cpp b/nano/slow_test/vote_cache.cpp
index 3c4a7ccb4..1e0b4abae 100644
--- a/nano/slow_test/vote_cache.cpp
+++ b/nano/slow_test/vote_cache.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/test_common/rate_observer.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/slow_test/vote_processor.cpp b/nano/slow_test/vote_processor.cpp
index ff1ae1f52..4dc3c0999 100644
--- a/nano/slow_test/vote_processor.cpp
+++ b/nano/slow_test/vote_processor.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/transport/inproc.hpp>
 #include <nano/node/vote_processor.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/store/block.hpp b/nano/store/block.hpp
index c0d252a65..ad1fd5591 100644
--- a/nano/store/block.hpp
+++ b/nano/store/block.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <nano/lib/block_sideband.hpp>
-#include <nano/lib/blocks.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/store/component.hpp>
 #include <nano/store/iterator.hpp>
@@ -10,6 +9,7 @@
 
 namespace nano
 {
+class block;
 class block_hash;
 }
 namespace nano::store
diff --git a/nano/store/component.cpp b/nano/store/component.cpp
index cd68dc2a0..67826f634 100644
--- a/nano/store/component.cpp
+++ b/nano/store/component.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/store/account.hpp>
 #include <nano/store/block.hpp>
diff --git a/nano/store/lmdb/lmdb_env.cpp b/nano/store/lmdb/lmdb_env.cpp
index e66511da4..cd1897c80 100644
--- a/nano/store/lmdb/lmdb_env.cpp
+++ b/nano/store/lmdb/lmdb_env.cpp
@@ -1,6 +1,8 @@
 #include <nano/lib/utility.hpp>
 #include <nano/store/lmdb/lmdb_env.hpp>
 
+#include <boost/system/error_code.hpp>
+
 nano::store::lmdb::env::env (bool & error_a, std::filesystem::path const & path_a, nano::store::lmdb::env::options options_a)
 {
 	init (error_a, path_a, options_a);
diff --git a/nano/store/rocksdb/rocksdb.cpp b/nano/store/rocksdb/rocksdb.cpp
index 099972583..43b82f2b4 100644
--- a/nano/store/rocksdb/rocksdb.cpp
+++ b/nano/store/rocksdb/rocksdb.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/rocksdbconfig.hpp>
 #include <nano/store/rocksdb/iterator.hpp>
 #include <nano/store/rocksdb/rocksdb.hpp>
diff --git a/nano/store/versioning.hpp b/nano/store/versioning.hpp
index 016053534..b165eef7d 100644
--- a/nano/store/versioning.hpp
+++ b/nano/store/versioning.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nano/lib/blocks.hpp>
 #include <nano/secure/common.hpp>
 
 struct MDB_val;
diff --git a/nano/test_common/chains.cpp b/nano/test_common/chains.cpp
index e7a745a33..9bc2fa99e 100644
--- a/nano/test_common/chains.cpp
+++ b/nano/test_common/chains.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/test_common/chains.hpp>
 
 using namespace std::chrono_literals;
diff --git a/nano/test_common/chains.hpp b/nano/test_common/chains.hpp
index 2004159ca..f8fd4229d 100644
--- a/nano/test_common/chains.hpp
+++ b/nano/test_common/chains.hpp
@@ -8,6 +8,11 @@
 #include <memory>
 #include <vector>
 
+namespace nano
+{
+using block_list_t = std::vector<std::shared_ptr<nano::block>>;
+}
+
 /*
  * Helper functions to deal with common chain setup scenarios
  */
diff --git a/nano/test_common/ledger.cpp b/nano/test_common/ledger.cpp
index 063000f33..a4c91533d 100644
--- a/nano/test_common/ledger.cpp
+++ b/nano/test_common/ledger.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/node/make_store.hpp>
 #include <nano/node/node.hpp>
 #include <nano/test_common/ledger.hpp>
diff --git a/nano/test_common/system.cpp b/nano/test_common/system.cpp
index 3ba0ce000..efbd13dd4 100644
--- a/nano/test_common/system.cpp
+++ b/nano/test_common/system.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/node/common.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp
index 9d6d5bb76..ac01bdf0e 100644
--- a/nano/test_common/testutil.cpp
+++ b/nano/test_common/testutil.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blocks.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/manual.hpp>
 #include <nano/node/scheduler/priority.hpp>