diff --git a/lib/serializer/Connection.h b/lib/serializer/Connection.h
index 5eaf286a..b1923bfd 100644
--- a/lib/serializer/Connection.h
+++ b/lib/serializer/Connection.h
@@ -14,31 +14,12 @@
 #include "BinaryDeserializer.h"
 #include "BinarySerializer.h"
 
-struct CPack;
+#include <boost/asio.hpp>
 
-namespace boost
-{
-	namespace asio
-	{
-		namespace ip
-		{
-			class tcp;
-		}
-		class io_service;
-
-		template <typename Protocol> class stream_socket_service;
-		template <typename Protocol,typename StreamSocketService>
-		class basic_stream_socket;
-
-		template <typename Protocol> class socket_acceptor_service;
-		template <typename Protocol,typename SocketAcceptorService>
-		class basic_socket_acceptor;
-	}
-	class mutex;
-}
+struct CPack;
 
-typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::stream_socket_service<boost::asio::ip::tcp>  > TSocket;
-typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::socket_acceptor_service<boost::asio::ip::tcp> > TAcceptor;
+typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp > TSocket;
+typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp> TAcceptor;
 
 /// Main class for network communication
 /// Allows establishing connection and bidirectional read-write
diff --git a/server/CVCMIServer.h b/server/CVCMIServer.h
index 5443d355..4614006b 100644
--- a/server/CVCMIServer.h
+++ b/server/CVCMIServer.h
@@ -11,6 +11,8 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
+
+#include <boost/asio.hpp>
 
 class CMapInfo;
 
@@ -18,28 +20,8 @@ class CConnection;
 struct CPackForSelectionScreen;
 class CGameHandler;
 
-namespace boost
-{
-	namespace asio
-	{
-		namespace ip
-		{
-			class tcp;
-		}
-		class io_service;
-
-		template <typename Protocol> class stream_socket_service;
-		template <typename Protocol,typename StreamSocketService>
-		class basic_stream_socket;
-
-		template <typename Protocol> class socket_acceptor_service;
-		template <typename Protocol,typename SocketAcceptorService>
-		class basic_socket_acceptor;
-	}
-};
-
-typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::socket_acceptor_service<boost::asio::ip::tcp> > TAcceptor;
-typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::stream_socket_service<boost::asio::ip::tcp>  > TSocket;
+typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp> TAcceptor;
+typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp > TSocket;
 
 class CVCMIServer
 {