diff --git a/contrib/modsecurity/Makefile b/contrib/modsecurity/Makefile
index 93119b3b6..a00bdd009 100644
--- a/contrib/modsecurity/Makefile
+++ b/contrib/modsecurity/Makefile
@@ -34,7 +34,7 @@ EVENT_INC := /usr/include
 endif
 
 CFLAGS  += -g -Wall -pthread
-INCS += -I../../include -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
+INCS += -Iinclude -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
 LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
 
 OBJS = spoa.o modsec_wrapper.o
diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index 3a55ab2bb..7880a1830 100644
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -16,13 +16,8 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include <haproxy/arg.h>
-#include <haproxy/errors.h>
-#include <haproxy/global.h>
-#include <haproxy/hlua.h>
-#include <haproxy/spoe.h>
-#include <haproxy/stream-t.h>
-#include <haproxy/time.h>
+#include <haproxy/intops.h>
+#include <haproxy/sample-t.h>
 
 #include <api.h>
 
diff --git a/contrib/modsecurity/spoa.c b/contrib/modsecurity/spoa.c
index b0b042ee7..37564055c 100644
--- a/contrib/modsecurity/spoa.c
+++ b/contrib/modsecurity/spoa.c
@@ -36,7 +36,6 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/chunk.h>
 #include <haproxy/list.h>
 #include <haproxy/spoe.h>