REORG: include: move stream.h to haproxy/stream{,-t}.h
This one was not easy because it was embarking many includes with it,
which other files would automatically find. At least global.h, arg.h
and tools.h were identified. 93 total locations were identified, 8
additional includes had to be added.
In the rare files where it was possible to finalize the sorting of
includes by adjusting only one or two extra lines, it was done. But
all files would need to be rechecked and cleaned up now.
It was the last set of files in types/ and proto/ and these directories
must not be reused anymore.
diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c
index 15136a3..e1dfee9 100644
--- a/contrib/debug/flags.c
+++ b/contrib/debug/flags.c
@@ -4,7 +4,7 @@
#include <haproxy/channel-t.h>
#include <haproxy/connection-t.h>
#include <haproxy/http_ana-t.h>
-#include <types/stream.h>
+#include <haproxy/stream-t.h>
#include <haproxy/stream_interface-t.h>
#include <haproxy/task-t.h>
diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index b5840c3..17fe461 100644
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -16,16 +16,14 @@
#include <stdio.h>
#include <stdarg.h>
+#include <haproxy/arg.h>
#include <haproxy/global.h>
#include <haproxy/hlua.h>
#include <haproxy/log.h>
#include <haproxy/spoe.h>
+#include <haproxy/stream-t.h>
#include <haproxy/time.h>
-#include <types/stream.h>
-
-#include <haproxy/arg.h>
-
#include <api.h>
#include "modsec_wrapper.h"
diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 52cac08..bc968d9 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -34,7 +34,7 @@
#include <haproxy/server.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/stats.h>
-#include <proto/stream.h>
+#include <haproxy/stream.h>
#include <haproxy/stream_interface.h>
#include <haproxy/task.h>