From 41cd8793837f1b29293bd25d4f96b2c8dcd45237 Mon Sep 17 00:00:00 2001
From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Wed, 13 Jul 2022 14:49:39 +0200
Subject: [PATCH] CLEANUP: quic: clean up include on quic_frame-t.h

quic_frame-t.h and xprt_quic-t.h include themselves mutually. This may
cause some troubles later.

In fact, xprt_quic does not need to include quic_frame so remove this.
And as quic_frame is a generic source file which is included in multiple
places, it is useful to also remove the xprt_quic include in it. Use
forward declaration for this.
---
 include/haproxy/quic_frame-t.h | 11 +++++++----
 include/haproxy/xprt_quic-t.h  |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/haproxy/quic_frame-t.h b/include/haproxy/quic_frame-t.h
index 8aa95411b..f5945368a 100644
--- a/include/haproxy/quic_frame-t.h
+++ b/include/haproxy/quic_frame-t.h
@@ -29,12 +29,15 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
-#include <haproxy/list.h>
-
 #include <import/ebtree-t.h>
+#include <haproxy/buf-t.h>
+#include <haproxy/list.h>
+#include <haproxy/quic_stream-t.h>
 
-#include <haproxy/mux_quic-t.h>
-#include <haproxy/xprt_quic-t.h>
+/* forward declarations from xprt-quic */
+struct quic_arngs;
+struct quic_enc_level;
+struct quic_tx_packet;
 
 /* QUIC frame types. */
 enum quic_frame_type {
diff --git a/include/haproxy/xprt_quic-t.h b/include/haproxy/xprt_quic-t.h
index 87127c25e..c07395f47 100644
--- a/include/haproxy/xprt_quic-t.h
+++ b/include/haproxy/xprt_quic-t.h
@@ -34,7 +34,6 @@
 
 #include <haproxy/mux_quic-t.h>
 #include <haproxy/quic_cc-t.h>
-#include <haproxy/quic_frame-t.h>
 #include <haproxy/quic_loss-t.h>
 #include <haproxy/quic_stats-t.h>
 #include <haproxy/quic_tls-t.h>