diff --git a/nano/lib/CMakeLists.txt b/nano/lib/CMakeLists.txt
index 9612fdf80..c7029af76 100644
--- a/nano/lib/CMakeLists.txt
+++ b/nano/lib/CMakeLists.txt
@@ -25,6 +25,7 @@ add_library(
   block_sideband.cpp
   block_type.hpp
   block_type.cpp
+  block_uniquer.hpp
   blockbuilders.hpp
   blockbuilders.cpp
   blocks.hpp
diff --git a/nano/lib/block_uniquer.hpp b/nano/lib/block_uniquer.hpp
new file mode 100644
index 000000000..d39bb3afc
--- /dev/null
+++ b/nano/lib/block_uniquer.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <nano/lib/numbers.hpp>
+#include <nano/lib/uniquer.hpp>
+
+namespace nano
+{
+class block;
+using block_uniquer = nano::uniquer<nano::uint256_union, nano::block>;
+}
diff --git a/nano/lib/blocks.hpp b/nano/lib/blocks.hpp
index 0fb5aee4a..514adedfa 100644
--- a/nano/lib/blocks.hpp
+++ b/nano/lib/blocks.hpp
@@ -2,6 +2,7 @@
 
 #include <nano/crypto/blake2/blake2.h>
 #include <nano/lib/block_sideband.hpp>
+#include <nano/lib/block_uniquer.hpp>
 #include <nano/lib/epoch.hpp>
 #include <nano/lib/errors.hpp>
 #include <nano/lib/numbers.hpp>
@@ -9,7 +10,6 @@
 #include <nano/lib/optional_ptr.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/lib/timer.hpp>
-#include <nano/lib/uniquer.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/lib/work.hpp>
 
@@ -378,8 +378,6 @@ public:
 	virtual ~mutable_block_visitor () = default;
 };
 
-using block_uniquer = nano::uniquer<nano::uint256_union, nano::block>;
-
 std::shared_ptr<nano::block> deserialize_block (nano::stream &);
 std::shared_ptr<nano::block> deserialize_block (nano::stream &, nano::block_type, nano::block_uniquer * = nullptr);
 std::shared_ptr<nano::block> deserialize_block_json (boost::property_tree::ptree const &, nano::block_uniquer * = nullptr);
diff --git a/nano/node/messages.hpp b/nano/node/messages.hpp
index 68d5d4247..4e9401af2 100644
--- a/nano/node/messages.hpp
+++ b/nano/node/messages.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #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>
diff --git a/nano/node/node.hpp b/nano/node/node.hpp
index 0776b7285..d4105e61e 100644
--- a/nano/node/node.hpp
+++ b/nano/node/node.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <nano/lib/block_uniquer.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats.hpp>