diff -Nru a/server/access-file.c b/server/access-file.c
--- a/server/access-file.c	2016-04-29 08:39:51.000000000 +0200
+++ b/server/access-file.c	2016-05-07 18:58:25.733145710 +0200
@@ -11,7 +11,7 @@
 #include <event.h>
 #endif
 
-#include <evhtp.h>
+#include <evhtp/evhtp.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff -Nru a/server/http-server.c b/server/http-server.c
--- a/server/http-server.c	2016-04-29 08:39:51.000000000 +0200
+++ b/server/http-server.c	2016-05-07 18:59:22.895255893 +0200
@@ -12,7 +12,7 @@
 #include <event.h>
 #endif
 
-#include <evhtp.h>
+#include <evhtp/evhtp.h>
 
 #include "utils.h"
 #include "log.h"
diff -Nru a/server/upload-file.c b/server/upload-file.c
--- a/server/upload-file.c	2016-04-29 08:39:51.000000000 +0200
+++ b/server/upload-file.c	2016-05-07 19:02:13.067598723 +0200
@@ -12,7 +12,7 @@
 #include <event.h>
 #endif
 
-#include <evhtp.h>
+#include <evhtp/evhtp.h>
 
 #include <jansson.h>