diff --git a/nano/lib/blocks.hpp b/nano/lib/blocks.hpp
index 0cb6969c..e89f2ddd 100644
--- a/nano/lib/blocks.hpp
+++ b/nano/lib/blocks.hpp
@@ -1,26 +1,23 @@
 #pragma once
 
-#include <nano/crypto/blake2/blake2.h>
 #include <nano/lib/block_sideband.hpp>
 #include <nano/lib/block_uniquer.hpp>
+#include <nano/lib/config.hpp>
 #include <nano/lib/epoch.hpp>
 #include <nano/lib/errors.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/lib/object_stream.hpp>
 #include <nano/lib/optional_ptr.hpp>
 #include <nano/lib/stream.hpp>
-#include <nano/lib/timer.hpp>
-#include <nano/lib/utility.hpp>
-#include <nano/lib/work.hpp>
 
 #include <boost/property_tree/ptree_fwd.hpp>
 
-#include <unordered_map>
+typedef struct blake2b_state__ blake2b_state;
 
 namespace nano
 {
 class block_visitor;
 class mutable_block_visitor;
+class object_stream;
 
 class block
 {
diff --git a/nano/lib/config.cpp b/nano/lib/config.cpp
index 7f40e3b0..1839d741 100644
--- a/nano/lib/config.cpp
+++ b/nano/lib/config.cpp
@@ -1,3 +1,4 @@
+#include <nano/crypto/blake2/blake2.h>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/logging.hpp>
diff --git a/nano/lib/work.cpp b/nano/lib/work.cpp
index 480dba57..90a74095 100644
--- a/nano/lib/work.cpp
+++ b/nano/lib/work.cpp
@@ -1,3 +1,4 @@
+#include <nano/crypto/blake2/blake2.h>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/epoch.hpp>