diff --git a/include/haproxy/appsession.h b/include/common/appsession.h
similarity index 86%
rename from include/haproxy/appsession.h
rename to include/common/appsession.h
index 94a7e65cc..2c39e4663 100644
--- a/include/haproxy/appsession.h
+++ b/include/common/appsession.h
@@ -1,14 +1,14 @@
-#ifndef _HAPROXY_APPSESS_H
-#define _HAPROXY_APPSESS_H
+#ifndef _COMMON_APPSESS_H
+#define _COMMON_APPSESS_H
 
 #define TBLSIZ 10
 #define TBLCHKINT 5000 /* The time between two calls of appsession_refresh in ms */
 
 #include <sys/time.h>
 
-#include <haproxy/chtbl.h>
-#include <haproxy/hashpjw.h>
-#include <haproxy/list.h>
+#include <common/chtbl.h>
+#include <common/hashpjw.h>
+#include <common/list.h>
 
 #include <types/task.h>
 
@@ -48,7 +48,7 @@ int appsession_task_init(void);
 int appsession_init(void);
 void appsession_cleanup(void);
 
-#endif /* _HAPROXY_APPSESS_H */
+#endif /* _COMMON_APPSESS_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/base64.h b/include/common/base64.h
similarity index 80%
rename from include/haproxy/base64.h
rename to include/common/base64.h
index d22d903a4..3948962d6 100644
--- a/include/haproxy/base64.h
+++ b/include/common/base64.h
@@ -1,5 +1,5 @@
 /*
- * include/haproxy/base64.h
+ * include/common/base64.h
  * Ascii to Base64 conversion as described in RFC1421.
  *
  * Copyright 2006 Willy Tarreau <w@1wt.eu>
@@ -11,10 +11,10 @@
  *
  */
 
-#ifndef _HAPROXY_BASE64_H
-#define _HAPROXY_BASE64_H
+#ifndef _COMMON_BASE64_H
+#define _COMMON_BASE64_H
 
 int a2base64(char *in, int ilen, char *out, int olen);
 extern const char base64tab[];
 
-#endif /* _HAPROXY_BASE64_H */
+#endif /* _COMMON_BASE64_H */
diff --git a/include/haproxy/cfgparse.h b/include/common/cfgparse.h
similarity index 90%
rename from include/haproxy/cfgparse.h
rename to include/common/cfgparse.h
index f945d9c20..35302b3b7 100644
--- a/include/haproxy/cfgparse.h
+++ b/include/common/cfgparse.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/cfgparse.h
+  include/common/cfgparse.h
   Configuration parsing functions.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_CFGPARSE_H
-#define _HAPROXY_CFGPARSE_H
+#ifndef _COMMON_CFGPARSE_H
+#define _COMMON_CFGPARSE_H
 
 /* configuration sections */
 #define CFG_NONE	0
@@ -35,7 +35,7 @@ int cfg_parse_listen(char *file, int linenum, char **args);
 int readcfgfile(char *file);
 
 
-#endif /* _HAPROXY_CFGPARSE_H */
+#endif /* _COMMON_CFGPARSE_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/chtbl.h b/include/common/chtbl.h
similarity index 96%
rename from include/haproxy/chtbl.h
rename to include/common/chtbl.h
index fe4de70e4..38b495fb8 100644
--- a/include/haproxy/chtbl.h
+++ b/include/common/chtbl.h
@@ -15,8 +15,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#ifndef _HAPROXY_CHTBL_H
-#define _HAPROXY_CHTBL_H
+#ifndef _COMMON_CHTBL_H
+#define _COMMON_CHTBL_H
 
 #include <stdlib.h>
 
@@ -59,5 +59,5 @@ int chtbl_lookup(const CHTbl *htbl, void **data);
 
 #define chtbl_size(htbl) ((htbl)->size)
 
-#endif /* _HAPROXY_CHTBL_H */
+#endif /* _COMMON_CHTBL_H */
 
diff --git a/include/haproxy/compat.h b/include/common/compat.h
similarity index 92%
rename from include/haproxy/compat.h
rename to include/common/compat.h
index bf4c843c7..a605da1ec 100644
--- a/include/haproxy/compat.h
+++ b/include/common/compat.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/compat.h
+  include/common/compat.h
   Operating system compatibility interface.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_COMPAT_H
-#define _HAPROXY_COMPAT_H
+#ifndef _COMMON_COMPAT_H
+#define _COMMON_COMPAT_H
 
 /* This is needed on Linux for Netfilter includes */
 #include <sys/socket.h>
@@ -52,7 +52,7 @@
 #include <strings.h>
 #endif
 
-#endif /* _HAPROXY_COMPAT_H */
+#endif /* _COMMON_COMPAT_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/config.h b/include/common/config.h
similarity index 88%
rename from include/haproxy/config.h
rename to include/common/config.h
index 968e3c151..f9145c50a 100644
--- a/include/haproxy/config.h
+++ b/include/common/config.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/config.h
+  include/common/config.h
   This files contains most of the user-configurable settings.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,10 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_CONFIG_H
-#define _HAPROXY_CONFIG_H
+#ifndef _COMMON_CONFIG_H
+#define _COMMON_CONFIG_H
 
-#include <haproxy/defaults.h>
+#include <common/defaults.h>
 
 /* this reduces the number of calls to select() by choosing appropriate
  * sheduler precision in milliseconds. It should be near the minimum
@@ -31,4 +31,4 @@
  */
 #define SCHEDULER_RESOLUTION    9
 
-#endif /* _HAPROXY_CONFIG_H */
+#endif /* _COMMON_CONFIG_H */
diff --git a/include/haproxy/defaults.h b/include/common/defaults.h
similarity index 96%
rename from include/haproxy/defaults.h
rename to include/common/defaults.h
index f01dc67f6..449fc5f17 100644
--- a/include/haproxy/defaults.h
+++ b/include/common/defaults.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/defaults.h
+  include/common/defaults.h
   Miscellaneous default values.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_DEFAULTS_H
-#define _HAPROXY_DEFAULTS_H
+#ifndef _COMMON_DEFAULTS_H
+#define _COMMON_DEFAULTS_H
 
 
 /* CONFIG_HAP_MEM_OPTIM
@@ -91,4 +91,4 @@
 #define DEFAULT_MAXCONN SYSTEM_MAXCONN
 #endif
 
-#endif /* _HAPROXY_DEFAULTS_H */
+#endif /* _COMMON_DEFAULTS_H */
diff --git a/include/haproxy/epoll.h b/include/common/epoll.h
similarity index 96%
rename from include/haproxy/epoll.h
rename to include/common/epoll.h
index d1bd112f1..865a3e129 100644
--- a/include/haproxy/epoll.h
+++ b/include/common/epoll.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/epoll.h
+  include/common/epoll.h
   epoll definitions for older libc.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -26,8 +26,8 @@
  * just a basic definition.
  */
 
-#ifndef _HAPROXY_EPOLL_H
-#define _HAPROXY_EPOLL_H
+#ifndef _COMMON_EPOLL_H
+#define _COMMON_EPOLL_H
 
 #include <linux/unistd.h>
 #include <stdint.h>
@@ -92,7 +92,7 @@ extern int epoll_create(int size);
 extern int epoll_ctl(int epfd, int op, int fd, struct epoll_event * event);
 extern int epoll_wait(int epfd, struct epoll_event * events, int maxevents, int timeout);
 
-#endif /* _HAPROXY_EPOLL_H */
+#endif /* _COMMON_EPOLL_H */
 
 
 /*
diff --git a/include/haproxy/hashpjw.h b/include/common/hashpjw.h
similarity index 94%
rename from include/haproxy/hashpjw.h
rename to include/common/hashpjw.h
index 2788395db..99a3ad7bc 100644
--- a/include/haproxy/hashpjw.h
+++ b/include/common/hashpjw.h
@@ -16,8 +16,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#ifndef _HAPROXY_HASHPJW_H
-#define _HAPROXY_HASHPJW_H
+#ifndef _COMMON_HASHPJW_H
+#define _COMMON_HASHPJW_H
 
 /*****************************************************************************
 *                                                                            *
@@ -35,4 +35,4 @@
 
 int hashpjw(const void *key);
 
-#endif /* _HAPROXY_HASHPJW_H */
+#endif /* _COMMON_HASHPJW_H */
diff --git a/include/haproxy/list.h b/include/common/list.h
similarity index 97%
rename from include/haproxy/list.h
rename to include/common/list.h
index 16895734c..4537d8d98 100644
--- a/include/haproxy/list.h
+++ b/include/common/list.h
@@ -15,8 +15,8 @@
 *                                                                            *
 *****************************************************************************/
 
-#ifndef _HAPROXY_LIST_H
-#define _HAPROXY_LIST_H
+#ifndef _COMMON_LIST_H
+#define _COMMON_LIST_H
 
 #include <stdlib.h>
 
@@ -74,7 +74,7 @@ int list_rem_next(List *list, ListElmt *element, void **data);
 
 #define list_next(element) ((element)->next)
 
-#endif /* _HAPROXY_LIST_H */
+#endif /* _COMMON_LIST_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/memory.h b/include/common/memory.h
similarity index 96%
rename from include/haproxy/memory.h
rename to include/common/memory.h
index 3f269d2c8..820c1d98e 100644
--- a/include/haproxy/memory.h
+++ b/include/common/memory.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/memory.h
+  include/common/memory.h
   Memory management definitions..
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,12 +19,12 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_MEMORY_H
-#define _HAPROXY_MEMORY_H
+#ifndef _COMMON_MEMORY_H
+#define _COMMON_MEMORY_H
 
 #include <stdlib.h>
 
-#include <haproxy/config.h>
+#include <common/config.h>
 
 #define sizeof_requri   REQURI_LEN
 #define sizeof_capture  CAPTURE_LEN
@@ -112,7 +112,7 @@ static inline void pool_destroy(void **pool)
 	}
 }
 
-#endif /* _HAPROXY_MEMORY_H */
+#endif /* _COMMON_MEMORY_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/mini-clist.h b/include/common/mini-clist.h
similarity index 97%
rename from include/haproxy/mini-clist.h
rename to include/common/mini-clist.h
index bf9bbe93c..47b004d7a 100644
--- a/include/haproxy/mini-clist.h
+++ b/include/common/mini-clist.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef _HAPROXY_MINI_CLIST_H
-#define _HAPROXY_MINI_CLIST_H
+#ifndef _COMMON_MINI_CLIST_H
+#define _COMMON_MINI_CLIST_H
 
 /* these are circular or bidirectionnal lists only. Each list pointer points to
  * another list pointer in a structure, and not the structure itself. The
@@ -91,4 +91,4 @@ struct list {
 	for ( ; (iterator) != (end_item); (iterator) = (backup),   \
 		backup = LIST_ELEM((iterator)->struct_member.n, struct_type, struct_member))
 
-#endif /* _HAPROXY_MINI_CLIST_H */
+#endif /* _COMMON_MINI_CLIST_H */
diff --git a/include/haproxy/regex.h b/include/common/regex.h
similarity index 92%
rename from include/haproxy/regex.h
rename to include/common/regex.h
index 03b4ca690..d9510bfba 100644
--- a/include/haproxy/regex.h
+++ b/include/common/regex.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/regex.h
+  include/common/regex.h
   This file defines everything related to regular expressions.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,10 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_REGEX_H
-#define _HAPROXY_REGEX_H
+#ifndef _COMMON_REGEX_H
+#define _COMMON_REGEX_H
 
-#include <haproxy/defaults.h>
+#include <common/defaults.h>
 
 #ifdef USE_PCRE
 #include <pcre.h>
@@ -51,7 +51,7 @@ int exp_replace(char *dst, char *src, char *str, regmatch_t *matches);
 char *check_replace_string(char *str);
 char *chain_regex(struct hdr_exp **head, regex_t *preg, int action, char *replace);
 
-#endif /* _HAPROXY_REGEX_H */
+#endif /* _COMMON_REGEX_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/standard.h b/include/common/standard.h
similarity index 95%
rename from include/haproxy/standard.h
rename to include/common/standard.h
index 05a2b0dbb..bde42e316 100644
--- a/include/haproxy/standard.h
+++ b/include/common/standard.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/standard.h
+  include/common/standard.h
   This files contains some general purpose functions and macros.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,12 +19,12 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_STANDARD_H
-#define _HAPROXY_STANDARD_H
+#ifndef _COMMON_STANDARD_H
+#define _COMMON_STANDARD_H
 
 #include <netinet/in.h>
-#include <haproxy/defaults.h>
-#include <haproxy/compat.h>
+#include <common/defaults.h>
+#include <common/compat.h>
 
 
 /****** string-specific macros and functions ******/
@@ -89,4 +89,4 @@ char *encode_string(char *start, char *stop,
 		    const char escape, const fd_set *map,
 		    const char *string);
 
-#endif /* _HAPROXY_STANDARD_H */
+#endif /* _COMMON_STANDARD_H */
diff --git a/include/haproxy/template.h b/include/common/template.h
similarity index 88%
rename from include/haproxy/template.h
rename to include/common/template.h
index da2b9d5d1..431274fac 100644
--- a/include/haproxy/template.h
+++ b/include/common/template.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/template.h
+  include/common/template.h
   This file serves as a template for future include files.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,11 +19,11 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_TEMPLATE_H
-#define _HAPROXY_TEMPLATE_H
+#ifndef _COMMON_TEMPLATE_H
+#define _COMMON_TEMPLATE_H
 
 
-#endif /* _HAPROXY_TEMPLATE_H */
+#endif /* _COMMON_TEMPLATE_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/time.h b/include/common/time.h
similarity index 97%
rename from include/haproxy/time.h
rename to include/common/time.h
index dd3e70155..b25846662 100644
--- a/include/haproxy/time.h
+++ b/include/common/time.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/time.h
+  include/common/time.h
   Time calculation functions and macros.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_TIME_H
-#define _HAPROXY_TIME_H
+#ifndef _COMMON_TIME_H
+#define _COMMON_TIME_H
 
 #include <stdlib.h>
 #include <sys/time.h>
@@ -166,7 +166,7 @@ static inline struct timeval *tv_min(struct timeval *tvmin,
 }
 
 
-#endif /* _HAPROXY_TIME_H */
+#endif /* _COMMON_TIME_H */
 
 /*
  * Local variables:
diff --git a/include/haproxy/uri_auth.h b/include/common/uri_auth.h
similarity index 96%
rename from include/haproxy/uri_auth.h
rename to include/common/uri_auth.h
index 9eed7303b..ddfa56ba6 100644
--- a/include/haproxy/uri_auth.h
+++ b/include/common/uri_auth.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef _HAPROXY_URI_AUTH_H
-#define _HAPROXY_URI_AUTH_H
+#ifndef _COMMON_URI_AUTH_H
+#define _COMMON_URI_AUTH_H
 /* here we find a very basic list of base64-encoded 'user:passwd' strings */
 struct user_auth {
 	struct user_auth *next;		/* next entry, NULL if none */
@@ -65,4 +65,4 @@ struct uri_auth *stats_set_realm(struct uri_auth **root, char *realm);
 struct uri_auth *stats_add_auth(struct uri_auth **root, char *user);
 struct uri_auth *stats_add_scope(struct uri_auth **root, char *scope);
 
-#endif /* _HAPROXY_URI_AUTH_H */
+#endif /* _COMMON_URI_AUTH_H */
diff --git a/include/haproxy/version.h b/include/common/version.h
similarity index 90%
rename from include/haproxy/version.h
rename to include/common/version.h
index 16e0d54a8..c1ae43b23 100644
--- a/include/haproxy/version.h
+++ b/include/common/version.h
@@ -1,5 +1,5 @@
 /*
-  include/haproxy/version.h
+  include/common/version.h
   This file serves as a template for future include files.
 
   Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _HAPROXY_VERSION_H
-#define _HAPROXY_VERSION_H
+#ifndef _COMMON_VERSION_H
+#define _COMMON_VERSION_H
 
 #ifdef  CONFIG_PRODUCT_NAME
 #define PRODUCT_NAME CONFIG_PRODUCT_NAME
@@ -36,4 +36,4 @@
 #define HAPROXY_DATE    "2006/06/26"
 #endif
 
-#endif /* _HAPROXY_VERSION_H */
+#endif /* _COMMON_VERSION_H */
diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index 85557511b..b332a4bcf 100644
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_BUFFERS_H
 #define _PROTO_BUFFERS_H
 
-#include <haproxy/defaults.h>
+#include <common/defaults.h>
 #include <types/buffers.h>
 
 /* returns 1 if the buffer is empty, 0 otherwise */
diff --git a/include/proto/queue.h b/include/proto/queue.h
index 9f135905c..6909cbe0d 100644
--- a/include/proto/queue.h
+++ b/include/proto/queue.h
@@ -22,8 +22,8 @@
 #ifndef _PROTO_QUEUE_H
 #define _PROTO_QUEUE_H
 
-#include <haproxy/memory.h>
-#include <haproxy/mini-clist.h>
+#include <common/memory.h>
+#include <common/mini-clist.h>
 
 #include <types/proxy.h>
 #include <types/queue.h>
diff --git a/include/proto/stream_sock.h b/include/proto/stream_sock.h
index bab3c53fd..14d90cf81 100644
--- a/include/proto/stream_sock.h
+++ b/include/proto/stream_sock.h
@@ -26,8 +26,8 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <haproxy/defaults.h>
-#include <haproxy/config.h>
+#include <common/defaults.h>
+#include <common/config.h>
 
 
 /* FIXME: merge those ones together */
diff --git a/include/proto/task.h b/include/proto/task.h
index 8aba7950a..72fd1f185 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -25,7 +25,7 @@
 
 #include <sys/time.h>
 #include <types/task.h>
-#include <haproxy/memory.h>
+#include <common/memory.h>
 
 
 /* puts the task <t> in run queue <q>, and returns <t> */
diff --git a/include/types/buffers.h b/include/types/buffers.h
index 2fcf59fa5..1bbea6905 100644
--- a/include/types/buffers.h
+++ b/include/types/buffers.h
@@ -22,8 +22,8 @@
 #ifndef _TYPES_BUFFERS_H
 #define _TYPES_BUFFERS_H
 
-#include <haproxy/defaults.h>
-#include <haproxy/memory.h>
+#include <common/defaults.h>
+#include <common/memory.h>
 
 /* describes a chunk of string */
 struct chunk {
diff --git a/include/types/fd.h b/include/types/fd.h
index 6e350e56e..1b24be3f5 100644
--- a/include/types/fd.h
+++ b/include/types/fd.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <haproxy/config.h>
+#include <common/config.h>
 #include <types/task.h>
 
 /* different possible states for the fd */
diff --git a/include/types/polling.h b/include/types/polling.h
index 3c2a231a5..cd9fe93a5 100644
--- a/include/types/polling.h
+++ b/include/types/polling.h
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <haproxy/config.h>
+#include <common/config.h>
 
 /* for POLL_* */
 #if defined(ENABLE_POLL)
@@ -39,7 +39,7 @@
 #if !defined(USE_MY_EPOLL)
 #include <sys/epoll.h>
 #else
-#include <haproxy/epoll.h>
+#include <common/epoll.h>
 #endif
 #endif
 
diff --git a/include/types/proxy.h b/include/types/proxy.h
index 96858280b..d699bc104 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -26,10 +26,10 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 
-#include <haproxy/appsession.h>
-#include <haproxy/chtbl.h>
-#include <haproxy/mini-clist.h>
-#include <haproxy/regex.h>
+#include <common/appsession.h>
+#include <common/chtbl.h>
+#include <common/mini-clist.h>
+#include <common/regex.h>
 
 #include <types/buffers.h>
 #include <types/session.h>
diff --git a/include/types/queue.h b/include/types/queue.h
index d35fae9d4..1e45b28a4 100644
--- a/include/types/queue.h
+++ b/include/types/queue.h
@@ -22,7 +22,7 @@
 #ifndef _TYPES_QUEUE_H
 #define _TYPES_QUEUE_H
 
-#include <haproxy/mini-clist.h>
+#include <common/mini-clist.h>
 
 #include <types/server.h>
 #include <types/session.h>
diff --git a/include/types/server.h b/include/types/server.h
index 56a6b63f0..7c62a3da0 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -25,7 +25,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/mini-clist.h>
+#include <common/mini-clist.h>
 
 #include <types/buffers.h>
 #include <types/proxy.h>
diff --git a/include/types/session.h b/include/types/session.h
index e2ae54d7d..8a5d0a450 100644
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <haproxy/mini-clist.h>
+#include <common/mini-clist.h>
 
 #include <types/buffers.h>
 #include <types/proxy.h>
diff --git a/src/appsession.c b/src/appsession.c
index da7315aa7..58145e1a5 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 ec997901f..df920a022 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 a427d5d83..d730328d7 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 52b6e0865..cfca6c9a2 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 8fd3e8e7c..fd0f10637 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 c8e794fd3..7773d403e 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 d42e8aadd..31da5941a 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 b7ff8add7..ec0607eba 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 @@ int cfg_polling_mechanism = 0;  /* POLL_USE_{SELECT|POLL|EPOLL} */
 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 e339a7b04..917e20227 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 78c0a5be7..69fa1b919 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 0eaf6ce32..ae79a0cb9 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 d311ac888..34cf52532 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 af0129050..9264a50b6 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 936836263..0c24a05a1 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 b1beb4b74..19273db93 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 67c0d7cc6..a12f31373 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 4c3776012..9db3d1015 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 0722d0f4c..e057b1524 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 e218055fa..7ddb88a81 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 e30546117..d8a99bff0 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 2c4adee3e..1f567b924 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 d495ed166..e573b9d9c 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 498d73512..661419a21 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>
 
 
 /*