From 00d90e8839b32ced10678c1ad53ed417712bddd1 Mon Sep 17 00:00:00 2001
From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Wed, 21 May 2025 11:56:48 +0200
Subject: [PATCH] MINOR: quic: adjust quic_conn-t.h include list

Adjust include list in quic_conn-t.h. This file is included in many QUIC
source, so it is useful to keep as lightweight as possible. Note that
connection/QUIC MUX are transformed into forward declaration for better
layer separation.
---
 include/haproxy/quic_conn-t.h | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/include/haproxy/quic_conn-t.h b/include/haproxy/quic_conn-t.h
index f97ef4289..7aecde5d3 100644
--- a/include/haproxy/quic_conn-t.h
+++ b/include/haproxy/quic_conn-t.h
@@ -28,21 +28,22 @@
 
 #include <sys/socket.h>
 
-#include <haproxy/list.h>
-#include <haproxy/show_flags-t.h>
+#include <import/ebtree-t.h>
 
+#include <haproxy/api-t.h>
+#include <haproxy/buf-t.h>
+#include <haproxy/listener-t.h>
 #include <haproxy/openssl-compat.h>
-#include <haproxy/mux_quic-t.h>
 #include <haproxy/quic_cid-t.h>
 #include <haproxy/quic_cc-t.h>
-#include <haproxy/quic_loss-t.h>
+#include <haproxy/quic_frame-t.h>
 #include <haproxy/quic_openssl_compat-t.h>
 #include <haproxy/quic_stats-t.h>
 #include <haproxy/quic_tls-t.h>
 #include <haproxy/quic_tp-t.h>
-#include <haproxy/task.h>
-
-#include <import/ebtree-t.h>
+#include <haproxy/show_flags-t.h>
+#include <haproxy/ssl_sock-t.h>
+#include <haproxy/task-t.h>
 
 typedef unsigned long long ull;
 
@@ -278,6 +279,10 @@ struct quic_conn_cntrs {
 	long long streams_blocked_uni;       /* total number of times STREAMS_BLOCKED_UNI frame was received */
 };
 
+struct connection;
+struct qcc;
+struct qcc_app_ops;
+
 #define QUIC_CONN_COMMON                               \
     struct {                                           \
         /* Connection owned socket FD. */              \