diff --git a/include/haproxy/stream-t.h b/include/haproxy/stream-t.h
index e5482a2e8..3a6b9b4b8 100644
--- a/include/haproxy/stream-t.h
+++ b/include/haproxy/stream-t.h
@@ -22,24 +22,13 @@
 #ifndef _HAPROXY_STREAM_T_H
 #define _HAPROXY_STREAM_T_H
 
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/filters-t.h>
-#include <haproxy/hlua-t.h>
-#include <haproxy/http_ana-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/proxy-t.h>
-#include <haproxy/queue-t.h>
-#include <haproxy/server-t.h>
-#include <haproxy/session-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/stream_interface-t.h>
-#include <haproxy/task-t.h>
 #include <haproxy/vars-t.h>
 
 
@@ -97,6 +86,14 @@
 #define PCLI_F_PROMPT          0x4
 #define PCLI_F_PAYLOAD         0x8
 
+struct hlua;
+struct proxy;
+struct pendconn;
+struct session;
+struct server;
+struct task;
+struct sockaddr_storage;
+
 /* some external definitions */
 struct strm_logs {
 	int logwait;                    /* log fields waiting to be collected : LW_* */
diff --git a/include/haproxy/stream.h b/include/haproxy/stream.h
index e89383da0..00f8175e1 100644
--- a/include/haproxy/stream.h
+++ b/include/haproxy/stream.h
@@ -29,6 +29,7 @@
 #include <haproxy/obj_type.h>
 #include <haproxy/pool-t.h>
 #include <haproxy/queue.h>
+#include <haproxy/session.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task-t.h>