diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index 4dffbf33f..6f54d5afa 100644
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -20,7 +20,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
@@ -32,6 +31,7 @@
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream.h>
diff --git a/include/haproxy/applet.h b/include/haproxy/applet.h
index d695d0408..0b10e5e2c 100644
--- a/include/haproxy/applet.h
+++ b/include/haproxy/applet.h
@@ -28,9 +28,9 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/channel.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/task.h>
 
diff --git a/include/haproxy/cs_utils.h b/include/haproxy/sc_strm.h
similarity index 98%
rename from include/haproxy/cs_utils.h
rename to include/haproxy/sc_strm.h
index 2f7750e18..363371519 100644
--- a/include/haproxy/cs_utils.h
+++ b/include/haproxy/sc_strm.h
@@ -1,6 +1,6 @@
 /*
- * include/haproxy/cs_utils.h
- * This file contains stream connector util functions prototypes
+ * include/haproxy/sc_strm.h
+ * This file contains stream-specific stream-connector functions prototypes
  *
  * Copyright 2022 Christopher Faulet <cfaulet@haproxy.com>
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_CS_UTILS_H
-#define _HAPROXY_CS_UTILS_H
+#ifndef _HAPROXY_SC_STRM_H
+#define _HAPROXY_SC_STRM_H
 
 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
@@ -381,4 +381,4 @@ static inline int sc_is_send_allowed(const struct stconn *sc)
 	return (sc_ep_get(sc) & (SE_FL_WAIT_DATA|SE_FL_WILL_CONSUME)) == SE_FL_WILL_CONSUME;
 }
 
-#endif /* _HAPROXY_CS_UTILS_H */
+#endif /* _HAPROXY_SC_STRM_H */
diff --git a/src/activity.c b/src/activity.c
index 5e73ff4a1..ff58fb42e 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -18,8 +18,8 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/freq_ctr.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/tools.h>
 #include <haproxy/xxhash.h>
 
diff --git a/src/applet.c b/src/applet.c
index 78e04ae1f..ee7abdfbf 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -17,8 +17,8 @@
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/list.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 
diff --git a/src/backend.c b/src/backend.c
index 7b88097db..ea5f33268 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -28,7 +28,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hash.h>
@@ -50,6 +49,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
diff --git a/src/cache.c b/src/cache.c
index 366add80c..754bf63d3 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -20,7 +20,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/hash.h>
@@ -32,6 +31,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/shctx.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
diff --git a/src/cli.c b/src/cli.c
index aeba3f316..8bbe853a7 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -35,7 +35,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/compression.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/errors.h>
@@ -54,6 +53,7 @@
 #include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample-t.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/sock.h>
diff --git a/src/conn_stream.c b/src/conn_stream.c
index 4e1e5c6b5..606b7ff7d 100644
--- a/src/conn_stream.c
+++ b/src/conn_stream.c
@@ -14,11 +14,11 @@
 #include <haproxy/applet.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/check.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/pipe.h>
 #include <haproxy/pool.h>
+#include <haproxy/sc_strm.h>
 
 DECLARE_POOL(pool_head_connstream, "stconn", sizeof(struct stconn));
 DECLARE_POOL(pool_head_sedesc, "sedesc", sizeof(struct sedesc));
diff --git a/src/connection.c b/src/connection.c
index 9ad413c71..cd32dafea 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -18,7 +18,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/hash.h>
@@ -28,6 +27,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/tools.h>
diff --git a/src/debug.c b/src/debug.c
index c6b541de6..73b4a54d3 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -31,7 +31,6 @@
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/clock.h>
 #include <haproxy/debug.h>
 #include <haproxy/fd.h>
@@ -40,6 +39,7 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
 #include <haproxy/time.h>
diff --git a/src/dns.c b/src/dns.c
index bab396b5c..ee9b685a8 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -26,13 +26,13 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dgram.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/log.h>
 #include <haproxy/ring.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index e55070cce..b4c6d270b 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -20,7 +20,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
@@ -30,6 +29,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
diff --git a/src/frontend.c b/src/frontend.c
index b50c86ff3..7b7135798 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -26,7 +26,6 @@
 #include <haproxy/arg.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
@@ -35,6 +34,7 @@
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
diff --git a/src/hlua.c b/src/hlua.c
index 166423aae..f90427007 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -35,7 +35,6 @@
 #include <haproxy/clock.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/filters.h>
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
@@ -53,6 +52,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_ckch.h>
diff --git a/src/http_act.c b/src/http_act.c
index 51ba6cba7..40438c678 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -24,7 +24,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
@@ -35,6 +34,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/uri_normalizer.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index cb7bbbfc0..fb5cf030c 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -22,7 +22,6 @@
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/http.h>
@@ -33,6 +32,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server-t.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream.h>
diff --git a/src/http_client.c b/src/http_client.c
index fe4e1d6de..9b344d5fd 100644
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -19,7 +19,6 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/h1_htx.h>
@@ -32,6 +31,7 @@
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/resolvers.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock-t.h>
 #include <haproxy/sock_inet.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 49ea4262a..c3e8599cf 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -23,7 +23,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
@@ -35,6 +34,7 @@
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
diff --git a/src/log.c b/src/log.c
index 25eff5e78..0024d949d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -28,7 +28,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/clock.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
@@ -38,6 +37,7 @@
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/sink.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream.h>
diff --git a/src/map.c b/src/map.c
index 3c04eb709..8904c5de5 100644
--- a/src/map.c
+++ b/src/map.c
@@ -18,11 +18,11 @@
 #include <haproxy/arg.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/map.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/tools.h>
 
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 5739675a4..d3db7fe26 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -18,7 +18,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fcgi-app.h>
@@ -32,6 +31,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
diff --git a/src/mworker.c b/src/mworker.c
index 95a22655c..d246f2b18 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -26,7 +26,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/global.h>
@@ -35,6 +34,7 @@
 #include <haproxy/mworker.h>
 #include <haproxy/peers.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
diff --git a/src/peers.c b/src/peers.c
index e72ffca67..88d609fed 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -28,7 +28,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -37,6 +36,7 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
diff --git a/src/pool.c b/src/pool.c
index a47168fb6..c82dbcbc2 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -20,11 +20,11 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
diff --git a/src/proxy.c b/src/proxy.c
index df460858d..123f94ed7 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,7 +26,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/filters.h>
@@ -41,6 +40,7 @@
 #include <haproxy/protocol.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
diff --git a/src/resolvers.c b/src/resolvers.c
index 2b3e128f7..76d94bcdb 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -28,7 +28,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -40,6 +39,7 @@
 #include <haproxy/resolvers.h>
 #include <haproxy/ring.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
 #include <haproxy/task.h>
diff --git a/src/ring.c b/src/ring.c
index 873d0d6bf..d39d8b6ec 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -24,8 +24,8 @@
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/ring.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/thread.h>
 
 /* context used to dump the contents of a ring via "show events" or "show errors" */
diff --git a/src/server.c b/src/server.c
index 6057b4fde..a24a9de26 100644
--- a/src/server.c
+++ b/src/server.c
@@ -26,7 +26,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict-t.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -39,6 +38,7 @@
 #include <haproxy/queue.h>
 #include <haproxy/resolvers.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream.h>
diff --git a/src/sink.c b/src/sink.c
index ebd436f95..1e4db7e46 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -24,12 +24,12 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/ring.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
 #include <haproxy/time.h>
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 1accf60f1..e85ddbe36 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -31,8 +31,8 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index e4297906a..6ef9ec229 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -24,8 +24,8 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_sock.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index ee73566ec..2499de63e 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -52,7 +52,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -65,13 +64,14 @@
 #include <haproxy/pattern-t.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/shctx.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
-#include <haproxy/sample.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task.h>
diff --git a/src/stats.c b/src/stats.c
index c1fedaaf2..f9d697aa2 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -35,7 +35,6 @@
 #include <haproxy/clock.h>
 #include <haproxy/compression.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/debug.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -55,6 +54,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/resolvers.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/stats.h>
diff --git a/src/stick_table.c b/src/stick_table.c
index b9ad124b9..f9e84b6de 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -24,7 +24,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -37,6 +36,7 @@
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
diff --git a/src/stream.c b/src/stream.c
index e53a3828c..97db6030d 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -29,7 +29,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dict.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/fd.h>
@@ -47,6 +46,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/resolvers.h>
 #include <haproxy/sample.h>
diff --git a/src/tcp_act.c b/src/tcp_act.c
index fc1b09122..f31c9c3b9 100644
--- a/src/tcp_act.c
+++ b/src/tcp_act.c
@@ -29,12 +29,12 @@
 #include <haproxy/arg.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 8b9aa7656..baa4ba71f 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -18,12 +18,12 @@
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/tcp_rules.h>
diff --git a/src/tcp_sample.c b/src/tcp_sample.c
index a8895b1a4..99bb51402 100644
--- a/src/tcp_sample.c
+++ b/src/tcp_sample.c
@@ -32,13 +32,13 @@
 #include <haproxy/api.h>
 #include <haproxy/arg.h>
 #include <haproxy/connection.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/namespace.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/tools.h>
 
diff --git a/src/tools.c b/src/tools.c
index 05f4f308c..f9c1bd43f 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -54,7 +54,6 @@ extern void *__elf_aux_vector;
 #include <haproxy/applet.h>
 #include <haproxy/chunk.h>
 #include <haproxy/conn_stream.h>
-#include <haproxy/cs_utils.h>
 #include <haproxy/dgram.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
@@ -63,6 +62,7 @@ extern void *__elf_aux_vector;
 #include <haproxy/net_helper.h>
 #include <haproxy/protocol.h>
 #include <haproxy/resolvers.h>
+#include <haproxy/sc_strm.h>
 #include <haproxy/sock.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>