diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp
index 370e11ed..d322a668 100644
--- a/nano/core_test/block_store.cpp
+++ b/nano/core_test/block_store.cpp
@@ -6,6 +6,7 @@
 #include <nano/lib/work.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/lmdb/lmdb.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/secure/utility.hpp>
diff --git a/nano/core_test/bootstrap_ascending.cpp b/nano/core_test/bootstrap_ascending.cpp
index cdc2e5c3..fd3850cc 100644
--- a/nano/core_test/bootstrap_ascending.cpp
+++ b/nano/core_test/bootstrap_ascending.cpp
@@ -1,5 +1,6 @@
 #include <nano/lib/stats.hpp>
 #include <nano/node/bootstrap_ascending/service.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
 
diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp
index 508697f4..c78a579f 100644
--- a/nano/core_test/confirmation_height.cpp
+++ b/nano/core_test/confirmation_height.cpp
@@ -1,4 +1,5 @@
 #include <nano/node/election.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/test_common/system.hpp>
 #include <nano/test_common/testutil.hpp>
 
diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp
index 8339eda1..fb995e52 100644
--- a/nano/core_test/ledger.cpp
+++ b/nano/core_test/ledger.cpp
@@ -1,6 +1,7 @@
 #include <nano/lib/stats.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/node/election.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
index ab4408a5..c445d0a2 100644
--- a/nano/core_test/node.cpp
+++ b/nano/core_test/node.cpp
@@ -1,5 +1,6 @@
 #include <nano/lib/config.hpp>
 #include <nano/node/election.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/manual.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/core_test/processor_service.cpp b/nano/core_test/processor_service.cpp
index c873a80d..ddb59b65 100644
--- a/nano/core_test/processor_service.cpp
+++ b/nano/core_test/processor_service.cpp
@@ -1,5 +1,6 @@
 #include <nano/lib/stats.hpp>
 #include <nano/lib/work.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/secure/store.hpp>
 #include <nano/secure/utility.hpp>
diff --git a/nano/node/CMakeLists.txt b/nano/node/CMakeLists.txt
index 4e1f29cc..d077a747 100644
--- a/nano/node/CMakeLists.txt
+++ b/nano/node/CMakeLists.txt
@@ -143,6 +143,8 @@ add_library(
   lmdb/wallet_value.cpp
   logging.hpp
   logging.cpp
+  make_store.hpp
+  make_store.cpp
   network.hpp
   network.cpp
   nodeconfig.hpp
diff --git a/nano/node/confirmation_height_unbounded.cpp b/nano/node/confirmation_height_unbounded.cpp
index 5d8690c3..62f1036b 100644
--- a/nano/node/confirmation_height_unbounded.cpp
+++ b/nano/node/confirmation_height_unbounded.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/logger_mt.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/node/confirmation_height_unbounded.hpp>
 #include <nano/node/logging.hpp>
diff --git a/nano/node/make_store.cpp b/nano/node/make_store.cpp
new file mode 100644
index 00000000..eb3667a2
--- /dev/null
+++ b/nano/node/make_store.cpp
@@ -0,0 +1,15 @@
+#include <nano/node/lmdb/lmdb.hpp>
+#include <nano/node/make_store.hpp>
+#include <nano/node/rocksdb/rocksdb.hpp>
+
+#include <boost/filesystem/path.hpp>
+
+std::unique_ptr<nano::store> nano::make_store (nano::logger_mt & logger, boost::filesystem::path const & path, nano::ledger_constants & constants, bool read_only, bool add_db_postfix, nano::rocksdb_config const & rocksdb_config, nano::txn_tracking_config const & txn_tracking_config_a, std::chrono::milliseconds block_processor_batch_max_time_a, nano::lmdb_config const & lmdb_config_a, bool backup_before_upgrade)
+{
+	if (rocksdb_config.enable)
+	{
+		return std::make_unique<nano::rocksdb::store> (logger, add_db_postfix ? path / "rocksdb" : path, constants, rocksdb_config, read_only);
+	}
+
+	return std::make_unique<nano::lmdb::store> (logger, add_db_postfix ? path / "data.ldb" : path, constants, txn_tracking_config_a, block_processor_batch_max_time_a, lmdb_config_a, backup_before_upgrade);
+}
diff --git a/nano/node/make_store.hpp b/nano/node/make_store.hpp
new file mode 100644
index 00000000..91192a79
--- /dev/null
+++ b/nano/node/make_store.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <nano/lib/diagnosticsconfig.hpp>
+#include <nano/lib/lmdbconfig.hpp>
+#include <nano/lib/logger_mt.hpp>
+#include <nano/lib/rocksdbconfig.hpp>
+
+#include <chrono>
+
+namespace boost::filesystem
+{
+class path;
+}
+
+namespace nano
+{
+class ledger_constants;
+class lmdb_config;
+class rocksdb_config;
+class store;
+class txn_tracking_config;
+}
+
+namespace nano
+{
+std::unique_ptr<nano::store> make_store (nano::logger_mt & logger, boost::filesystem::path const & path, nano::ledger_constants & constants, bool open_read_only = false, bool add_db_postfix = true, nano::rocksdb_config const & rocksdb_config = nano::rocksdb_config{}, nano::txn_tracking_config const & txn_tracking_config_a = nano::txn_tracking_config{}, std::chrono::milliseconds block_processor_batch_max_time_a = std::chrono::milliseconds (5000), nano::lmdb_config const & lmdb_config_a = nano::lmdb_config{}, bool backup_before_upgrade = false);
+}
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index 47fafd1e..4d6a8e35 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -3,6 +3,7 @@
 #include <nano/lib/utility.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/daemonconfig.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/rocksdb/rocksdb.hpp>
 #include <nano/node/scheduler/component.hpp>
@@ -1570,13 +1571,3 @@ nano::node_flags const & nano::inactive_node_flag_defaults ()
 	node_flags.disable_tcp_realtime = true;
 	return node_flags;
 }
-
-std::unique_ptr<nano::store> nano::make_store (nano::logger_mt & logger, boost::filesystem::path const & path, nano::ledger_constants & constants, bool read_only, bool add_db_postfix, nano::rocksdb_config const & rocksdb_config, nano::txn_tracking_config const & txn_tracking_config_a, std::chrono::milliseconds block_processor_batch_max_time_a, nano::lmdb_config const & lmdb_config_a, bool backup_before_upgrade)
-{
-	if (rocksdb_config.enable)
-	{
-		return std::make_unique<nano::rocksdb::store> (logger, add_db_postfix ? path / "rocksdb" : path, constants, rocksdb_config, read_only);
-	}
-
-	return std::make_unique<nano::lmdb::store> (logger, add_db_postfix ? path / "data.ldb" : path, constants, txn_tracking_config_a, block_processor_batch_max_time_a, lmdb_config_a, backup_before_upgrade);
-}
diff --git a/nano/node/rocksdb/rocksdb.hpp b/nano/node/rocksdb/rocksdb.hpp
index 47f3e718..5df0d9b4 100644
--- a/nano/node/rocksdb/rocksdb.hpp
+++ b/nano/node/rocksdb/rocksdb.hpp
@@ -3,6 +3,7 @@
 #include <nano/lib/config.hpp>
 #include <nano/lib/logger_mt.hpp>
 #include <nano/lib/numbers.hpp>
+#include <nano/lib/rocksdbconfig.hpp>
 #include <nano/node/rocksdb/account_store.hpp>
 #include <nano/node/rocksdb/block_store.hpp>
 #include <nano/node/rocksdb/confirmation_height_store.hpp>
diff --git a/nano/qt_test/qt.cpp b/nano/qt_test/qt.cpp
index 97e9b911..8e3dea40 100644
--- a/nano/qt_test/qt.cpp
+++ b/nano/qt_test/qt.cpp
@@ -1,3 +1,4 @@
+#include <nano/node/make_store.hpp>
 #include <nano/qt/qt.hpp>
 #include <nano/test_common/network.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/secure/ledger.cpp b/nano/secure/ledger.cpp
index 38e464e0..3bf4a4c4 100644
--- a/nano/secure/ledger.cpp
+++ b/nano/secure/ledger.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/stats.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/lib/work.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/secure/store.hpp>
diff --git a/nano/secure/store.hpp b/nano/secure/store.hpp
index f701a42d..89c86a74 100644
--- a/nano/secure/store.hpp
+++ b/nano/secure/store.hpp
@@ -1,11 +1,7 @@
 #pragma once
 
 #include <nano/crypto_lib/random_pool.hpp>
-#include <nano/lib/diagnosticsconfig.hpp>
-#include <nano/lib/lmdbconfig.hpp>
-#include <nano/lib/logger_mt.hpp>
 #include <nano/lib/memory.hpp>
-#include <nano/lib/rocksdbconfig.hpp>
 #include <nano/secure/buffer.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/versioning.hpp>
@@ -801,8 +797,6 @@ public:
 
 	virtual std::string vendor_get () const = 0;
 };
-
-std::unique_ptr<nano::store> make_store (nano::logger_mt & logger, boost::filesystem::path const & path, nano::ledger_constants & constants, bool open_read_only = false, bool add_db_postfix = true, nano::rocksdb_config const & rocksdb_config = nano::rocksdb_config{}, nano::txn_tracking_config const & txn_tracking_config_a = nano::txn_tracking_config{}, std::chrono::milliseconds block_processor_batch_max_time_a = std::chrono::milliseconds (5000), nano::lmdb_config const & lmdb_config_a = nano::lmdb_config{}, bool backup_before_upgrade = false);
 }
 
 namespace std
diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp
index 1e8ae0c0..7cfea256 100644
--- a/nano/slow_test/node.cpp
+++ b/nano/slow_test/node.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/node/election.hpp>
+#include <nano/node/make_store.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/manual.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/test_common/ledger.cpp b/nano/test_common/ledger.cpp
index c87c0f8f..840a463f 100644
--- a/nano/test_common/ledger.cpp
+++ b/nano/test_common/ledger.cpp
@@ -1,3 +1,4 @@
+#include <nano/node/make_store.hpp>
 #include <nano/node/node.hpp>
 #include <nano/test_common/ledger.hpp>