Forward declaring block and removing blocks.hpp includes from other headers.

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

nano/lib/block_sideband.hpp

@@ -7,6 +7,7 @@
 #include <nano/lib/timer.hpp>
 
 #include <cstdint>
+#include <memory>
 
 namespace nano
 {

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>
 

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 */

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
 {

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:

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>

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>

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>

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>

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
 {

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>

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>

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>

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>

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
 {

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>

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>

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>

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>

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>

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 ();
+}

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;
 	};

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>

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>

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>

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>

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>

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>
@@ -168,3 +169,8 @@ std::unique_ptr<nano::container_info_component> nano::local_block_broadcaster::c
 	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "local", local_blocks.size (), sizeof (decltype (local_blocks)::value_type) }));
 	return composite;
 }
+
+nano::block_hash nano::local_block_broadcaster::local_entry::hash () const
+{
+	return block->hash ();
+}

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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;

nano/qt/qt.cpp

@@ -1,3 +1,4 @@
+#include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/qt/qt.hpp>
 

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>

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>

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>

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

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>

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>

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>

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;

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>

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>

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>

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

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>

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);

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>

nano/store/versioning.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nano/lib/blocks.hpp>
 #include <nano/secure/common.hpp>
 
 struct MDB_val;

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;

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
  */

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>

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>

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>