diff --git a/nano/core_test/confirmation_solicitor.cpp b/nano/core_test/confirmation_solicitor.cpp
index 7afa210a..a35ff989 100644
--- a/nano/core_test/confirmation_solicitor.cpp
+++ b/nano/core_test/confirmation_solicitor.cpp
@@ -1,6 +1,7 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/confirmation_solicitor.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/transport/inproc.hpp>
 #include <nano/test_common/network.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/election_scheduler.cpp b/nano/core_test/election_scheduler.cpp
index c453bfe0..92afc9b2 100644
--- a/nano/core_test/election_scheduler.cpp
+++ b/nano/core_test/election_scheduler.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/blocks.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/priority.hpp>
 #include <nano/secure/ledger.hpp>
diff --git a/nano/core_test/request_aggregator.cpp b/nano/core_test/request_aggregator.cpp
index 7b1913f4..3851fa82 100644
--- a/nano/core_test/request_aggregator.cpp
+++ b/nano/core_test/request_aggregator.cpp
@@ -1,5 +1,6 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/request_aggregator.hpp>
 #include <nano/node/transport/inproc.hpp>
 #include <nano/secure/ledger.hpp>
diff --git a/nano/core_test/vote_processor.cpp b/nano/core_test/vote_processor.cpp
index f755eb8a..6e271568 100644
--- a/nano/core_test/vote_processor.cpp
+++ b/nano/core_test/vote_processor.cpp
@@ -1,5 +1,6 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/transport/inproc.hpp>
 #include <nano/node/vote_processor.hpp>
 #include <nano/secure/ledger.hpp>
diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp
index de2cfb42..358ee2d2 100644
--- a/nano/core_test/wallet.cpp
+++ b/nano/core_test/wallet.cpp
@@ -1,6 +1,7 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_runner.hpp>
+#include <nano/node/election.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/store/lmdb/wallet_value.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp
index af4b953b..48c0e79d 100644
--- a/nano/core_test/wallets.cpp
+++ b/nano/core_test/wallets.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/blocks.hpp>
+#include <nano/node/election.hpp>
 #include <nano/secure/ledger.hpp>
 #include <nano/store/versioning.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/node/CMakeLists.txt b/nano/node/CMakeLists.txt
index 9602dc0a..439ee94f 100644
--- a/nano/node/CMakeLists.txt
+++ b/nano/node/CMakeLists.txt
@@ -75,6 +75,7 @@ add_library(
   distributed_work_factory.cpp
   election.hpp
   election.cpp
+  election_behavior.hpp
   election_insertion_result.hpp
   epoch_upgrader.hpp
   epoch_upgrader.cpp
@@ -164,6 +165,7 @@ add_library(
   vote_cache.cpp
   vote_processor.hpp
   vote_processor.cpp
+  vote_with_weight_info.hpp
   voting.hpp
   voting.cpp
   wallet.hpp
diff --git a/nano/node/active_transactions.hpp b/nano/node/active_transactions.hpp
index 7323bf51..e1dececf 100644
--- a/nano/node/active_transactions.hpp
+++ b/nano/node/active_transactions.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <nano/lib/numbers.hpp>
-#include <nano/node/election.hpp>
+#include <nano/node/election_behavior.hpp>
 #include <nano/node/election_insertion_result.hpp>
+#include <nano/node/vote_with_weight_info.hpp>
 #include <nano/node/voting.hpp>
 #include <nano/secure/common.hpp>
 
diff --git a/nano/node/election.hpp b/nano/node/election.hpp
index 59cf2ea9..5ea0c43c 100644
--- a/nano/node/election.hpp
+++ b/nano/node/election.hpp
@@ -2,6 +2,8 @@
 
 #include <nano/lib/id_dispenser.hpp>
 #include <nano/lib/logging.hpp>
+#include <nano/node/election_behavior.hpp>
+#include <nano/node/vote_with_weight_info.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/store/component.hpp>
 
@@ -24,34 +26,6 @@ public:
 	nano::block_hash hash;
 };
 
-class vote_with_weight_info final
-{
-public:
-	nano::account representative;
-	std::chrono::steady_clock::time_point time;
-	uint64_t timestamp;
-	nano::block_hash hash;
-	nano::uint128_t weight;
-};
-
-enum class election_behavior
-{
-	normal,
-	/**
-	 * Hinted elections:
-	 * - shorter timespan
-	 * - limited space inside AEC
-	 */
-	hinted,
-	/**
-	 * Optimistic elections:
-	 * - shorter timespan
-	 * - limited space inside AEC
-	 * - more frequent confirmation requests
-	 */
-	optimistic,
-};
-
 nano::stat::detail to_stat_detail (nano::election_behavior);
 
 // map of vote weight per block, ordered greater first
diff --git a/nano/node/election_behavior.hpp b/nano/node/election_behavior.hpp
new file mode 100644
index 00000000..c78733a3
--- /dev/null
+++ b/nano/node/election_behavior.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+namespace nano
+{
+enum class election_behavior
+{
+	normal,
+	/**
+	 * Hinted elections:
+	 * - shorter timespan
+	 * - limited space inside AEC
+	 */
+	hinted,
+	/**
+	 * Optimistic elections:
+	 * - shorter timespan
+	 * - limited space inside AEC
+	 * - more frequent confirmation requests
+	 */
+	optimistic,
+};
+}
diff --git a/nano/node/node.hpp b/nano/node/node.hpp
index fe7e901a..5c0e705a 100644
--- a/nano/node/node.hpp
+++ b/nano/node/node.hpp
@@ -16,7 +16,6 @@
 #include <nano/node/bootstrap_ascending/service.hpp>
 #include <nano/node/confirmation_height_processor.hpp>
 #include <nano/node/distributed_work_factory.hpp>
-#include <nano/node/election.hpp>
 #include <nano/node/epoch_upgrader.hpp>
 #include <nano/node/local_block_broadcaster.hpp>
 #include <nano/node/network.hpp>
diff --git a/nano/node/scheduler/manual.cpp b/nano/node/scheduler/manual.cpp
index 7fc908bd..f84774bc 100644
--- a/nano/node/scheduler/manual.cpp
+++ b/nano/node/scheduler/manual.cpp
@@ -1,3 +1,4 @@
+#include <nano/node/election.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/scheduler/manual.hpp>
 
diff --git a/nano/node/scheduler/priority.cpp b/nano/node/scheduler/priority.cpp
index f8e03ff3..b37276e0 100644
--- a/nano/node/scheduler/priority.cpp
+++ b/nano/node/scheduler/priority.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/blocks.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/scheduler/buckets.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/node/vote_cache.cpp b/nano/node/vote_cache.cpp
index 4d40807d..7779b0af 100644
--- a/nano/node/vote_cache.cpp
+++ b/nano/node/vote_cache.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/tomlconfig.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/vote_cache.hpp>
 
@@ -280,4 +281,4 @@ nano::error nano::vote_cache_config::deserialize (nano::tomlconfig & toml)
 	age_cutoff = std::chrono::seconds{ age_cutoff_l };
 
 	return toml.get_error ();
-}
\ No newline at end of file
+}
diff --git a/nano/node/vote_with_weight_info.hpp b/nano/node/vote_with_weight_info.hpp
new file mode 100644
index 00000000..02daa9bb
--- /dev/null
+++ b/nano/node/vote_with_weight_info.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <nano/lib/numbers.hpp>
+
+#include <chrono>
+
+namespace nano
+{
+class vote_with_weight_info final
+{
+public:
+	nano::account representative;
+	std::chrono::steady_clock::time_point time;
+	uint64_t timestamp;
+	nano::block_hash hash;
+	nano::uint128_t weight;
+};
+}
diff --git a/nano/node/websocket.hpp b/nano/node/websocket.hpp
index 62121984..db470f74 100644
--- a/nano/node/websocket.hpp
+++ b/nano/node/websocket.hpp
@@ -3,7 +3,7 @@
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/work.hpp>
 #include <nano/node/common.hpp>
-#include <nano/node/election.hpp>
+#include <nano/node/vote_with_weight_info.hpp>
 #include <nano/node/websocket_stream.hpp>
 #include <nano/node/websocketconfig.hpp>
 #include <nano/secure/common.hpp>
diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp
index 6c578f06..744cf095 100644
--- a/nano/qt/qt.cpp
+++ b/nano/qt/qt.cpp
@@ -1,5 +1,6 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
+#include <nano/node/vote_with_weight_info.hpp>
 #include <nano/qt/qt.hpp>
 #include <nano/secure/ledger.hpp>
 
diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp
index 7d4e0705..5d5e4190 100644
--- a/nano/rpc_test/rpc.cpp
+++ b/nano/rpc_test/rpc.cpp
@@ -4,6 +4,7 @@
 #include <nano/lib/rpcconfig.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/threading.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/ipc/ipc_server.hpp>
 #include <nano/node/json_handler.hpp>
 #include <nano/node/node_rpc_config.hpp>
diff --git a/nano/test_common/testutil.cpp b/nano/test_common/testutil.cpp
index ce80cfea..114a7813 100644
--- a/nano/test_common/testutil.cpp
+++ b/nano/test_common/testutil.cpp
@@ -1,5 +1,6 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/blocks.hpp>
+#include <nano/node/election.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/manual.hpp>
 #include <nano/node/scheduler/priority.hpp>