diff --git a/nano/core_test/message.cpp b/nano/core_test/message.cpp
index 946be3bb..15288e59 100644
--- a/nano/core_test/message.cpp
+++ b/nano/core_test/message.cpp
@@ -1,3 +1,4 @@
+#include <nano/crypto_lib/random_pool.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/network.hpp>
 #include <nano/secure/buffer.hpp>
@@ -5,8 +6,7 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/algorithm/string.hpp>
-#include <boost/variant/get.hpp>
+#include <boost/asio/ip/address_v6.hpp>
 
 namespace
 {
diff --git a/nano/node/messages.cpp b/nano/node/messages.cpp
index cc5591cd..7819a2b5 100644
--- a/nano/node/messages.cpp
+++ b/nano/node/messages.cpp
@@ -1,19 +1,30 @@
 #include <nano/lib/blocks.hpp>
+#include <nano/lib/config.hpp>
 #include <nano/lib/memory.hpp>
+#include <nano/lib/stats_enums.hpp>
+#include <nano/lib/stream.hpp>
+#include <nano/lib/utility.hpp>
 #include <nano/lib/work.hpp>
-#include <nano/node/active_transactions.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/messages.hpp>
 #include <nano/node/network.hpp>
-#include <nano/node/wallet.hpp>
 #include <nano/secure/buffer.hpp>
 
+#include <boost/asio/ip/address_v6.hpp>
 #include <boost/endian/conversion.hpp>
 #include <boost/format.hpp>
 #include <boost/pool/pool_alloc.hpp>
 
+#include <bitset>
+#include <chrono>
+#include <cstdint>
+#include <memory>
 #include <sstream>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
 
 /*
  * message_header
diff --git a/nano/node/messages.hpp b/nano/node/messages.hpp
index 953350d1..16d654c2 100644
--- a/nano/node/messages.hpp
+++ b/nano/node/messages.hpp
@@ -1,18 +1,23 @@
 #pragma once
 
-#include <nano/boost/asio/ip/tcp.hpp>
-#include <nano/boost/asio/ip/udp.hpp>
-#include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/asio.hpp>
+#include <nano/lib/blocks.hpp>
+#include <nano/lib/config.hpp>
+#include <nano/lib/errors.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/memory.hpp>
-#include <nano/lib/stats.hpp>
+#include <nano/lib/numbers.hpp>
+#include <nano/lib/stats_enums.hpp>
+#include <nano/lib/stream.hpp>
 #include <nano/node/common.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/network_filter.hpp>
 
 #include <bitset>
+#include <cstdint>
+#include <memory>
+#include <string>
 #include <variant>
+#include <vector>
 
 namespace nano
 {
@@ -113,9 +118,6 @@ public:
 	nano::message_header header;
 };
 
-class work_pool;
-class network_constants;
-
 class keepalive final : public message
 {
 public: