Extracting block_w_sideband to its own file

nano/store/CMakeLists.txt

@@ -2,6 +2,7 @@ add_library(
   nano_store
   account.hpp
   block.hpp
+  block_w_sideband.hpp
   component.hpp
   confirmation_height.hpp
   db_val.hpp

nano/store/block.hpp

@@ -2,6 +2,7 @@
 
 #include <nano/lib/block_sideband.hpp>
 #include <nano/lib/numbers.hpp>
+#include <nano/store/block_w_sideband.hpp>
 #include <nano/store/component.hpp>
 #include <nano/store/iterator.hpp>
 
@@ -15,12 +16,6 @@ class block_hash;
 }
 namespace nano::store
 {
-class block_w_sideband
-{
-public:
-	std::shared_ptr<nano::block> block;
-	nano::block_sideband sideband;
-};
 /**
  * Manages block storage and iteration
  */

nano/store/block_w_sideband.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <nano/lib/block_sideband.hpp>
+
+#include <memory>
+
+namespace nano
+{
+class block;
+}
+namespace nano::store
+{
+class block_w_sideband
+{
+public:
+	std::shared_ptr<nano::block> block;
+	nano::block_sideband sideband;
+};
+}