diff --git a/lib/HttpServer/HttpCommTask.h b/lib/HttpServer/HttpCommTask.h
index c51ee6cb04..b36369654b 100644
--- a/lib/HttpServer/HttpCommTask.h
+++ b/lib/HttpServer/HttpCommTask.h
@@ -34,6 +34,7 @@
 #include "Scheduler/ListenTask.h"
 #include "HttpServer/HttpHandlerFactory.h"
 #include "GeneralServer/GeneralCommTask.h"
+#include "HttpServer/HttpServer.h"
 
 namespace triagens {
   namespace rest {
diff --git a/lib/HttpServer/HttpServer.h b/lib/HttpServer/HttpServer.h
index 660ac14e4b..25797a0fa2 100644
--- a/lib/HttpServer/HttpServer.h
+++ b/lib/HttpServer/HttpServer.h
@@ -29,8 +29,6 @@
 #ifndef TRIAGENS_HTTP_SERVER_HTTP_SERVER_H
 #define TRIAGENS_HTTP_SERVER_HTTP_SERVER_H 1
 
-#include "HttpServer/HttpServer.h"
-
 #include "GeneralServer/GeneralServerDispatcher.h"
 #include "HttpServer/HttpCommTask.h"
 
@@ -42,6 +40,7 @@ namespace triagens {
   namespace rest {
     class HttpHandlerFactory;
     class HttpListenTask;
+    class HttpCommTask;
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                  class HttpServer