diff --git a/src/backend.c b/src/backend.c
index 8e8618a..b7c47cc 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -32,6 +32,7 @@
 #include <haproxy/lb_fwrr.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/payload.h>
+#include <haproxy/session.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -52,7 +53,6 @@
 #include <proto/queue.h>
 #include <haproxy/sample.h>
 #include <proto/server.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <proto/ssl_sock.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 0fc9bfe..3de138f 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -54,6 +54,7 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers-t.h>
 #include <haproxy/pool.h>
+#include <haproxy/session.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <common/uri_auth.h>
@@ -77,7 +78,6 @@
 #include <proto/proxy.h>
 #include <haproxy/peers.h>
 #include <haproxy/sample.h>
-#include <proto/session.h>
 #include <proto/server.h>
 #include <proto/stream.h>
 #include <haproxy/stick_table.h>
diff --git a/src/cli.c b/src/cli.c
index 48539fd..a520787 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -37,6 +37,7 @@
 #include <haproxy/pattern-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/sample-t.h>
+#include <haproxy/session.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -61,7 +62,6 @@
 #include <haproxy/pipe.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 #include <proto/server.h>
 #include <proto/stream_interface.h>
diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 68d0efe..0db8e79 100644
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -18,6 +18,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/session.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/global.h>
@@ -28,7 +29,6 @@
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
-#include <proto/session.h>
 
 /* Global list of all FCGI applications */
 static struct fcgi_app *fcgi_apps = NULL;
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index c0371ab..1ffa4a7 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -21,6 +21,7 @@
 #include <haproxy/signal.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
+#include <haproxy/session.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
@@ -38,7 +39,6 @@
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
-#include <proto/session.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index bfbfa05..504add9 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -102,6 +102,7 @@
 #include <haproxy/peers.h>
 #include <haproxy/sample.h>
 #include <haproxy/regex.h>
+#include <haproxy/session.h>
 #include <haproxy/signal.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
@@ -131,7 +132,6 @@
 #include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 #include <proto/ssl_sock.h>
 
diff --git a/src/hlua.c b/src/hlua.c
index b9339d4..bed059c 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -40,6 +40,7 @@
 #include <haproxy/pattern.h>
 #include <haproxy/payload.h>
 #include <haproxy/sample.h>
+#include <haproxy/session.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
@@ -57,7 +58,6 @@
 #include <proto/queue.h>
 #include <proto/http_ana.h>
 #include <proto/server.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 05e67a6..ed97d6b 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -22,13 +22,12 @@
 #include <haproxy/list.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
+#include <haproxy/session-t.h>
 
 #include <types/proxy.h>
-#include <types/session.h>
 
 #include <proto/fcgi-app.h>
 #include <proto/log.h>
-#include <proto/session.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 36478c3..a5c5009 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -22,11 +22,10 @@
 
 #include <haproxy/pipe-t.h>
 #include <types/proxy.h>
-#include <types/session.h>
 
 #include <haproxy/http_htx.h>
 #include <proto/log.h>
-#include <proto/session.h>
+#include <haproxy/session-t.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <proto/trace.h>
diff --git a/src/mux_h2.c b/src/mux_h2.c
index b8c4741..ac40981 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -22,11 +22,10 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/session-t.h>
 #include <proto/trace.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
-#include <types/session.h>
 #include <import/eb32tree.h>
 
 
diff --git a/src/peers.c b/src/peers.c
index 45e438d..f576eaa 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -27,6 +27,7 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/task.h>
+#include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
@@ -41,7 +42,6 @@
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 #include <haproxy/stick_table.h>
 #include <proto/stream_interface.h>
diff --git a/src/session.c b/src/session.c
index 2b52ec8..58e55ee 100644
--- a/src/session.c
+++ b/src/session.c
@@ -16,14 +16,12 @@
 #include <haproxy/http.h>
 #include <haproxy/listener.h>
 #include <haproxy/pool.h>
+#include <haproxy/session.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
 
-#include <types/session.h>
-
 #include <proto/log.h>
 #include <proto/proxy.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 
 DECLARE_POOL(pool_head_session, "session", sizeof(struct session));
diff --git a/src/stats.c b/src/stats.c
index 1f1e5cd..bc9aaee 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -40,6 +40,7 @@
 #include <haproxy/listener.h>
 #include <haproxy/map-t.h>
 #include <haproxy/pattern-t.h>
+#include <haproxy/session.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -61,7 +62,6 @@
 #include <proto/log.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
-#include <proto/session.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream.h>
 #include <proto/server.h>
diff --git a/src/stream.c b/src/stream.c
index 8a3ed6f..5a70cca 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -31,6 +31,7 @@
 #include <haproxy/thread.h>
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
+#include <haproxy/session.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
@@ -51,7 +52,6 @@
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
-#include <proto/session.h>
 #include <proto/stream.h>
 #include <haproxy/pipe.h>
 #include <proto/http_ana.h>