diff --git a/src/client.c b/src/client.c
index 62d78bd..e5cee98 100644
--- a/src/client.c
+++ b/src/client.c
@@ -5,12 +5,9 @@
  * Lorenz Stechauner, 2020-12-03
  */
 
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-
 #include "necronda-server.h"
 #include "utils.h"
+#include "uri.h"
 #include "net/http.h"
 
 
@@ -20,9 +17,12 @@ char *client_addr_str, *client_addr_str_ptr, *server_addr_str, *server_addr_str_
 
 struct timeval client_timeout = {.tv_sec = CLIENT_TIMEOUT, .tv_usec = 0};
 
+char *get_webroot(char *http_host) {
+
+}
+
 void client_terminate() {
     server_keep_alive = 0;
-    // TODO prevent processing of further requests in connection
 }
 
 int client_websocket_handler() {
diff --git a/src/necronda-server.c b/src/necronda-server.c
index f254a51..a8d36de 100644
--- a/src/necronda-server.c
+++ b/src/necronda-server.c
@@ -9,17 +9,8 @@
 
 #include "necronda-server.h"
 
-#include <stdio.h>
-#include <sys/socket.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/select.h>
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <wait.h>
-
 #include "utils.c"
+#include "uri.c"
 #include "net/http.c"
 #include "client.c"
 
diff --git a/src/necronda-server.h b/src/necronda-server.h
index 23b7abf..73d9d24 100644
--- a/src/necronda-server.h
+++ b/src/necronda-server.h
@@ -8,6 +8,15 @@
 #ifndef NECRONDA_SERVER_NECRONDA_SERVER_H
 #define NECRONDA_SERVER_NECRONDA_SERVER_H
 
+#include <stdio.h>
+#include <sys/socket.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/select.h>
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <wait.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <openssl/err.h>