diff --git a/src/server/common/send_receive_wml_helpers.ipp b/src/server/common/send_receive_wml_helpers.ipp
index a69612425f7..b18553471bf 100644
--- a/src/server/common/send_receive_wml_helpers.ipp
+++ b/src/server/common/send_receive_wml_helpers.ipp
@@ -32,6 +32,9 @@
 #include "filesystem.hpp"
 #include "serialization/unicode_cast.hpp" //only used in windows specific code.
 
+#include <boost/asio/read.hpp>
+#include <boost/asio/write.hpp>
+
 #include <memory>
 #include <stdexcept>
 
diff --git a/src/server/common/server_base.cpp b/src/server/common/server_base.cpp
index 6ca081be508..01858b5141c 100644
--- a/src/server/common/server_base.cpp
+++ b/src/server/common/server_base.cpp
@@ -16,8 +16,12 @@
 
 #include "lexical_cast.hpp"
 #include "log.hpp"
-#include <functional>
 
+#include <boost/asio/ip/v6_only.hpp>
+#include <boost/asio/read.hpp>
+#include <boost/asio/write.hpp>
+
+#include <functional>
 #include <queue>
 
 static lg::log_domain log_server("server");
diff --git a/src/server/common/server_base.hpp b/src/server/common/server_base.hpp
index 1c713f5890e..091b9f4bf3f 100644
--- a/src/server/common/server_base.hpp
+++ b/src/server/common/server_base.hpp
@@ -22,11 +22,17 @@
 #include "exceptions.hpp"
 #include "server/common/simple_wml.hpp"
 
-#include <map>
-
-#include <boost/asio.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#ifndef _WIN32
+#include <boost/asio/posix/stream_descriptor.hpp>
+#endif
+#include <boost/asio/signal_set.hpp>
+#include <boost/asio/streambuf.hpp>
 #include <boost/shared_array.hpp>
 
+#include <map>
+
 typedef std::shared_ptr<boost::asio::ip::tcp::socket> socket_ptr;
 
 struct server_shutdown : public game::error