From 1f7f980ac4d62456edac03c53d0378a1ba31bb4f Mon Sep 17 00:00:00 2001
From: Philippe Antoine <pantoine@oisf.net>
Date: Sun, 4 Oct 2026 21:47:15 +0200
Subject: [PATCH] src: do not have queue.h and tree.h in suricata-common.h

Let every user include it directly

Ticket: 945
---
 src/defrag.h          | 1 +
 src/suricata-common.h | 4 ----
 src/tm-queues.h       | 1 +
 src/util-rohash.h     | 2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/defrag.h b/src/defrag.h
index eb07fab1fb..bff3aa7807 100644
--- a/src/defrag.h
+++ b/src/defrag.h
@@ -24,6 +24,7 @@
 #ifndef SURICATA_DEFRAG_H
 #define SURICATA_DEFRAG_H
 
+#include "tree.h"
 #include "threads.h"
 #include "util-pool.h"
 #include "threadvars.h"
diff --git a/src/suricata-common.h b/src/suricata-common.h
index 3bfe6a8f85..cd5db54243 100644
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -534,10 +534,6 @@ typedef struct lua_State lua_State;
 #include "util-atomic.h"
 #include "util-unittest.h"
 
-// pseudo system headers
-#include "queue.h"
-#include "tree.h"
-
 #ifndef HAVE_STRLCAT
 size_t strlcat(char *, const char *src, size_t siz);
 #endif
diff --git a/src/tm-queues.h b/src/tm-queues.h
index ef0490cc92..fac40ffe17 100644
--- a/src/tm-queues.h
+++ b/src/tm-queues.h
@@ -24,6 +24,7 @@
 #ifndef SURICATA_TM_QUEUES_H
 #define SURICATA_TM_QUEUES_H
 
+#include "queue.h"
 #include "packet-queue.h"
 
 typedef struct Tmq_ {
diff --git a/src/util-rohash.h b/src/util-rohash.h
index ee530f6cab..91c1b5c95c 100644
--- a/src/util-rohash.h
+++ b/src/util-rohash.h
@@ -24,6 +24,8 @@
 #ifndef SURICATA_UTIL_ROHASH_H
 #define SURICATA_UTIL_ROHASH_H
 
+#include "queue.h"
+
 typedef struct ROHashTable_ {
     uint8_t locked;
     uint8_t hash_bits;