From: Philippe Antoine <pantoine@oisf.net>
Date: Tue, 1 Nov 2022 20:39:50 +0000 (+0100)
Subject: unittest: fix unneeded includes as per cppclean
X-Git-Tag: suricata-7.0.0-rc1~364
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f066cbbe84de8cc08637e2a4a0975a676030b60;p=thirdparty%2Fsuricata.git

unittest: fix unneeded includes as per cppclean

Especially because there is conditional inclusion from a header
---

diff --git a/src/app-layer-modbus.c b/src/app-layer-modbus.c
index 2534d72bf6..c1edbf2d36 100644
--- a/src/app-layer-modbus.c
+++ b/src/app-layer-modbus.c
@@ -62,6 +62,7 @@ void RegisterModbusParsers(void)
 #include "detect-engine.h"
 #include "detect-parse.h"
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 
 #include "flow-util.h"
 
diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c
index b4230d2cb7..45836c5efd 100644
--- a/src/app-layer-smtp.c
+++ b/src/app-layer-smtp.c
@@ -1781,6 +1781,7 @@ void SMTPParserCleanup(void)
 /***************************************Unittests******************************/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 static void SMTPTestInitConfig(void)
 {
diff --git a/src/decode-icmpv6.c b/src/decode-icmpv6.c
index 36666c9867..8f2adc1b0b 100644
--- a/src/decode-icmpv6.c
+++ b/src/decode-icmpv6.c
@@ -520,6 +520,7 @@ int DecodeICMPV6(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
 }
 
 #ifdef UNITTESTS
+#include "packet.h"
 #include "util-unittest-helper.h"
 
 static int ICMPV6CalculateValidChecksumtest01(void)
diff --git a/src/decode-ipv6.c b/src/decode-ipv6.c
index 65fedc22d3..72d81c86de 100644
--- a/src/decode-ipv6.c
+++ b/src/decode-ipv6.c
@@ -650,6 +650,7 @@ int DecodeIPV6(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "packet.h"
 
 /**
  * \test fragment decoding
diff --git a/src/decode-raw.c b/src/decode-raw.c
index bb34b43236..1a64f1adf9 100644
--- a/src/decode-raw.c
+++ b/src/decode-raw.c
@@ -75,6 +75,7 @@ int DecodeRaw(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "packet.h"
 
 /** DecodeRawtest01
  *  \brief Valid Raw packet
diff --git a/src/decode-tcp.c b/src/decode-tcp.c
index 1df718d2ed..a94c93d3c2 100644
--- a/src/decode-tcp.c
+++ b/src/decode-tcp.c
@@ -271,6 +271,7 @@ int DecodeTCP(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "packet.h"
 
 static int TCPCalculateValidChecksumtest01(void)
 {
diff --git a/src/decode-vlan.c b/src/decode-vlan.c
index 820b316d98..61059201eb 100644
--- a/src/decode-vlan.c
+++ b/src/decode-vlan.c
@@ -135,6 +135,7 @@ int DecodeIEEE8021ah(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "packet.h"
 
 /** \todo Must GRE+VLAN and Multi-Vlan packets to
  * create more tests
diff --git a/src/decode-vntag.c b/src/decode-vntag.c
index 0b0eb28f43..581f2570a3 100644
--- a/src/decode-vntag.c
+++ b/src/decode-vntag.c
@@ -84,6 +84,7 @@ int DecodeVNTag(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "packet.h"
 
 /**
  * \test DecodeVNTagTest01 test if vntag header is too small.
diff --git a/src/defrag.c b/src/defrag.c
index d42db1dfc4..e541ee4025 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -1088,6 +1088,8 @@ void DefragDestroy(void)
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "packet.h"
+
 #define IP_MF 0x2000
 
 /**
diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c
index f189cbfd3c..49b4cca672 100644
--- a/src/detect-app-layer-event.c
+++ b/src/detect-app-layer-event.c
@@ -431,6 +431,7 @@ int DetectAppLayerEventPrepare(DetectEngineCtx *de_ctx, Signature *s)
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
 #include "stream-tcp.h"
+#include "detect-engine-alert.h"
 
 #define APP_LAYER_EVENT_TEST_MAP_EVENT1 0
 #define APP_LAYER_EVENT_TEST_MAP_EVENT2 1
diff --git a/src/detect-bytemath.c b/src/detect-bytemath.c
index 2307121925..6baeda3ebc 100644
--- a/src/detect-bytemath.c
+++ b/src/detect-bytemath.c
@@ -422,6 +422,7 @@ SigMatch *DetectByteMathRetrieveSMVar(const char *arg, const Signature *s)
 
 /*************************************Unittests********************************/
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 #include "app-layer-parser.h"
 
diff --git a/src/detect-content.c b/src/detect-content.c
index de6a31399b..4ac802ec78 100644
--- a/src/detect-content.c
+++ b/src/detect-content.c
@@ -740,6 +740,8 @@ void DetectContentPatternPrettyPrint(const DetectContentData *cd, char *str, siz
 }
 
 #ifdef UNITTESTS /* UNITTESTS */
+#include "detect-engine-alert.h"
+#include "packet.h"
 
 static bool TestLastContent(const Signature *s, uint16_t o, uint16_t d)
 {
diff --git a/src/detect-csum.c b/src/detect-csum.c
index d0071cd2b5..825c00d6b4 100644
--- a/src/detect-csum.c
+++ b/src/detect-csum.c
@@ -899,6 +899,9 @@ static void DetectICMPV6CsumFree(DetectEngineCtx *de_ctx, void *ptr)
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "detect-engine.h"
+#include "detect-engine-alert.h"
+#include "packet.h"
 
 #define mystr(s) #s
 #define TEST1(kwstr) {\
diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c
index 411009d320..6a4f540885 100644
--- a/src/detect-dce-stub-data.c
+++ b/src/detect-dce-stub-data.c
@@ -181,6 +181,7 @@ static int DetectDceStubDataSetup(DetectEngineCtx *de_ctx, Signature *s, const c
 /************************************Unittests*********************************/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 static int DetectDceStubDataTestParse01(void)
 {
diff --git a/src/detect-detection-filter.c b/src/detect-detection-filter.c
index a8b89540d2..3fdb3c79c6 100644
--- a/src/detect-detection-filter.c
+++ b/src/detect-detection-filter.c
@@ -273,8 +273,11 @@ static void DetectDetectionFilterFree(DetectEngineCtx *de_ctx, void *df_ptr)
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-threshold.h"
+#include "detect-engine-alert.h"
 #include "util-time.h"
 #include "util-hashlist.h"
+#include "action-globals.h"
+#include "packet.h"
 
 /**
  * \test DetectDetectionFilterTestParse01 is a test for a valid detection_filter options
diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index 77f1c00f95..b2e37493cd 100644
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -262,6 +262,7 @@ static int DetectDnsQuerySetup(DetectEngineCtx *de_ctx, Signature *s, const char
 
 #ifdef UNITTESTS
 #include "detect-isdataat.h"
+#include "detect-engine-alert.h"
 
 /** \test simple google.com query matching */
 static int DetectDnsQueryTest01(void)
diff --git a/src/detect-dsize.c b/src/detect-dsize.c
index c0603c67ee..d2eb12fcb7 100644
--- a/src/detect-dsize.c
+++ b/src/detect-dsize.c
@@ -375,6 +375,9 @@ void SigParseApplyDsizeToContent(Signature *s)
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "detect-engine.h"
+#include "detect-engine-alert.h"
+#include "packet.h"
 
 /**
  * \test this is a test for a valid dsize value 1
diff --git a/src/detect-engine-dcepayload.c b/src/detect-engine-dcepayload.c
index 1e865ced25..9bfaecabb2 100644
--- a/src/detect-engine-dcepayload.c
+++ b/src/detect-engine-dcepayload.c
@@ -57,6 +57,7 @@ static int g_dce_stub_data_buffer_id = 0;
 /**************************************Unittests*******************************/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 /**
  * \test Test the working of byte_test endianness.
diff --git a/src/detect-engine-payload.c b/src/detect-engine-payload.c
index 2d136a8bfe..6adbc7a775 100644
--- a/src/detect-engine-payload.c
+++ b/src/detect-engine-payload.c
@@ -373,6 +373,7 @@ uint8_t DetectEngineInspectStream(DetectEngineCtx *de_ctx, DetectEngineThreadCtx
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 /** \test Not the first but the second occurence of "abc" should be used
   *       for the 2nd match */
diff --git a/src/detect-engine-port.c b/src/detect-engine-port.c
index 47372d3283..4044b8403a 100644
--- a/src/detect-engine-port.c
+++ b/src/detect-engine-port.c
@@ -1498,6 +1498,8 @@ void DetectPortHashFree(DetectEngineCtx *de_ctx)
 /*---------------------- Unittests -------------------------*/
 
 #ifdef UNITTESTS
+#include "packet.h"
+
 /**
  * \brief Do a sorted insert, where the top of the list should be the biggest
  * port range.
diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c
index df8beea286..b600180faf 100644
--- a/src/detect-engine-state.c
+++ b/src/detect-engine-state.c
@@ -295,6 +295,7 @@ void DetectEngineStateResetTxs(Flow *f)
 /*********Unittests*********/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 static int DeStateTest01(void)
 {
diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c
index 373682bf00..a53df30a60 100644
--- a/src/detect-fast-pattern.c
+++ b/src/detect-fast-pattern.c
@@ -365,6 +365,7 @@ static int DetectFastPatternSetup(DetectEngineCtx *de_ctx, Signature *s, const c
 /*----------------------------------Unittests---------------------------------*/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 static int DetectFastPatternStickySingle(const char *sticky, const int list)
 {
     DetectEngineCtx *de_ctx = DetectEngineCtxInit();
diff --git a/src/detect-flow.c b/src/detect-flow.c
index ada5c7c0d5..6f9e414276 100644
--- a/src/detect-flow.c
+++ b/src/detect-flow.c
@@ -483,6 +483,7 @@ static bool PrefilterFlowIsPrefilterable(const Signature *s)
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectFlowTestParse01 is a test to make sure that we return "something"
diff --git a/src/detect-flowint.c b/src/detect-flowint.c
index 631fafc106..3819747cd1 100644
--- a/src/detect-flowint.c
+++ b/src/detect-flowint.c
@@ -428,6 +428,7 @@ void DetectFlowintFree(DetectEngineCtx *de_ctx, void *tmp)
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 /**
  * \brief This is a helper funtion used for debugging purposes
  */
diff --git a/src/detect-fragbits.c b/src/detect-fragbits.c
index 623df8ceba..0dbca7a672 100644
--- a/src/detect-fragbits.c
+++ b/src/detect-fragbits.c
@@ -386,6 +386,7 @@ static bool PrefilterFragBitsIsPrefilterable(const Signature *s)
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "packet.h"
 
 /**
  * \test FragBitsTestParse01 is a test for a  valid fragbits value
diff --git a/src/detect-fragoffset.c b/src/detect-fragoffset.c
index 794de4099c..eae7124289 100644
--- a/src/detect-fragoffset.c
+++ b/src/detect-fragoffset.c
@@ -328,6 +328,8 @@ static bool PrefilterFragOffsetIsPrefilterable(const Signature *s)
 
 #ifdef UNITTESTS
 #include "util-unittest-helper.h"
+#include "detect-engine.h"
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectFragOffsetParseTest01 is a test for setting a valid fragoffset value
diff --git a/src/detect-ftpbounce.c b/src/detect-ftpbounce.c
index ed8cd68d66..38f978003c 100644
--- a/src/detect-ftpbounce.c
+++ b/src/detect-ftpbounce.c
@@ -241,6 +241,7 @@ int DetectFtpbounceSetup(DetectEngineCtx *de_ctx, Signature *s, const char *ftpb
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectFtpbounceTestSetup01 is a test for the Setup ftpbounce
diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c
index ec4caacfd5..9bb08d5cdf 100644
--- a/src/detect-http-client-body.c
+++ b/src/detect-http-client-body.c
@@ -389,6 +389,7 @@ static int PrefilterMpmHttpRequestBodyRegister(DetectEngineCtx *de_ctx, SigGroup
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 #include "tests/detect-http-client-body.c"
 #endif /* UNITTESTS */
 
diff --git a/src/detect-icmp-id.c b/src/detect-icmp-id.c
index 73cde21ad1..613cbccc7f 100644
--- a/src/detect-icmp-id.c
+++ b/src/detect-icmp-id.c
@@ -30,6 +30,7 @@
 #include "detect-parse.h"
 #include "detect-engine-prefilter-common.h"
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 
 #include "detect-icmp-id.h"
 
diff --git a/src/detect-icmp-seq.c b/src/detect-icmp-seq.c
index 8e120ee0fa..87bfda3ebf 100644
--- a/src/detect-icmp-seq.c
+++ b/src/detect-icmp-seq.c
@@ -327,6 +327,9 @@ static bool PrefilterIcmpSeqIsPrefilterable(const Signature *s)
 }
 
 #ifdef UNITTESTS
+#include "detect-engine.h"
+#include "detect-engine-mpm.h"
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectIcmpSeqParseTest01 is a test for setting a valid icmp_seq value
diff --git a/src/detect-icode.c b/src/detect-icode.c
index 8cc68b52e8..3a601c286d 100644
--- a/src/detect-icode.c
+++ b/src/detect-icode.c
@@ -198,6 +198,7 @@ static bool PrefilterICodeIsPrefilterable(const Signature *s)
 #ifdef UNITTESTS
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectICodeParseTest01 is a test for setting a valid icode value
diff --git a/src/detect-ipproto.c b/src/detect-ipproto.c
index d96352b594..656f07daee 100644
--- a/src/detect-ipproto.c
+++ b/src/detect-ipproto.c
@@ -455,6 +455,7 @@ static void DetectIPProtoFree(DetectEngineCtx *de_ctx, void *ptr)
 
 /* UNITTESTS */
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectIPProtoTestParse01 is a test for an invalid proto number
diff --git a/src/detect-iprep.c b/src/detect-iprep.c
index 59c3d1aec3..f78c1a3e28 100644
--- a/src/detect-iprep.c
+++ b/src/detect-iprep.c
@@ -255,6 +255,9 @@ void DetectIPRepFree (DetectEngineCtx *de_ctx, void *ptr)
 }
 
 #ifdef UNITTESTS
+#include "packet.h"
+#include "action-globals.h"
+
 static FILE *DetectIPRepGenerateCategoriesDummy(void)
 {
     FILE *fd = NULL;
diff --git a/src/detect-l3proto.c b/src/detect-l3proto.c
index de869f5a28..837a557449 100644
--- a/src/detect-l3proto.c
+++ b/src/detect-l3proto.c
@@ -108,6 +108,7 @@ error:
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectL3protoTestSig01 is a test for checking the working of ttl keyword
diff --git a/src/detect-lua.c b/src/detect-lua.c
index b2a6dc5124..f3b29a53db 100644
--- a/src/detect-lua.c
+++ b/src/detect-lua.c
@@ -1163,6 +1163,8 @@ static void DetectLuaFree(DetectEngineCtx *de_ctx, void *ptr)
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
+
 /** \test http buffer */
 static int LuaMatchTest01(void)
 {
diff --git a/src/detect-parse.c b/src/detect-parse.c
index 061265cffe..b0c3e5a574 100644
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -2619,6 +2619,9 @@ void DetectSetupParseRegexes(const char *parse_str, DetectParseRegex *detect_par
  */
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
+#include "packet.h"
+
 static int SigParseTest01 (void)
 {
     int result = 1;
diff --git a/src/detect-pcre.c b/src/detect-pcre.c
index 5bc4be0ce4..f55ac998a6 100644
--- a/src/detect-pcre.c
+++ b/src/detect-pcre.c
@@ -962,6 +962,7 @@ static void DetectPcreFree(DetectEngineCtx *de_ctx, void *ptr)
 }
 
 #ifdef UNITTESTS /* UNITTESTS */
+#include "detect-engine-alert.h"
 static int g_file_data_buffer_id = 0;
 static int g_http_header_buffer_id = 0;
 static int g_dce_stub_data_buffer_id = 0;
diff --git a/src/detect-quic-cyu-hash.c b/src/detect-quic-cyu-hash.c
index 40cff70ecd..33f8aa5409 100644
--- a/src/detect-quic-cyu-hash.c
+++ b/src/detect-quic-cyu-hash.c
@@ -249,6 +249,7 @@ void DetectQuicCyuHashRegister(void)
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "flow-util.h"
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectQuicCyuHashTest01 is a test for a valid quic packet, matching
diff --git a/src/detect-quic-cyu-string.c b/src/detect-quic-cyu-string.c
index 914a6432a5..9ece51fe9a 100644
--- a/src/detect-quic-cyu-string.c
+++ b/src/detect-quic-cyu-string.c
@@ -205,6 +205,7 @@ void DetectQuicCyuStringRegister(void)
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "flow-util.h"
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectQuicCyuStringTest01 is a test for a valid quic packet, matching
diff --git a/src/detect-replace.c b/src/detect-replace.c
index b17b0f4b23..cb0cf169f8 100644
--- a/src/detect-replace.c
+++ b/src/detect-replace.c
@@ -236,6 +236,8 @@ void DetectReplaceFreeInternal(DetectReplaceList *replist)
 }
 
 #ifdef UNITTESTS /* UNITTESTS */
+#include "detect-engine-alert.h"
+#include "packet.h"
 
 /**
  * \test Test packet Matches
diff --git a/src/detect-rpc.c b/src/detect-rpc.c
index 0509dfa9cf..5394511027 100644
--- a/src/detect-rpc.c
+++ b/src/detect-rpc.c
@@ -306,6 +306,7 @@ void DetectRpcFree(DetectEngineCtx *de_ctx, void *ptr)
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 /**
  * \test DetectRpcTestParse01 is a test to make sure that we return "something"
  *  when given valid rpc opt
diff --git a/src/detect-sameip.c b/src/detect-sameip.c
index aed8c74b4c..4bf03b0cd8 100644
--- a/src/detect-sameip.c
+++ b/src/detect-sameip.c
@@ -115,6 +115,7 @@ error:
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 /* NOTE: No parameters, so no parse tests */
 
diff --git a/src/detect-ssh-proto-version.c b/src/detect-ssh-proto-version.c
index 76024dd68d..1f15f32fa8 100644
--- a/src/detect-ssh-proto-version.c
+++ b/src/detect-ssh-proto-version.c
@@ -272,6 +272,7 @@ void DetectSshVersionFree(DetectEngineCtx *de_ctx, void *ptr)
 }
 
 #ifdef UNITTESTS /* UNITTESTS */
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectSshVersionTestParse01 is a test to make sure that we parse
diff --git a/src/detect-ssh-software-version.c b/src/detect-ssh-software-version.c
index 7cbca4f810..849c01e0eb 100644
--- a/src/detect-ssh-software-version.c
+++ b/src/detect-ssh-software-version.c
@@ -261,6 +261,7 @@ static void DetectSshSoftwareVersionFree(DetectEngineCtx *de_ctx, void *ptr)
 }
 
 #ifdef UNITTESTS /* UNITTESTS */
+#include "detect-engine-alert.h"
 
 /**
  * \test DetectSshSoftwareVersionTestParse01 is a test to make sure that we parse
diff --git a/src/detect-tcp-ack.c b/src/detect-tcp-ack.c
index 9c9f288f4f..d34911120b 100644
--- a/src/detect-tcp-ack.c
+++ b/src/detect-tcp-ack.c
@@ -208,6 +208,7 @@ static bool PrefilterTcpAckIsPrefilterable(const Signature *s)
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 /**
  * \internal
  * \brief This test tests sameip success and failure.
diff --git a/src/detect-template-buffer.c b/src/detect-template-buffer.c
index 419d478388..777bb28aa5 100644
--- a/src/detect-template-buffer.c
+++ b/src/detect-template-buffer.c
@@ -147,5 +147,6 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 #include "tests/detect-template-buffer.c"
 #endif
diff --git a/src/detect-template-rust-buffer.c b/src/detect-template-rust-buffer.c
index 24f81f6245..62823a94e8 100644
--- a/src/detect-template-rust-buffer.c
+++ b/src/detect-template-rust-buffer.c
@@ -126,6 +126,7 @@ static uint8_t DetectEngineInspectTemplateRustBuffer(DetectEngineCtx *de_ctx,
 #include "detect-parse.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
+#include "detect-engine-alert.h"
 
 static int DetectTemplateRustBufferTest(void)
 {
diff --git a/src/detect-threshold.c b/src/detect-threshold.c
index 1395a33898..7d732e3037 100644
--- a/src/detect-threshold.c
+++ b/src/detect-threshold.c
@@ -340,9 +340,11 @@ error:
 #ifdef UNITTESTS
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-alert.h"
 #include "util-time.h"
 #include "util-hashlist.h"
-
+#include "packet.h"
+#include "action-globals.h"
 /**
  * \test ThresholdTestParse01 is a test for a valid threshold options
  *
diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c
index ffdef752df..d881d9c457 100644
--- a/src/detect-tls-cert-fingerprint.c
+++ b/src/detect-tls-cert-fingerprint.c
@@ -226,5 +226,6 @@ static void DetectTlsFingerprintSetupCallback(const DetectEngineCtx *de_ctx,
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 #include "tests/detect-tls-cert-fingerprint.c"
 #endif
diff --git a/src/detect-urilen.c b/src/detect-urilen.c
index ad4ca72f6b..6363c6adbb 100644
--- a/src/detect-urilen.c
+++ b/src/detect-urilen.c
@@ -238,6 +238,7 @@ bool DetectUrilenValidateContent(const Signature *s, int list, const char **sige
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "app-layer-parser.h"
+#include "detect-engine-alert.h"
 
 /** \test   Test the Urilen keyword setup */
 static int DetectUrilenParseTest01(void)
diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index 5d4655bfec..985f2aefd3 100644
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -28,6 +28,7 @@
 #ifdef UNITTESTS
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-alert.h"
 #include "detect-engine-address.h"
 #include "detect-engine-proto.h"
 #include "detect-engine-port.h"
diff --git a/src/stream-tcp-cache.c b/src/stream-tcp-cache.c
index b74d033758..60b0aa2afe 100644
--- a/src/stream-tcp-cache.c
+++ b/src/stream-tcp-cache.c
@@ -22,6 +22,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-cache.h"
 
diff --git a/src/tests/detect-http-cookie.c b/src/tests/detect-http-cookie.c
index a85c331372..5c1d711f10 100644
--- a/src/tests/detect-http-cookie.c
+++ b/src/tests/detect-http-cookie.c
@@ -43,6 +43,7 @@
 #include "../app-layer-protos.h"
 #include "../detect-isdataat.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 /***********************************Unittests**********************************/
 
diff --git a/src/tests/detect-http-header.c b/src/tests/detect-http-header.c
index 687eb2b1d8..0d4116562e 100644
--- a/src/tests/detect-http-header.c
+++ b/src/tests/detect-http-header.c
@@ -42,6 +42,7 @@
 #include "../detect-http-header.h"
 #include "../detect-http-header-common.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 #include "../detect-isdataat.h"
 
diff --git a/src/tests/detect-http-host.c b/src/tests/detect-http-host.c
index f4365a92f3..b9585b8ddb 100644
--- a/src/tests/detect-http-host.c
+++ b/src/tests/detect-http-host.c
@@ -43,6 +43,7 @@
 #include "app-layer-htp.h"
 #include "app-layer-protos.h"
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 
 /**
  * \test Test that the http_host content matches against a http request
diff --git a/src/tests/detect-http-method.c b/src/tests/detect-http-method.c
index 530a60e575..d834a8f18c 100644
--- a/src/tests/detect-http-method.c
+++ b/src/tests/detect-http-method.c
@@ -43,6 +43,7 @@
 #include "../app-layer-protos.h"
 #include "../detect-isdataat.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 /**
  * \test Test that the http_method content matches against a http request
diff --git a/src/tests/detect-http-raw-header.c b/src/tests/detect-http-raw-header.c
index cab73ed8a4..973a49b056 100644
--- a/src/tests/detect-http-raw-header.c
+++ b/src/tests/detect-http-raw-header.c
@@ -40,6 +40,7 @@
 #include "../detect-isdataat.h"
 #include "../detect-pcre.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 #include "../stream-tcp.h"
 #include "../app-layer.h"
diff --git a/src/tests/detect-http-server-body.c b/src/tests/detect-http-server-body.c
index 42f3b5e055..50e8692a98 100644
--- a/src/tests/detect-http-server-body.c
+++ b/src/tests/detect-http-server-body.c
@@ -29,6 +29,7 @@
 #include "../flow.h"
 #include "../detect.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 /**
  * \test Test parser accepting valid rules and rejecting invalid rules
diff --git a/src/tests/detect-http-stat-code.c b/src/tests/detect-http-stat-code.c
index 9f16d9963d..2f504fe29c 100644
--- a/src/tests/detect-http-stat-code.c
+++ b/src/tests/detect-http-stat-code.c
@@ -39,6 +39,7 @@
 #include "../app-layer-htp.h"
 #include "../app-layer-protos.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 static int DetectEngineHttpStatCodeTest01(void)
 {
diff --git a/src/tests/detect-http-stat-msg.c b/src/tests/detect-http-stat-msg.c
index e4317181e9..eae72f25cf 100644
--- a/src/tests/detect-http-stat-msg.c
+++ b/src/tests/detect-http-stat-msg.c
@@ -39,6 +39,7 @@
 #include "../app-layer-htp.h"
 #include "../app-layer-protos.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 static int DetectEngineHttpStatMsgTest01(void)
  {
diff --git a/src/tests/detect-http-uri.c b/src/tests/detect-http-uri.c
index 9bd5b63d57..1664142986 100644
--- a/src/tests/detect-http-uri.c
+++ b/src/tests/detect-http-uri.c
@@ -33,6 +33,7 @@
 
 #include "../detect-isdataat.h"
 #include "../detect-engine-build.h"
+#include "../detect-engine-alert.h"
 
 /** \test Test a simple uricontent option */
 static int UriTestSig01(void)
diff --git a/src/tests/detect-http-user-agent.c b/src/tests/detect-http-user-agent.c
index f0c6fcc5df..7b0c59f01c 100644
--- a/src/tests/detect-http-user-agent.c
+++ b/src/tests/detect-http-user-agent.c
@@ -42,6 +42,7 @@
 #include "app-layer-htp.h"
 #include "app-layer-protos.h"
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 
 static int DetectEngineHttpUATest(
         const uint8_t *buf, const uint32_t buf_len, const char *sig, const bool expect)
diff --git a/src/tests/detect-snmp-community.c b/src/tests/detect-snmp-community.c
index 9b978168dd..1eda88385c 100644
--- a/src/tests/detect-snmp-community.c
+++ b/src/tests/detect-snmp-community.c
@@ -23,6 +23,7 @@
 #include "flow-util.h"
 #include "stream-tcp.h"
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 
 static int DetectSNMPCommunityTest(void)
 {
diff --git a/src/tests/detect-tls-cert-issuer.c b/src/tests/detect-tls-cert-issuer.c
index f46520d1a9..f11d9ec9cb 100644
--- a/src/tests/detect-tls-cert-issuer.c
+++ b/src/tests/detect-tls-cert-issuer.c
@@ -24,6 +24,7 @@
 
 #include "detect-engine-build.h"
 #include "app-layer-parser.h"
+#include "detect-engine-alert.h"
 
 /**
  * \test Test that a signature containing a tls_cert_issuer is correctly parsed
diff --git a/src/tests/detect-tls-cert-serial.c b/src/tests/detect-tls-cert-serial.c
index fbcb9ceb6c..e12e202f05 100644
--- a/src/tests/detect-tls-cert-serial.c
+++ b/src/tests/detect-tls-cert-serial.c
@@ -23,6 +23,7 @@
  */
 
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 #include "app-layer-parser.h"
 
 /**
diff --git a/src/tests/detect-tls-cert-subject.c b/src/tests/detect-tls-cert-subject.c
index 5f7c1f812d..6ee69e7571 100644
--- a/src/tests/detect-tls-cert-subject.c
+++ b/src/tests/detect-tls-cert-subject.c
@@ -23,6 +23,7 @@
  */
 
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 #include "app-layer-parser.h"
 
 /**
diff --git a/src/tests/detect-tls-cert-validity.c b/src/tests/detect-tls-cert-validity.c
index fa05412553..5f117b49fa 100644
--- a/src/tests/detect-tls-cert-validity.c
+++ b/src/tests/detect-tls-cert-validity.c
@@ -23,6 +23,7 @@
  */
 
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 #include "app-layer-parser.h"
 
 /**
diff --git a/src/tests/detect-tls-certs.c b/src/tests/detect-tls-certs.c
index dac9c9eadf..69933b46e8 100644
--- a/src/tests/detect-tls-certs.c
+++ b/src/tests/detect-tls-certs.c
@@ -23,6 +23,7 @@
  */
 
 #include "detect-engine-build.h"
+#include "detect-engine-alert.h"
 #include "app-layer-parser.h"
 
 /**
diff --git a/src/tests/detect-ttl.c b/src/tests/detect-ttl.c
index fc9e5a5530..74949313c4 100644
--- a/src/tests/detect-ttl.c
+++ b/src/tests/detect-ttl.c
@@ -18,6 +18,9 @@
 
 #include "../util-unittest.h"
 #include "../util-unittest-helper.h"
+#include "detect-engine.h"
+#include "detect-engine-alert.h"
+#include "detect-engine-build.h"
 
 /**
  * \test DetectTtlParseTest01 is a test for setting up an valid ttl value.
diff --git a/src/tests/fuzz/fuzz_predefpcap_aware.c b/src/tests/fuzz/fuzz_predefpcap_aware.c
index 58ce96cc5c..49b2a5d9ce 100644
--- a/src/tests/fuzz/fuzz_predefpcap_aware.c
+++ b/src/tests/fuzz/fuzz_predefpcap_aware.c
@@ -27,6 +27,7 @@
 #include "tm-modules.h"
 #include "tmqh-packetpool.h"
 #include "util-conf.h"
+#include "packet.h"
 
 #include <fuzz_pcap.h>
 
diff --git a/src/tests/fuzz/fuzz_sigpcap.c b/src/tests/fuzz/fuzz_sigpcap.c
index 2509849aad..453487b8a6 100644
--- a/src/tests/fuzz/fuzz_sigpcap.c
+++ b/src/tests/fuzz/fuzz_sigpcap.c
@@ -29,6 +29,7 @@
 #include "tmqh-packetpool.h"
 #include "util-file.h"
 #include "util-conf.h"
+#include "packet.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
diff --git a/src/tests/fuzz/fuzz_sigpcap_aware.c b/src/tests/fuzz/fuzz_sigpcap_aware.c
index 2f58060f18..4518725b87 100644
--- a/src/tests/fuzz/fuzz_sigpcap_aware.c
+++ b/src/tests/fuzz/fuzz_sigpcap_aware.c
@@ -28,6 +28,7 @@
 #include "tm-modules.h"
 #include "tmqh-packetpool.h"
 #include "util-conf.h"
+#include "packet.h"
 
 #include <fuzz_pcap.h>
 
diff --git a/src/util-mpm-ac-bs.c b/src/util-mpm-ac-bs.c
index 8a51c59811..2011a76896 100644
--- a/src/util-mpm-ac-bs.c
+++ b/src/util-mpm-ac-bs.c
@@ -1405,6 +1405,7 @@ void SCACBSPrintInfo(MpmCtx *mpm_ctx)
 /*************************************Unittests********************************/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 static int SCACBSTest01(void)
 {
diff --git a/src/util-mpm-ac-ks.c b/src/util-mpm-ac-ks.c
index dc699a79c7..9ce885b922 100644
--- a/src/util-mpm-ac-ks.c
+++ b/src/util-mpm-ac-ks.c
@@ -1480,6 +1480,7 @@ void MpmACTileRegister(void)
 /*************************************Unittests********************************/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 static int SCACTileTest01(void)
 {
diff --git a/src/util-mpm-ac.c b/src/util-mpm-ac.c
index 8b9f5107b9..36d368b298 100644
--- a/src/util-mpm-ac.c
+++ b/src/util-mpm-ac.c
@@ -1251,6 +1251,7 @@ void MpmACRegister(void)
 /*************************************Unittests********************************/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 static int SCACTest01(void)
 {
diff --git a/src/util-mpm-hs.c b/src/util-mpm-hs.c
index 2fff553bc7..fb5d4e7cdc 100644
--- a/src/util-mpm-hs.c
+++ b/src/util-mpm-hs.c
@@ -1094,6 +1094,7 @@ void MpmHSGlobalCleanup(void)
 /*************************************Unittests********************************/
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
 
 static int SCHSTest01(void)
 {
diff --git a/src/util-threshold-config.c b/src/util-threshold-config.c
index 9b63e8447d..4d8e61aa40 100644
--- a/src/util-threshold-config.c
+++ b/src/util-threshold-config.c
@@ -1117,6 +1117,9 @@ int SCThresholdConfParseFile(DetectEngineCtx *de_ctx, FILE *fp)
 }
 
 #ifdef UNITTESTS
+#include "detect-engine-alert.h"
+#include "packet.h"
+#include "action-globals.h"
 
 /**
  * \brief Creates a dummy threshold file, with all valid options, for testing purposes.
diff --git a/src/util-unittest-helper.c b/src/util-unittest-helper.c
index 05e3137277..71e39e7b0a 100644
--- a/src/util-unittest-helper.c
+++ b/src/util-unittest-helper.c
@@ -35,6 +35,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-alert.h"
 #include "detect-engine-sigorder.h"
 #include "detect-engine-build.h"
 
diff --git a/src/util-unittest-helper.h b/src/util-unittest-helper.h
index 56f4501c96..edae52893c 100644
--- a/src/util-unittest-helper.h
+++ b/src/util-unittest-helper.h
@@ -27,13 +27,8 @@
 #if defined(UNITTESTS)
 #include "packet.h"
 #include "flow.h"
-#include "stream-tcp.h"
 #include "detect.h"
-#include "detect-engine.h"
-#include "detect-engine-alert.h"
-#include "detect-engine-build.h"
 #elif defined(FUZZ)
-#include "packet.h"
 #include "flow.h"
 #endif