diff --git a/http_server/CMakeLists.txt b/http_server/CMakeLists.txt
index 2cd49151be6c6e6c538204071f4016b697e75281..eee0d5ee533d34117083b8e4d006bc5c31fd5dfb 100644
--- a/http_server/CMakeLists.txt
+++ b/http_server/CMakeLists.txt
@@ -13,8 +13,9 @@ set(HTTP_SERVER_SRCS
     http_client/dap_http_header.c)
 
 add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
+include_directories("${INCLUDE_DIRECTORIES} ${dap_core_server_INCLUDE_DIRS}")
 
-target_include_directories(dap_http_server INTERFACE . http_client)
+target_include_directories(dap_http_server INTERFACE . http_client )
 
-target_link_libraries(dap_http_server dap_core dap_crypto dap_core_server dap_client)
+target_link_libraries( dap_http_server dap_core dap_crypto dap_core_server)
 
diff --git a/http_server/dap_http.c b/http_server/dap_http.c
index d765d31295eb2c27922fe2e8444fe0b9f86f79b4..c23f7f4bf56d33113d77fa4066c16fa4a7958143 100644
--- a/http_server/dap_http.c
+++ b/http_server/dap_http.c
@@ -38,8 +38,8 @@
 
 #include "dap_common.h"
 
-#include "dap_server_client.h"
 #include "dap_server.h"
+#include "dap_server_client.h"
 
 #include "dap_http.h"
 #include "dap_http_header.h"
diff --git a/http_server/dap_http.h b/http_server/dap_http.h
index 52a92dcdb3907568f219cef629c22ef65e420f5c..c132c1a32b06975bd7c1fe3a66ff552a34aa3ab4 100644
--- a/http_server/dap_http.h
+++ b/http_server/dap_http.h
@@ -21,7 +21,7 @@
 #ifndef _SERVER_HTTP_H_
 #define _SERVER_HTTP_H_
 #include "dap_server.h"
-#include "dap_client.h"
+#include "dap_server_client.h"
 #include "http_client/dap_http_header.h"
 #include "http_client/dap_http_client.h"
 #include "uthash.h"
diff --git a/http_server/dap_http_folder.c b/http_server/dap_http_folder.c
index f4c84d654d8d8f105d76fa837efbd7c914fc80bd..dcdd16d117ad46f075f1e1f93e2402117087e62f 100644
--- a/http_server/dap_http_folder.c
+++ b/http_server/dap_http_folder.c
@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include "dap_common.h"
-#include "dap_client.h"
+#include "dap_server_client.h"
 #include "dap_http.h"
 #include "dap_http_client.h"
 #include "dap_http_folder.h"
diff --git a/http_server/http_client/dap_http_header.c b/http_server/http_client/dap_http_header.c
index 083f2478b3ff130a29c18d44f6288cfdbf83685f..35cf1562b85b293d25376df29e87c3625acbfd80 100644
--- a/http_server/http_client/dap_http_header.c
+++ b/http_server/http_client/dap_http_header.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "dap_common.h"
-#include "dap_client.h"
+#include "dap_server_client.h"
 #include "dap_http_client.h"
 #include "dap_http_header.h"
 
diff --git a/udp_server/dap_udp_client.c b/udp_server/dap_udp_client.c
index 706fb03f6ea169f293c8b3b12eac1644d22bc8da..056f1d5bbcd3b21f000a5f67e25bb69ded29af00 100644
--- a/udp_server/dap_udp_client.c
+++ b/udp_server/dap_udp_client.c
@@ -87,7 +87,7 @@ dap_server_client_t * dap_udp_client_create(dap_server_t * sh, ev_io* w_client,
  * @param host Variable for host address
  * @param host Variable for port
  */
-void dap_udp_client_get_address(dap_server_client_t *client, unsigned long* host,unsigned short* port){
+void dap_udp_client_get_address(dap_server_client_t *client, unsigned int* host,unsigned short* port){
     dap_udp_client_t* udp_client = DAP_UDP_CLIENT(client);    
     *host = udp_client->host_key >> 32;
     *port = udp_client->host_key - (*host<<32);
diff --git a/udp_server/dap_udp_client.h b/udp_server/dap_udp_client.h
index 79be1b52ea3a2873d96f66dcdc425c93026429a1..4304c5c19643209474fed2208e755ce839bb83ec 100644
--- a/udp_server/dap_udp_client.h
+++ b/udp_server/dap_udp_client.h
@@ -61,5 +61,6 @@ size_t dap_udp_client_write_f(dap_server_client_t *a_client, const char * a_form
 
 void add_waiting_client(dap_server_client_t* client); // Add client to writing queue
 
+void dap_udp_client_get_address(dap_server_client_t *client, unsigned int* host,unsigned short* port);
 
 #endif
diff --git a/udp_server/dap_udp_server.c b/udp_server/dap_udp_server.c
index 7043ec19c922205e2fe87df902dcf110c213c32c..e7942db42cae1e70ef404e149eb3b2db4c9349bf 100644
--- a/udp_server/dap_udp_server.c
+++ b/udp_server/dap_udp_server.c
@@ -17,6 +17,7 @@ struct ev_io w_read;
 struct ev_io w_write;
 
 static void write_cb(struct ev_loop* _loop, struct ev_io* watcher, int revents);
+int check_close(dap_server_client_t* client);
 
 /**
  */