diff --git a/include/proto/channel.h b/include/proto/channel.h
index 42bba15b0..da47c166b 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -32,6 +32,7 @@
 #include <common/ticks.h>
 #include <common/time.h>
 
+#include <types/channel.h>
 #include <types/global.h>
 
 extern struct pool_head *pool2_channel;
diff --git a/include/types/acl.h b/include/types/acl.h
index 80b2c39a6..173204d5c 100644
--- a/include/types/acl.h
+++ b/include/types/acl.h
@@ -31,7 +31,6 @@
 #include <types/pattern.h>
 #include <types/proxy.h>
 #include <types/server.h>
-#include <types/session.h>
 
 #include <ebmbtree.h>
 
diff --git a/include/types/proxy.h b/include/types/proxy.h
index 968946070..30409f9f0 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -46,7 +46,6 @@
 #include <types/obj_type.h>
 #include <types/proto_http.h>
 #include <types/sample.h>
-#include <types/session.h>
 #include <types/server.h>
 #include <types/stick_table.h>
 
@@ -186,6 +185,8 @@ enum pr_mode {
 #define STK_IS_STORE	0x00000002	/* store on request fetch */
 #define STK_ON_RSP	0x00000004	/* store on response fetch */
 
+struct session;
+
 struct error_snapshot {
 	struct timeval when;		/* date of this event, (tv_sec == 0) means "never" */
 	unsigned int len;		/* original length of the last invalid request/response */
diff --git a/include/types/queue.h b/include/types/queue.h
index 922aa92fd..9ff8df5f9 100644
--- a/include/types/queue.h
+++ b/include/types/queue.h
@@ -26,7 +26,8 @@
 #include <common/mini-clist.h>
 
 #include <types/server.h>
-#include <types/session.h>
+
+struct session;
 
 struct pendconn {
 	struct list list;		/* chaining ... */
diff --git a/src/appsession.c b/src/appsession.c
index c22be45ce..7b7229616 100644
--- a/src/appsession.c
+++ b/src/appsession.c
@@ -13,6 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <common/appsession.h>
 #include <common/config.h>