diff --git a/test/web/FullAsyncTest.cpp b/test/web/FullAsyncTest.cpp
index 062a4a69..58c04c69 100644
--- a/test/web/FullAsyncTest.cpp
+++ b/test/web/FullAsyncTest.cpp
@@ -38,6 +38,7 @@
 #include "oatpp/network/virtual_/client/ConnectionProvider.hpp"
 #include "oatpp/network/virtual_/server/ConnectionProvider.hpp"
 #include "oatpp/network/virtual_/Interface.hpp"
+#include "oatpp/network/server/Server.hpp"
 
 namespace oatpp { namespace test { namespace web {
   
diff --git a/test/web/FullTest.cpp b/test/web/FullTest.cpp
index 13f75fe1..ae7a773a 100644
--- a/test/web/FullTest.cpp
+++ b/test/web/FullTest.cpp
@@ -40,6 +40,8 @@
 #include "oatpp/network/virtual_/server/ConnectionProvider.hpp"
 #include "oatpp/network/virtual_/Interface.hpp"
 
+#include "oatpp/network/server/Server.hpp"
+
 namespace oatpp { namespace test { namespace web {
   
 bool FullTest::onRun() {
diff --git a/web/server/HttpConnectionHandler.hpp b/web/server/HttpConnectionHandler.hpp
index bc2a117d..3db62496 100644
--- a/web/server/HttpConnectionHandler.hpp
+++ b/web/server/HttpConnectionHandler.hpp
@@ -31,10 +31,7 @@
 
 #include "oatpp/web/protocol/http/incoming/SimpleBodyDecoder.hpp"
 
-#include "oatpp/web/protocol/http/incoming/Request.hpp"
-#include "oatpp/web/protocol/http/outgoing/Response.hpp"
-
-#include "oatpp/network/server/Server.hpp"
+#include "oatpp/network/server/ConnectionHandler.hpp"
 #include "oatpp/network/Connection.hpp"
 
 #include "oatpp/core/concurrency/Thread.hpp"