diff --git a/src/appsession.c b/src/appsession.c
index da7315a..58145e1 100644
--- a/src/appsession.c
+++ b/src/appsession.c
@@ -11,11 +11,12 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
-#include <haproxy/appsession.h>
-#include <haproxy/chtbl.h>
-#include <haproxy/list.h>
-#include <haproxy/time.h>
+#include <common/appsession.h>
+#include <common/chtbl.h>
+#include <common/list.h>
+#include <common/time.h>
 
 #include <types/buffers.h>
 #include <types/global.h>
diff --git a/src/backend.c b/src/backend.c
index ec99790..df920a0 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <syslog.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/buffers.h>
 #include <types/global.h>
diff --git a/src/base64.c b/src/base64.c
index a427d5d..d730328 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <haproxy/base64.h>
+#include <common/base64.h>
 
 const char base64tab[64]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 52b6e08..cfca6c9 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -16,12 +16,12 @@
 #include <netdb.h>
 #include <ctype.h>
 
-#include <haproxy/cfgparse.h>
-#include <haproxy/config.h>
-#include <haproxy/memory.h>
-#include <haproxy/standard.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth.h>
+#include <common/cfgparse.h>
+#include <common/config.h>
+#include <common/memory.h>
+#include <common/standard.h>
+#include <common/time.h>
+#include <common/uri_auth.h>
 
 #include <types/capture.h>
 #include <types/global.h>
diff --git a/src/checks.c b/src/checks.c
index 8fd3e8e..fd0f106 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -13,15 +13,16 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/mini-clist.h>
+#include <common/time.h>
 
 #include <types/global.h>
 #include <types/polling.h>
diff --git a/src/chtbl.c b/src/chtbl.c
index c8e794f..7773d40 100644
--- a/src/chtbl.c
+++ b/src/chtbl.c
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/list.h>
-#include <haproxy/chtbl.h>
+#include <common/list.h>
+#include <common/chtbl.h>
 
 /*****************************************************************************
  *                                                                            *
diff --git a/src/client.c b/src/client.c
index d42e8aa..31da594 100644
--- a/src/client.c
+++ b/src/client.c
@@ -14,13 +14,14 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/backend.h>
 #include <types/buffers.h>
diff --git a/src/fd.c b/src/fd.c
index b7ff8ad..ec0607e 100644
--- a/src/fd.c
+++ b/src/fd.c
@@ -29,9 +29,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/time.h>
 
 #include <types/fd.h>
 #include <types/global.h>
@@ -64,6 +64,8 @@
 fd_set *PrevReadEvent = NULL, *PrevWriteEvent = NULL;
 
 #if defined(USE_MY_EPOLL)
+#include <errno.h>
+#include <sys/syscall.h>
 _syscall1 (int, epoll_create, int, size);
 _syscall4 (int, epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, event);
 _syscall4 (int, epoll_wait, int, epfd, struct epoll_event *, events, int, maxevents, int, timeout);
diff --git a/src/haproxy.c b/src/haproxy.c
index e339a7b..917e202 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -58,19 +58,19 @@
 #include <assert.h>
 #endif
 
-#include <haproxy/appsession.h>
-#include <haproxy/base64.h>
-#include <haproxy/cfgparse.h>
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/defaults.h>
-#include <haproxy/memory.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/regex.h>
-#include <haproxy/standard.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth.h>
-#include <haproxy/version.h>
+#include <common/appsession.h>
+#include <common/base64.h>
+#include <common/cfgparse.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/defaults.h>
+#include <common/memory.h>
+#include <common/mini-clist.h>
+#include <common/regex.h>
+#include <common/standard.h>
+#include <common/time.h>
+#include <common/uri_auth.h>
+#include <common/version.h>
 
 #include <types/capture.h>
 #include <types/global.h>
diff --git a/src/hashpjw.c b/src/hashpjw.c
index 78c0a5b..69fa1b9 100644
--- a/src/hashpjw.c
+++ b/src/hashpjw.c
@@ -16,8 +16,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#include <haproxy/hashpjw.h>
-#include <haproxy/appsession.h>
+#include <common/hashpjw.h>
+#include <common/appsession.h>
 
 /*****************************************************************************
 *                                                                            *
diff --git a/src/list.c b/src/list.c
index 0eaf6ce..ae79a0c 100644
--- a/src/list.c
+++ b/src/list.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/list.h>
+#include <common/list.h>
 
 /*****************************************************************************
 *                                                                            *
diff --git a/src/log.c b/src/log.c
index d311ac8..34cf525 100644
--- a/src/log.c
+++ b/src/log.c
@@ -20,7 +20,7 @@
 
 #include <sys/time.h>
 
-#include <haproxy/standard.h>
+#include <common/standard.h>
 
 #include <types/backend.h>
 #include <types/global.h>
diff --git a/src/polling.c b/src/polling.c
index af01290..9264a50 100644
--- a/src/polling.c
+++ b/src/polling.c
@@ -14,9 +14,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/time.h>
 
 #include <types/fd.h>
 #include <types/global.h>
diff --git a/src/proto_http.c b/src/proto_http.c
index 9368362..0c24a05 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -22,15 +22,15 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/appsession.h>
-#include <haproxy/compat.h>
-#include <haproxy/config.h>
-#include <haproxy/memory.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/standard.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth.h>
-#include <haproxy/version.h>
+#include <common/appsession.h>
+#include <common/compat.h>
+#include <common/config.h>
+#include <common/memory.h>
+#include <common/mini-clist.h>
+#include <common/standard.h>
+#include <common/time.h>
+#include <common/uri_auth.h>
+#include <common/version.h>
 
 #include <types/capture.h>
 #include <types/client.h>
diff --git a/src/proxy.c b/src/proxy.c
index b1beb4b..19273db 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -16,9 +16,9 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#include <haproxy/defaults.h>
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/defaults.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/global.h>
 #include <types/polling.h>
diff --git a/src/queue.c b/src/queue.c
index 67c0d7c..a12f313 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <haproxy/time.h>
+#include <common/time.h>
 
 #include <types/proxy.h>
 #include <types/session.h>
diff --git a/src/regex.c b/src/regex.c
index 4c37760..9db3d10 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -14,8 +14,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/regex.h>
-#include <haproxy/standard.h>
+#include <common/regex.h>
+#include <common/standard.h>
 #include <proto/log.h>
 
 /* regex trash buffer used by various regex tests */
diff --git a/src/session.c b/src/session.c
index 0722d0f..e057b15 100644
--- a/src/session.c
+++ b/src/session.c
@@ -11,7 +11,7 @@
  */
 
 #include <stdlib.h>
-#include <haproxy/memory.h>
+#include <common/memory.h>
 
 #include <types/backend.h>
 #include <types/capture.h>
diff --git a/src/standard.c b/src/standard.c
index e218055..7ddb88a 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -16,7 +16,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/standard.h>
+#include <common/standard.h>
 #include <proto/log.h>
 
 /* enough to store 2^63=18446744073709551615 */
diff --git a/src/stream_sock.c b/src/stream_sock.c
index e305461..d8a99bf 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -19,8 +19,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/compat.h>
-#include <haproxy/time.h>
+#include <common/compat.h>
+#include <common/time.h>
 
 #include <types/backend.h>
 #include <types/buffers.h>
diff --git a/src/task.c b/src/task.c
index 2c4adee..1f567b9 100644
--- a/src/task.c
+++ b/src/task.c
@@ -10,9 +10,9 @@
  *
  */
 
-#include <haproxy/config.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/time.h>
+#include <common/config.h>
+#include <common/mini-clist.h>
+#include <common/time.h>
 
 #include <proto/task.h>
 
diff --git a/src/time.c b/src/time.c
index d495ed1..e573b9d 100644
--- a/src/time.c
+++ b/src/time.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/time.h>
-#include <haproxy/time.h>
+#include <common/time.h>
 
 struct timeval now;             /* the current date at any moment */
 struct timeval start_date;      /* the process's start date */
diff --git a/src/uri_auth.c b/src/uri_auth.c
index 498d735..661419a 100644
--- a/src/uri_auth.c
+++ b/src/uri_auth.c
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/base64.h>
-#include <haproxy/uri_auth.h>
+#include <common/base64.h>
+#include <common/uri_auth.h>
 
 
 /*