diff --git a/include/proto/log.h b/include/proto/log.h
index 1a02ec122..4f6eed7f0 100644
--- a/include/proto/log.h
+++ b/include/proto/log.h
@@ -3,7 +3,7 @@
   This file contains definitions of log-related functions, structures,
   and macros.
 
-  Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
+  Copyright (C) 2000-2008 Willy Tarreau - w@1wt.eu
   
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -38,17 +38,17 @@ extern struct pool_head *pool2_requri;
  * Displays the message on stderr with the date and pid. Overrides the quiet
  * mode during startup.
  */
-void Alert(char *fmt, ...);
+void Alert(const char *fmt, ...);
 
 /*
  * Displays the message on stderr with the date and pid.
  */
-void Warning(char *fmt, ...);
+void Warning(const char *fmt, ...);
 
 /*
  * Displays the message on <out> only if quiet mode is not set.
  */
-void qfprintf(FILE *out, char *fmt, ...);
+void qfprintf(FILE *out, const char *fmt, ...);
 
 /*
  * This function sends a syslog message to both log servers of a proxy,
@@ -56,7 +56,7 @@ void qfprintf(FILE *out, char *fmt, ...);
  * It also tries not to waste too much time computing the message header.
  * It doesn't care about errors nor does it report them.
  */
-void send_log(struct proxy *p, int level, char *message, ...);
+void send_log(struct proxy *p, int level, const char *message, ...);
 
 /*
  * send a log for the session when we have enough info about it
diff --git a/src/acl.c b/src/acl.c
index e5639f779..6385c6fd4 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -20,10 +20,6 @@
 
 #include <proto/acl.h>
 
-#include <types/acl.h>
-#include <types/proxy.h>
-#include <types/session.h>
-
 /* List head of all known ACL keywords */
 static struct acl_kw_list acl_keywords = {
 	.list = LIST_HEAD_INIT(acl_keywords.list)
diff --git a/src/appsession.c b/src/appsession.c
index 10b4df070..b3f2c76a4 100644
--- a/src/appsession.c
+++ b/src/appsession.c
@@ -21,11 +21,9 @@
 #include <common/ticks.h>
 #include <common/time.h>
 
-#include <types/buffers.h>
 #include <types/global.h>
-#include <types/proxy.h>
-#include <types/server.h>
 
+#include <proto/proxy.h>
 #include <proto/task.h>
 
 static struct task *appsess_refresh = NULL;
diff --git a/src/backend.c b/src/backend.c
index 7116965f8..ddedfd982 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -25,13 +25,7 @@
 #include <common/ticks.h>
 #include <common/time.h>
 
-#include <types/acl.h>
-#include <types/buffers.h>
 #include <types/global.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/server.h>
-#include <types/session.h>
 
 #include <proto/acl.h>
 #include <proto/backend.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index a492a932e..9aac0eb81 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -32,10 +32,7 @@
 
 #include <types/capture.h>
 #include <types/global.h>
-#include <types/httperr.h>
 #include <types/polling.h>
-#include <types/proxy.h>
-#include <types/queue.h>
 
 #include <proto/acl.h>
 #include <proto/backend.h>
diff --git a/src/checks.c b/src/checks.c
index 2dc1d6019..5e3c19d7e 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -30,9 +30,6 @@
 #include <common/time.h>
 
 #include <types/global.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/session.h>
 
 #include <proto/backend.h>
 #include <proto/buffers.h>
diff --git a/src/client.c b/src/client.c
index e76a74109..f3081c1d1 100644
--- a/src/client.c
+++ b/src/client.c
@@ -24,15 +24,7 @@
 #include <common/config.h>
 #include <common/time.h>
 
-#include <types/acl.h>
-#include <types/backend.h>
-#include <types/buffers.h>
 #include <types/global.h>
-#include <types/httperr.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/server.h>
-#include <types/session.h>
 
 #include <proto/acl.h>
 #include <proto/buffers.h>
diff --git a/src/cttproxy.c b/src/cttproxy.c
index 04c3df230..9faed881e 100644
--- a/src/cttproxy.c
+++ b/src/cttproxy.c
@@ -2,7 +2,7 @@
  * Functions for managing transparent proxying with CTTPROXY.
  * This file should be compiled only if CTTPROXY is enabled.
  *
- * Copyright 2000-2007 Willy Tarreau <w@1wt.eu>
+ * Copyright 2000-2008 Willy Tarreau <w@1wt.eu>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,8 +25,6 @@
 #include <common/config.h>
 #include <common/time.h>
 
-#include <types/global.h>
-
 #include <import/ip_tproxy.h>
 
 /*
diff --git a/src/dumpstats.c b/src/dumpstats.c
index 3517a9952..01ddd7129 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -36,9 +36,6 @@
 #include <common/version.h>
 
 #include <types/global.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/server.h>
 
 #include <proto/backend.h>
 #include <proto/buffers.h>
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 1c4e4370e..30862cabc 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -24,7 +24,6 @@
 #include <types/fd.h>
 #include <types/global.h>
 
-#include <proto/fd.h>
 #include <proto/task.h>
 
 #if defined(USE_MY_EPOLL)
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 604340b83..1e10b427f 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -27,7 +27,6 @@
 #include <common/time.h>
 #include <common/tools.h>
 
-#include <types/fd.h>
 #include <types/global.h>
 
 #include <proto/fd.h>
diff --git a/src/ev_poll.c b/src/ev_poll.c
index 0a0f23d2c..5f0a2c49b 100644
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -20,7 +20,6 @@
 #include <common/ticks.h>
 #include <common/time.h>
 
-#include <types/fd.h>
 #include <types/global.h>
 
 #include <proto/fd.h>
diff --git a/src/ev_select.c b/src/ev_select.c
index ecdd8709e..95663ffef 100644
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -19,7 +19,6 @@
 #include <common/ticks.h>
 #include <common/time.h>
 
-#include <types/fd.h>
 #include <types/global.h>
 
 #include <proto/fd.h>
diff --git a/src/ev_sepoll.c b/src/ev_sepoll.c
index 2419b684a..70b10655d 100644
--- a/src/ev_sepoll.c
+++ b/src/ev_sepoll.c
@@ -56,7 +56,6 @@
 #include <common/time.h>
 #include <common/tools.h>
 
-#include <types/fd.h>
 #include <types/global.h>
 
 #include <proto/fd.h>
diff --git a/src/fd.c b/src/fd.c
index eaaaabf50..0ee6a723e 100644
--- a/src/fd.c
+++ b/src/fd.c
@@ -1,7 +1,7 @@
 /*
  * File descriptors management functions.
  *
- * Copyright 2000-2007 Willy Tarreau <w@1wt.eu>
+ * Copyright 2000-2008 Willy Tarreau <w@1wt.eu>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,8 +18,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 
-#include <types/fd.h>
-#include <types/global.h>
+//#include <types/global.h>
 
 #include <proto/fd.h>
 
diff --git a/src/haproxy.c b/src/haproxy.c
index 0c8bbb07a..1d3089a58 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -75,9 +75,7 @@
 
 #include <types/capture.h>
 #include <types/global.h>
-#include <types/httperr.h>
 #include <types/polling.h>
-#include <types/proto_http.h>
 
 #include <proto/acl.h>
 #include <proto/backend.h>
diff --git a/src/hdr_idx.c b/src/hdr_idx.c
index aceaeb13c..a8c595d0e 100644
--- a/src/hdr_idx.c
+++ b/src/hdr_idx.c
@@ -1,7 +1,7 @@
 /*
  * Header indexation functions.
  *
- * Copyright 2000-2006 Willy Tarreau <w@1wt.eu>
+ * Copyright 2000-2008 Willy Tarreau <w@1wt.eu>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -11,7 +11,7 @@
  */
 
 #include <common/config.h>
-#include <types/hdr_idx.h>
+#include <proto/hdr_idx.h>
 
 
 /*
diff --git a/src/log.c b/src/log.c
index d08ad16d6..fc04232f8 100644
--- a/src/log.c
+++ b/src/log.c
@@ -26,10 +26,9 @@
 #include <common/standard.h>
 #include <common/time.h>
 
-#include <types/backend.h>
 #include <types/global.h>
-#include <types/log.h>
-#include <types/session.h>
+
+#include <proto/log.h>
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL	(0)
diff --git a/src/proto_http.c b/src/proto_http.c
index 6a662d42e..5b1221f1c 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -35,13 +35,8 @@
 #include <common/uri_auth.h>
 #include <common/version.h>
 
-#include <types/acl.h>
 #include <types/capture.h>
 #include <types/global.h>
-#include <types/httperr.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/server.h>
 
 #include <proto/acl.h>
 #include <proto/backend.h>
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index cc7e50c0e..d06b76a7a 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -35,11 +35,7 @@
 #include <common/time.h>
 #include <common/version.h>
 
-#include <types/acl.h>
 #include <types/global.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/server.h>
 
 #include <proto/acl.h>
 #include <proto/backend.h>
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index dece85971..d00b499cb 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -36,12 +36,7 @@
 #include <common/time.h>
 #include <common/version.h>
 
-#include <types/acl.h>
-#include <types/capture.h>
 #include <types/global.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/server.h>
 
 #include <proto/acl.h>
 #include <proto/backend.h>
diff --git a/src/protocols.c b/src/protocols.c
index 70d04de4c..735c38443 100644
--- a/src/protocols.c
+++ b/src/protocols.c
@@ -1,7 +1,7 @@
 /*
  * Protocol registration functions.
  *
- * Copyright 2000-2007 Willy Tarreau <w@1wt.eu>
+ * Copyright 2000-2008 Willy Tarreau <w@1wt.eu>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,8 +18,6 @@
 #include <common/mini-clist.h>
 #include <common/standard.h>
 
-#include <types/protocols.h>
-
 #include <proto/fd.h>
 
 /* List head of all registered protocols */
diff --git a/src/proxy.c b/src/proxy.c
index f9589ecea..17728f5ac 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,7 +26,6 @@
 #include <common/time.h>
 
 #include <types/global.h>
-#include <types/polling.h>
 
 #include <proto/client.h>
 #include <proto/backend.h>
diff --git a/src/queue.c b/src/queue.c
index 178f1877c..3b7fd4ba3 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -14,9 +14,6 @@
 #include <common/memory.h>
 #include <common/time.h>
 
-#include <types/proxy.h>
-#include <types/session.h>
-
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/task.h>
diff --git a/src/senddata.c b/src/senddata.c
index 18bb3e2ac..5d6174ce0 100644
--- a/src/senddata.c
+++ b/src/senddata.c
@@ -32,11 +32,6 @@
 #include <common/time.h>
 #include <common/version.h>
 
-#include <types/global.h>
-#include <types/polling.h>
-#include <types/proxy.h>
-#include <types/server.h>
-
 #include <proto/backend.h>
 #include <proto/buffers.h>
 #include <proto/fd.h>
diff --git a/src/server.c b/src/server.c
index bf29d2537..0016c8028 100644
--- a/src/server.c
+++ b/src/server.c
@@ -14,9 +14,7 @@
 #include <common/config.h>
 #include <common/time.h>
 
-#include <types/backend.h>
-#include <types/proxy.h>
-#include <types/server.h>
+#include <proto/server.h>
 
 int srv_downtime(struct server *s) {
 
diff --git a/src/session.c b/src/session.c
index e3a736d2b..c27ef7579 100644
--- a/src/session.c
+++ b/src/session.c
@@ -16,11 +16,7 @@
 #include <common/debug.h>
 #include <common/memory.h>
 
-#include <types/backend.h>
 #include <types/capture.h>
-#include <types/log.h>
-#include <types/proxy.h>
-#include <types/server.h>
 
 #include <proto/buffers.h>
 #include <proto/hdr_idx.h>
diff --git a/src/stream_sock.c b/src/stream_sock.c
index aa45bdd10..84bc2dbf5 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -26,10 +26,6 @@
 #include <common/ticks.h>
 #include <common/time.h>
 
-#include <types/buffers.h>
-#include <types/global.h>
-#include <types/polling.h>
-
 #include <proto/client.h>
 #include <proto/fd.h>
 #include <proto/stream_sock.h>
diff --git a/src/task.c b/src/task.c
index 5a9a2c2ef..15539c234 100644
--- a/src/task.c
+++ b/src/task.c
@@ -19,7 +19,6 @@
 
 #include <proto/proxy.h>
 #include <proto/task.h>
-#include <types/task.h>
 
 struct pool_head *pool2_task;