diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c
index 485fc0e6c..045863989 100644
--- a/contrib/debug/flags.c
+++ b/contrib/debug/flags.c
@@ -5,7 +5,7 @@
 #include <haproxy/connection-t.h>
 #include <types/http_ana.h>
 #include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/task-t.h>
 
 // 1 bit per flag, no hole permitted here
diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 181d689d8..41207ab47 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -35,7 +35,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 
 /* Prometheus exporter applet states (appctx->st0) */
diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index d77717a93..f59cf0a93 100644
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -32,7 +32,7 @@
 #include <types/proxy.h>
 #include <types/server.h>
 #include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
 
 static inline enum obj_type obj_type(const enum obj_type *t)
 {
diff --git a/include/haproxy/stats.h b/include/haproxy/stats.h
index 7fb57754c..b79e1abb5 100644
--- a/include/haproxy/stats.h
+++ b/include/haproxy/stats.h
@@ -25,9 +25,9 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/tools-t.h>
-#include <types/stream_interface.h>
 
 
 /* These two structs contains all field names and descriptions according to
diff --git a/include/types/stream_interface.h b/include/haproxy/stream_interface-t.h
similarity index 97%
rename from include/types/stream_interface.h
rename to include/haproxy/stream_interface-t.h
index a60de10b6..e95c72d5a 100644
--- a/include/types/stream_interface.h
+++ b/include/haproxy/stream_interface-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/stream_interface.h
+ * include/haproxy/stream_interface-t.h
  * This file describes the stream_interface struct and associated constants.
  *
  * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_STREAM_INTERFACE_H
-#define _TYPES_STREAM_INTERFACE_H
+#ifndef _HAPROXY_STREAM_INTERFACE_T_H
+#define _HAPROXY_STREAM_INTERFACE_T_H
 
 #include <haproxy/api-t.h>
+#include <haproxy/buf-t.h>
+#include <haproxy/connection-t.h>
 #include <haproxy/obj_type-t.h>
 
 /* A stream interface must have its own errors independently of the buffer's,
@@ -142,7 +144,7 @@ struct si_ops {
 	void (*shutw)(struct stream_interface *);   /* shut write function, may not be null */
 };
 
-#endif /* _TYPES_STREAM_INTERFACE_H */
+#endif /* _HAPROXY_STREAM_INTERFACE_T_H */
 
 /*
  * Local variables:
diff --git a/include/proto/stream_interface.h b/include/haproxy/stream_interface.h
similarity index 98%
rename from include/proto/stream_interface.h
rename to include/haproxy/stream_interface.h
index f17e6aec0..7322dd187 100644
--- a/include/proto/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/stream_interface.h
+ * include/haproxy/stream_interface.h
  * This file contains stream_interface function prototypes
  *
  * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,17 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_STREAM_INTERFACE_H
-#define _PROTO_STREAM_INTERFACE_H
-
-#include <stdlib.h>
+#ifndef _HAPROXY_STREAM_INTERFACE_H
+#define _HAPROXY_STREAM_INTERFACE_H
 
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
-#include <types/stream.h>
-#include <types/stream_interface.h>
+#include <haproxy/stream_interface-t.h>
 #include <proto/channel.h>
+#include <types/stream.h>
 
 
 extern struct si_ops si_embedded_ops;
@@ -567,7 +565,7 @@ static inline const char *si_state_str(int state)
 	}
 }
 
-#endif /* _PROTO_STREAM_INTERFACE_H */
+#endif /* _HAPROXY_STREAM_INTERFACE_H */
 
 /*
  * Local variables:
diff --git a/include/proto/channel.h b/include/proto/channel.h
index 96bf2125a..3ff81ad9a 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -32,12 +32,12 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/global.h>
 #include <haproxy/htx.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
 #include <types/channel.h>
 #include <types/stream.h>
-#include <types/stream_interface.h>
 
 #include <proto/stream.h>
 #include <haproxy/task.h>
diff --git a/include/types/stream.h b/include/types/stream.h
index 0c1475f0c..a67d1926e 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -34,6 +34,7 @@
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/session-t.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/vars-t.h>
 
 #include <types/channel.h>
@@ -42,7 +43,6 @@
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
-#include <types/stream_interface.h>
 #include <haproxy/task-t.h>
 #include <haproxy/stick_table-t.h>
 
diff --git a/src/activity.c b/src/activity.c
index 1f2ab487d..29977d2a7 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -13,12 +13,12 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/cli.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/activity-t.h>
 #include <proto/channel.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/stream_interface.h>
 
 
 /* bit field of profiling options. Beware, may be modified at runtime! */
diff --git a/src/applet.c b/src/applet.c
index 760ddc302..36607aa88 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -16,10 +16,10 @@
 #include <haproxy/applet.h>
 #include <haproxy/api.h>
 #include <haproxy/list.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <proto/channel.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 unsigned int nb_applets = 0;
 
diff --git a/src/backend.c b/src/backend.c
index b730df775..f06cf64f2 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -36,6 +36,7 @@
 #include <haproxy/payload.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -55,7 +56,6 @@
 #include <haproxy/sample.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 
diff --git a/src/cache.c b/src/cache.c
index 138ae525d..8a97f4ef3 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -16,6 +16,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/shctx.h>
+#include <haproxy/stream_interface.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
 
@@ -28,7 +29,6 @@
 #include <proto/http_ana.h>
 #include <proto/log.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 #include <common/cfgparse.h>
diff --git a/src/check.c b/src/check.c
index edb4fea4b..7381a324f 100644
--- a/src/check.c
+++ b/src/check.c
@@ -49,6 +49,7 @@
 #include <haproxy/signal.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/vars.h>
 
@@ -64,7 +65,6 @@
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 #include <proto/log.h>
 #include <haproxy/proto_udp.h>
 #include <haproxy/sample.h>
diff --git a/src/cli.c b/src/cli.c
index 2b54dc1aa..d72fb5b87 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -41,6 +41,7 @@
 #include <haproxy/sample-t.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -62,7 +63,6 @@
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 
 #define PAYLOAD_PATTERN "<<"
 
diff --git a/src/connection.c b/src/connection.c
index 6575230b8..3c9b21e7c 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -22,9 +22,9 @@
 
 #include <haproxy/fd.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/stream_interface.h>
 #include <haproxy/sample.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 
 
 DECLARE_POOL(pool_head_connection, "connection",  sizeof(struct connection));
diff --git a/src/debug.c b/src/debug.c
index 51c84cb0d..4f7e6cea7 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -24,6 +24,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/debug.h>
 #include <haproxy/hlua.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
 #include <import/ist.h>
@@ -33,7 +34,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/stream_interface.h>
 
 /* mask of threads still having to dump, used to respect ordering. Only used
  * when USE_THREAD_DUMP is set.
diff --git a/src/dns.c b/src/dns.c
index e54205b81..799c7eb99 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -29,6 +29,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
@@ -45,7 +46,6 @@
 #include <proto/server.h>
 #include <haproxy/proto_udp.h>
 #include <proto/proxy.h>
-#include <proto/stream_interface.h>
 
 struct list dns_resolvers  = LIST_HEAD_INIT(dns_resolvers);
 struct list dns_srvrq_list = LIST_HEAD_INIT(dns_srvrq_list);
diff --git a/src/filters.c b/src/filters.c
index bf9e6ed69..de5d9f276 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -18,6 +18,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/namespace.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <types/filters.h>
@@ -27,7 +28,6 @@
 #include <proto/filters.h>
 #include <proto/http_ana.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 7d36a8e0c..d483ba53a 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -23,6 +23,7 @@
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/session.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
@@ -41,7 +42,6 @@
 #include <proto/proxy.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #if defined(DEBUG_SPOE) || defined(DEBUG_FULL)
 #define SPOE_PRINTF(x...) fprintf(x)
diff --git a/src/frontend.c b/src/frontend.c
index 068e8d69f..5f3d6cf11 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -27,6 +27,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/frontend.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
@@ -41,7 +42,6 @@
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 /* Finish a stream accept() for a proxy (TCP or HTTP). It returns a negative
  * value in case of a critical failure which must cause the listener to be
diff --git a/src/hlua.c b/src/hlua.c
index 1538739b0..804f9fa92 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -44,6 +44,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
@@ -57,7 +58,6 @@
 #include <proto/http_ana.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 /* Lua uses longjmp to perform yield or throwing errors. This
  * macro is used only for identifying the function that can
diff --git a/src/http_act.c b/src/http_act.c
index 37966f399..4c283283d 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -29,6 +29,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/version.h>
@@ -38,7 +39,6 @@
 #include <haproxy/arg.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
-#include <proto/stream_interface.h>
 
 /* Release memory allocated by most of HTTP actions. Concretly, it releases
  * <arg.http>.
diff --git a/src/http_ana.c b/src/http_ana.c
index 690640fb0..4675a2d0d 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -22,6 +22,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/vars.h>
 
@@ -34,7 +35,6 @@
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 
diff --git a/src/log.c b/src/log.c
index bafd8782e..4f095cafd 100644
--- a/src/log.c
+++ b/src/log.c
@@ -30,6 +30,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/http.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>
@@ -43,7 +44,6 @@
 #include <haproxy/sample.h>
 #include <haproxy/sink.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 struct log_fmt {
 	char *name;
diff --git a/src/map.c b/src/map.c
index 8b7cc5113..7beefde74 100644
--- a/src/map.c
+++ b/src/map.c
@@ -19,11 +19,11 @@
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/stream_interface.h>
 #include <haproxy/sample.h>
 
 /* Parse an IPv4 or IPv6 address and store it into the sample.
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 201de593d..c429faa5a 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -24,13 +24,13 @@
 #include <haproxy/regex.h>
 #include <haproxy/session-t.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 
 #include <types/proxy.h>
 
 #include <proto/fcgi-app.h>
 #include <proto/log.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <haproxy/trace.h>
 
 /* FCGI Connection flags (32 bits) */
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 678853062..ada8bb18b 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -27,7 +27,7 @@
 #include <proto/log.h>
 #include <haproxy/session-t.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/trace.h>
 
 /*
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 3497201bc..34caea38d 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -23,9 +23,9 @@
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/session-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/trace.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <import/eb32tree.h>
 
 
diff --git a/src/mworker.c b/src/mworker.c
index 3481c1980..bccffaa58 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -25,6 +25,7 @@
 #include <haproxy/mworker.h>
 #include <haproxy/peers.h>
 #include <haproxy/signal.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/version.h>
 
 #include <haproxy/global.h>
@@ -33,7 +34,6 @@
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 #if defined(USE_SYSTEMD)
diff --git a/src/peers.c b/src/peers.c
index 030a08240..ee5b1caa7 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -32,6 +32,7 @@
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/thread.h>
@@ -42,7 +43,6 @@
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <haproxy/stick_table.h>
-#include <proto/stream_interface.h>
 
 
 /*******************************/
diff --git a/src/pool.c b/src/pool.c
index 1e87b750f..a811c77e0 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -21,13 +21,13 @@
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <haproxy/activity-t.h>
 
 #include <proto/channel.h>
 #include <proto/log.h>
-#include <proto/stream_interface.h>
 
 #ifdef CONFIG_HAP_LOCAL_POOLS
 /* These are the most common pools, expected to be initialized first. These
diff --git a/src/proxy.c b/src/proxy.c
index 94bce71a4..11f340d0a 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -28,6 +28,7 @@
 #include <haproxy/peers.h>
 #include <haproxy/pool.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/time.h>
 
@@ -46,7 +47,6 @@
 #include <proto/server.h>
 #include <haproxy/signal.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 int listeners;	/* # of proxy listeners, set by cfgparse */
diff --git a/src/queue.c b/src/queue.c
index b863d645a..3b5d0ef4c 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -73,6 +73,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/time.h>
@@ -83,7 +84,6 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 
 #define NOW_OFFSET_BOUNDARY()          ((now_ms - (TIMER_LOOK_BACK >> 12)) & 0xfffff)
diff --git a/src/raw_sock.c b/src/raw_sock.c
index 2f5b98d98..3453aac1b 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -26,6 +26,7 @@
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
 #include <haproxy/global.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -34,7 +35,6 @@
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
 #include <haproxy/pipe.h>
-#include <proto/stream_interface.h>
 
 
 #if defined(USE_LINUX_SPLICE)
diff --git a/src/ring.c b/src/ring.c
index cdf91859b..437ee3929 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -25,7 +25,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/thread.h>
 #include <haproxy/ring.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 
 /* Creates and returns a ring buffer of size <size> bytes. Returns NULL on
  * allocation failure.
diff --git a/src/server.c b/src/server.c
index e8ed5a9af..7ac890513 100644
--- a/src/server.c
+++ b/src/server.c
@@ -29,6 +29,7 @@
 #include <haproxy/namespace.h>
 #include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/time.h>
 
@@ -37,7 +38,6 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <netinet/tcp.h>
 
 #include <import/ebsttree.h>
diff --git a/src/sink.c b/src/sink.c
index 8408be7c6..93beccf08 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -28,7 +28,7 @@
 #include <haproxy/ring.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 
 struct list sink_list = LIST_HEAD_INIT(sink_list);
 
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index d0699ef8a..f971bee7c 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -27,12 +27,12 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <import/ebsttree.h>
 
 #include <proto/channel.h>
-#include <proto/stream_interface.h>
 
 /* Uncommitted CKCH transaction */
 
diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 7036fdc35..118a6d1be 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -20,6 +20,7 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
 #include <dirent.h>
@@ -27,7 +28,6 @@
 #include <import/ebsttree.h>
 
 #include <proto/channel.h>
-#include <proto/stream_interface.h>
 
 /* release ssl bind conf */
 void ssl_sock_free_ssl_conf(struct ssl_bind_conf *conf)
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 914c22f16..88c60c773 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -60,6 +60,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -77,7 +78,6 @@
 #include <haproxy/proto_tcp.h>
 #include <proto/http_ana.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
diff --git a/src/stats.c b/src/stats.c
index 17d4ddaa9..a4620563c 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -45,6 +45,7 @@
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -62,7 +63,6 @@
 #include <proto/proxy.h>
 #include <proto/stream.h>
 #include <proto/server.h>
-#include <proto/stream_interface.h>
 
 /* status codes available for the stats admin page (strictly 4 chars length) */
 const char *stat_status_codes[STAT_STATUS_SIZE] = {
diff --git a/src/stick_table.c b/src/stick_table.c
index 736c8098e..6bf6cd9a9 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -24,6 +24,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/peers.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
@@ -39,7 +40,6 @@
 #include <proto/proxy.h>
 #include <haproxy/sample.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 #include <haproxy/stick_table.h>
 
 /* structure used to return a table key built from a sample */
diff --git a/src/stream.c b/src/stream.c
index 5eced5b6a..32964f9b5 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -36,6 +36,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/vars.h>
@@ -57,7 +58,6 @@
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <haproxy/stick_table.h>
-#include <proto/stream_interface.h>
 
 DECLARE_POOL(pool_head_stream, "stream", sizeof(struct stream));
 DECLARE_POOL(pool_head_uniqueid, "uniqueid", UNIQUEID_LEN);
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 5237954e6..cbc8a23cf 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -24,6 +24,7 @@
 #include <haproxy/connection.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -33,7 +34,6 @@
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #include <haproxy/pipe-t.h>
 
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 85073691d..ef78d2017 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -18,6 +18,7 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/sample.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -30,7 +31,6 @@
 #include <proto/proxy.h>
 #include <haproxy/stick_table.h>
 #include <proto/stream.h>
-#include <proto/stream_interface.h>
 
 #define TRACE_SOURCE &trace_strm
 
diff --git a/src/tools.c b/src/tools.c
index 59903b1fd..52522cb3e 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -47,10 +47,10 @@
 #include <haproxy/listener.h>
 #include <haproxy/namespace.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 #include <haproxy/proto_udp.h>
-#include <proto/stream_interface.h>
 
 /* This macro returns false if the test __x is false. Many
  * of the following parsing function must be abort the processing
diff --git a/src/xprt_handshake.c b/src/xprt_handshake.c
index 1290d23ba..752a4f3ae 100644
--- a/src/xprt_handshake.c
+++ b/src/xprt_handshake.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/connection.h>
-#include <proto/stream_interface.h>
+#include <haproxy/stream_interface.h>
 
 struct xprt_handshake_ctx {
 	struct connection *conn;