diff --git a/rai/secure.cpp b/rai/secure.cpp
index db4db56b..842e7507 100644
--- a/rai/secure.cpp
+++ b/rai/secure.cpp
@@ -73,8 +73,9 @@ std::string rai_live_genesis;
 rai::account genesis_account;
 std::string genesis_block;
 rai::uint128_t genesis_amount;
+CryptoPP::AutoSeededRandomPool random_pool;
 };
-ledger_constants const globals;
+ledger_constants globals;
 }
 
 size_t constexpr rai::send_block::size;
@@ -94,6 +95,7 @@ std::string const & rai::rai_live_genesis (globals.rai_live_genesis);
 rai::account const & rai::genesis_account (globals.genesis_account);
 std::string const & rai::genesis_block (globals.genesis_block);
 rai::uint128_t const & rai::genesis_amount (globals.genesis_amount);
+CryptoPP::AutoSeededRandomPool & rai::random_pool (globals.random_pool);
 
 boost::filesystem::path rai::working_path ()
 {
diff --git a/rai/utility.cpp b/rai/utility.cpp
index 8eeb75eb..212bddbd 100644
--- a/rai/utility.cpp
+++ b/rai/utility.cpp
@@ -7,8 +7,6 @@
 
 #include <liblmdb/lmdb.h>
 
-CryptoPP::AutoSeededRandomPool rai::random_pool;
-
 boost::filesystem::path rai::unique_path ()
 {
 	auto result (working_path () / boost::filesystem::unique_path ());
diff --git a/rai/utility.hpp b/rai/utility.hpp
index 6aa28114..a6c5c749 100644
--- a/rai/utility.hpp
+++ b/rai/utility.hpp
@@ -20,7 +20,7 @@
 
 namespace rai
 {
-extern CryptoPP::AutoSeededRandomPool random_pool;
+extern CryptoPP::AutoSeededRandomPool & random_pool;
 // We operate on streams of uint8_t by convention
 using stream = std::basic_streambuf <uint8_t>;
 using bufferstream = boost::iostreams::stream_buffer <boost::iostreams::basic_array_source <uint8_t>>;