Move a number of forward declarations in to the fwd.hpp files.

nano/lib/CMakeLists.txt

@@ -49,6 +49,7 @@ add_library(
   epochs.hpp
   errors.hpp
   errors.cpp
+  fwd.hpp
   id_dispenser.hpp
   interval.hpp
   ipc.hpp
@@ -97,7 +98,6 @@ add_library(
   stats_enums.cpp
   stats_sinks.hpp
   stream.hpp
-  stream_fwd.hpp
   thread_pool.hpp
   thread_roles.hpp
   thread_roles.cpp

nano/lib/block_sideband.hpp

@@ -1,19 +1,13 @@
 #pragma once
 
 #include <nano/lib/epoch.hpp>
+#include <nano/lib/fwd.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/lib/stream_fwd.hpp>
 #include <nano/lib/timer.hpp>
 
 #include <cstdint>
 #include <memory>
 
-namespace nano
-{
-enum class block_type : uint8_t;
-class object_stream;
-}
-
 namespace nano
 {
 class block_details

nano/lib/blocks.hpp

@@ -3,9 +3,9 @@
 #include <nano/lib/block_sideband.hpp>
 #include <nano/lib/epoch.hpp>
 #include <nano/lib/errors.hpp>
+#include <nano/lib/fwd.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/optional_ptr.hpp>
-#include <nano/lib/stream_fwd.hpp>
 
 #include <boost/property_tree/ptree_fwd.hpp>
 
@@ -15,14 +15,6 @@ typedef struct blake2b_state__ blake2b_state;
 
 namespace nano
 {
-class block;
-class block_visitor;
-class mutable_block_visitor;
-class object_stream;
-template <typename Key, typename Value>
-class uniquer;
-enum class work_version;
-
 using block_uniquer = uniquer<nano::uint256_union, nano::block>;
 }
 

nano/lib/fwd.hpp

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <cstdint>
+#include <iosfwd>
+
+struct uint8_char_traits;
+namespace nano
+{
+class block;
+enum class block_type : uint8_t;
+class block_visitor;
+class container_info;
+enum class epoch : uint8_t;
+class jsonconfig;
+class mutable_block_visitor;
+class network_constants;
+class object_stream;
+class thread_pool;
+class tomlconfig;
+template <typename Key, typename Value>
+class uniquer;
+enum class work_version;
+
+using stream = std::basic_streambuf<uint8_t, uint8_char_traits>;
+}
+
+namespace nano::stat
+{
+enum class detail;
+enum class dir;
+}

nano/node/bandwidth_limiter.hpp

@@ -4,11 +4,6 @@
 #include <nano/node/fwd.hpp>
 #include <nano/node/transport/traffic_type.hpp>
 
-namespace nano
-{
-class node_config;
-}
-
 namespace nano
 {
 class bandwidth_limiter_config final

nano/node/bootstrap_ascending/account_sets.hpp

@@ -3,6 +3,7 @@
 #include <nano/lib/numbers.hpp>
 #include <nano/node/bootstrap/bootstrap_config.hpp>
 #include <nano/node/bootstrap_ascending/common.hpp>
+#include <nano/node/fwd.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>
@@ -16,12 +17,6 @@
 
 namespace mi = boost::multi_index;
 
-namespace nano
-{
-class account_sets_config;
-class stats;
-}
-
 namespace nano
 {
 namespace bootstrap_ascending

nano/node/confirming_set.hpp

@@ -6,6 +6,7 @@
 #include <nano/lib/thread_pool.hpp>
 #include <nano/node/fwd.hpp>
 #include <nano/secure/common.hpp>
+#include <nano/secure/fwd.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/member.hpp>
@@ -21,14 +22,6 @@
 
 namespace mi = boost::multi_index;
 
-namespace nano
-{
-class election;
-class ledger;
-class logger;
-class stats;
-}
-
 namespace nano
 {
 class confirming_set_config final

nano/node/epoch_upgrader.hpp

@@ -1,24 +1,16 @@
 #pragma once
 
+#include <nano/lib/fwd.hpp>
 #include <nano/lib/locks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/numbers.hpp>
+#include <nano/node/fwd.hpp>
+#include <nano/secure/fwd.hpp>
+#include <nano/store/fwd.hpp>
 
 #include <cstdint>
 #include <future>
 
-namespace nano
-{
-enum class epoch : uint8_t;
-class network_params;
-class node;
-class ledger;
-}
-namespace nano::store
-{
-class component;
-}
-
 namespace nano
 {
 class epoch_upgrader final

nano/node/fwd.hpp

@@ -1,24 +1,17 @@
 #pragma once
 
+#include <nano/lib/fwd.hpp>
 #include <nano/node/transport/fwd.hpp>
 #include <nano/secure/fwd.hpp>
 #include <nano/store/fwd.hpp>
 
-// TODO: Move to lib/fwd.hpp
-namespace nano
-{
-class block;
-class container_info;
-class thread_pool;
-}
-
 namespace nano
 {
+class account_sets_config;
 class active_elections;
 class block_processor;
 class confirming_set;
 class election;
-class ledger;
 class local_block_broadcaster;
 class local_vote_history;
 class logger;
@@ -35,6 +28,8 @@ class rep_crawler;
 class rep_tiers;
 class stats;
 class vote_cache;
+enum class vote_code;
+enum class vote_source;
 class vote_generator;
 class vote_processor;
 class vote_router;
@@ -53,4 +48,4 @@ class hinted;
 class manual;
 class optimistic;
 class priority;
-}
+}

nano/node/ipc/ipc_config.hpp

@@ -2,15 +2,10 @@
 
 #include <nano/lib/config.hpp>
 #include <nano/lib/errors.hpp>
+#include <nano/lib/fwd.hpp>
 
 #include <string>
 
-namespace nano
-{
-class network_constants;
-class tomlconfig;
-}
-
 namespace nano
 {
 namespace ipc

nano/node/messages.hpp

@@ -4,15 +4,16 @@
 #include <nano/lib/asio.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/errors.hpp>
+#include <nano/lib/fwd.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/memory.hpp>
 #include <nano/lib/network_filter.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/object_stream.hpp>
 #include <nano/lib/stats_enums.hpp>
-#include <nano/lib/stream_fwd.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/secure/common.hpp>
+#include <nano/secure/fwd.hpp>
 
 #include <bitset>
 #include <cstdint>
@@ -23,12 +24,6 @@
 
 namespace nano
 {
-class block;
-class jsonconfig;
-template <typename Key, typename Value>
-class uniquer;
-class vote;
-
 using block_uniquer = uniquer<nano::uint256_union, nano::block>;
 using vote_uniquer = uniquer<nano::block_hash, nano::vote>;
 }

nano/node/transport/fwd.hpp

@@ -7,4 +7,8 @@ class tcp_channel;
 class tcp_channels;
 class tcp_server;
 class tcp_socket;
-}
+}
+namespace nano::transport::fake
+{
+class channel;
+}

nano/node/transport/tcp_listener.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <nano/lib/async.hpp>
+#include <nano/lib/fwd.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/fwd.hpp>
 #include <nano/node/transport/common.hpp>
@@ -20,11 +21,6 @@
 namespace mi = boost::multi_index;
 namespace asio = boost::asio;
 
-namespace nano::stat
-{
-enum class dir;
-}
-
 namespace nano::transport
 {
 class tcp_config

nano/node/vote_cache.hpp

@@ -4,7 +4,9 @@
 #include <nano/lib/locks.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/utility.hpp>
+#include <nano/node/fwd.hpp>
 #include <nano/secure/common.hpp>
+#include <nano/secure/fwd.hpp>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>
@@ -22,17 +24,6 @@
 
 namespace mi = boost::multi_index;
 
-namespace nano
-{
-class node;
-class active_elections;
-class election;
-class stats;
-class vote;
-enum class vote_code;
-enum class vote_source;
-}
-
 namespace nano
 {
 class vote_cache_config final

nano/secure/account_info.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <nano/lib/epoch.hpp>
+#include <nano/lib/fwd.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/lib/stream_fwd.hpp>
 #include <nano/lib/timer.hpp>
 
 namespace nano

nano/secure/common.hpp

@@ -5,20 +5,15 @@
 #include <nano/lib/common.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/epochs.hpp>
+#include <nano/lib/fwd.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/object_stream.hpp>
-#include <nano/lib/stream_fwd.hpp>
 #include <nano/lib/timer.hpp>
 #include <nano/lib/utility.hpp>
 
 #include <array>
 #include <unordered_map>
 
-namespace nano::stat
-{
-enum class detail;
-}
-
 namespace nano
 {
 /**

nano/secure/fwd.hpp

@@ -1,14 +1,17 @@
 #pragma once
 
+namespace nano
+{
+class account_info;
+class ledger;
+class ledger_cache;
+class ledger_constants;
+class network_params;
+class vote;
+}
 namespace nano::secure
 {
+class read_transaction;
 class transaction;
 class write_transaction;
-class read_transaction;
 }
-
-namespace nano
-{
-class account_info;
-class vote;
-}