diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c
index 30031f694b..ef2c61b1b5 100644
--- a/src/app-layer-detect-proto.c
+++ b/src/app-layer-detect-proto.c
@@ -23,24 +23,13 @@
  */
 
 #include "suricata-common.h"
-#include "decode.h"
-#include "threads.h"
-#include "threadvars.h"
-#include "tm-threads.h"
 
 #include "detect.h"
 #include "detect-engine-port.h"
-#include "detect-engine-build.h"
-#include "detect-parse.h"
-#include "detect-engine.h"
 #include "detect-content.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 
-#include "util-print.h"
-#include "util-pool.h"
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
 #include "util-validate.h"
 
 #include "flow.h"
@@ -48,13 +37,9 @@
 #include "flow-private.h"
 
 #include "stream-tcp-private.h"
-#include "stream-tcp-reassemble.h"
 #include "stream-tcp.h"
-#include "stream.h"
 
-#include "app-layer.h"
 #include "app-layer-protos.h"
-#include "app-layer-parser.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer-expectation.h"
 
@@ -62,8 +47,10 @@
 #include "util-memcmp.h"
 #include "util-spm.h"
 #include "util-debug.h"
-
-#include "runmodes.h"
+#include "rust.h"
+#include "suricata.h"
+#include "util-mpm.h"
+#include "util-prefilter.h"
 
 typedef struct AppLayerProtoDetectProbingParserElement_ {
     AppProto alproto;
@@ -2191,6 +2178,14 @@ void AppLayerRegisterExpectationProto(uint8_t proto, AppProto alproto)
 
 #include "app-layer-htp.h"
 #include "detect-engine-alert.h"
+#include "app-layer-parser.h"
+#include "counters.h"
+#include "decode.h"
+#include "detect-engine-build.h"
+#include "detect-parse.h"
+#include "detect-engine.h"
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
 
 static AppLayerProtoDetectCtx alpd_ctx_ut;
 
diff --git a/src/app-layer-dnp3.c b/src/app-layer-dnp3.c
index d798975820..41d6b7f011 100644
--- a/src/app-layer-dnp3.c
+++ b/src/app-layer-dnp3.c
@@ -23,13 +23,10 @@
 
 #include "suricata-common.h"
 #include "suricata.h"
-#include "util-unittest.h"
 
-#include "util-byte.h"
 #include "util-spm-bs.h"
 #include "util-enum.h"
 
-#include "app-layer.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-detect-proto.h"
@@ -37,6 +34,10 @@
 
 #include "app-layer-dnp3.h"
 #include "app-layer-dnp3-objects.h"
+#include "conf.h"
+#include "rust.h"
+#include "util-debug.h"
+#include "util-validate.h"
 
 #define DNP3_DEFAULT_PORT "20000"
 
@@ -1694,6 +1695,8 @@ void RegisterDNP3Parsers(void)
 
 #include "flow-util.h"
 #include "stream-tcp.h"
+#include "util-unittest.h"
+#include "threads.h"
 
 /**
  * \brief Utility function to fix CRCs when mangling a frame.
diff --git a/src/app-layer-events.c b/src/app-layer-events.c
index 4e6ced0c2e..935db060e6 100644
--- a/src/app-layer-events.c
+++ b/src/app-layer-events.c
@@ -23,9 +23,10 @@
  */
 
 #include "suricata-common.h"
-#include "rust.h"
 #include "app-layer-events.h"
 #include "util-enum.h"
+#include "detect.h"
+#include "util-debug.h"
 
 int SCAppLayerGetEventIdByName(const char *event_name, SCEnumCharMap *table, uint8_t *event_id)
 {
diff --git a/src/app-layer-expectation.c b/src/app-layer-expectation.c
index 579582114a..4fc42808ef 100644
--- a/src/app-layer-expectation.c
+++ b/src/app-layer-expectation.c
@@ -59,8 +59,8 @@
 #include "flow-storage.h"
 
 #include "app-layer-expectation.h"
-
-#include "util-print.h"
+#include "ippair.h"
+#include "util-debug.h"
 
 static SCIPPairStorageId g_ippair_expectation_id = { .id = -1 };
 static SCFlowStorageId g_flow_expectation_id = { .id = -1 };
diff --git a/src/app-layer-frames.c b/src/app-layer-frames.c
index 3962110414..357c3d54ff 100644
--- a/src/app-layer-frames.c
+++ b/src/app-layer-frames.c
@@ -23,13 +23,14 @@
  */
 
 #include "suricata-common.h"
-#include "util-print.h"
 
 #include "flow.h"
 #include "stream-tcp.h"
 #include "rust.h"
 #include "app-layer-frames.h"
 #include "app-layer-parser.h"
+#include "util-debug.h"
+#include "util-validate.h"
 
 struct FrameConfig {
     SC_ATOMIC_DECLARE(uint64_t, types);
diff --git a/src/app-layer-frames.h b/src/app-layer-frames.h
index 2479bd2ee7..42827261c8 100644
--- a/src/app-layer-frames.h
+++ b/src/app-layer-frames.h
@@ -24,6 +24,8 @@
 #ifndef SURICATA_APP_LAYER_FRAMES_H
 #define SURICATA_APP_LAYER_FRAMES_H
 
+#include "decode.h"
+
 /** special value for matching any type */
 #define FRAME_ANY_TYPE 62
 /** max 63 to fit the 64 bit per protocol space */
diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
index 2a9aec1393..85512fabe6 100644
--- a/src/app-layer-ftp.c
+++ b/src/app-layer-ftp.c
@@ -28,7 +28,6 @@
 #include "suricata-common.h"
 
 #include "app-layer-ftp.h"
-#include "app-layer.h"
 #include "app-layer-parser.h"
 #include "app-layer-expectation.h"
 #include "app-layer-detect-proto.h"
@@ -36,9 +35,15 @@
 
 #include "rust.h"
 
-#include "util-misc.h"
 #include "util-mpm.h"
 #include "util-validate.h"
+#include "app-layer-protos.h"
+#include "flow-storage.h"
+#include "flow.h"
+#include "util-debug.h"
+#include "util-error.h"
+#include "util-prefilter.h"
+#include "util-streaming-buffer.h"
 
 typedef struct FTPThreadCtx_ {
     MpmThreadCtx *ftp_mpm_thread_ctx;
@@ -424,7 +429,6 @@ static uint32_t CopyCommandLine(uint8_t **dest, FtpLineState *line)
     return line->len + 1;
 }
 
-#include "util-print.h"
 
 /**
  * \brief This function is called to retrieve a ftp request
diff --git a/src/app-layer-htp-body.c b/src/app-layer-htp-body.c
index 90ae2374d9..ff960b7b01 100644
--- a/src/app-layer-htp-body.c
+++ b/src/app-layer-htp-body.c
@@ -31,7 +31,8 @@
 #include "app-layer-htp-mem.h"
 #include "app-layer-htp-body.h"
 #include "util-streaming-buffer.h"
-#include "util-print.h"
+#include "rust.h"
+#include "util-debug.h"
 
 extern StreamingBufferConfig htp_sbcfg;
 
diff --git a/src/app-layer-htp-file.c b/src/app-layer-htp-file.c
index 620ce0d9a2..b9dbdf9bbd 100644
--- a/src/app-layer-htp-file.c
+++ b/src/app-layer-htp-file.c
@@ -29,6 +29,10 @@
 #include "app-layer-htp-range.h"
 #include "app-layer-events.h"
 #include "util-validate.h"
+#include "rust.h"
+#include "util-debug.h"
+#include "util-file.h"
+#include "util-streaming-buffer.h"
 
 extern StreamingBufferConfig htp_sbcfg;
 
@@ -323,6 +327,7 @@ end:
 }
 
 #ifdef UNITTESTS
+#include "app-layer-protos.h"
 #include "stream-tcp.h"
 #include "app-layer-parser.h"
 #include "util-unittest-helper.h"
diff --git a/src/app-layer-htp-mem.c b/src/app-layer-htp-mem.c
index e332499cf2..035218aa6b 100644
--- a/src/app-layer-htp-mem.c
+++ b/src/app-layer-htp-mem.c
@@ -35,6 +35,7 @@
 #include "conf.h"
 #include "util-misc.h"
 #include "util-debug.h"
+#include "util-error.h"
 
 SC_ATOMIC_DECLARE(uint64_t, htp_config_memcap);
 SC_ATOMIC_DECLARE(uint64_t, htp_memuse);
diff --git a/src/app-layer-htp-range.c b/src/app-layer-htp-range.c
index b60fb8283a..36f540f377 100644
--- a/src/app-layer-htp-range.c
+++ b/src/app-layer-htp-range.c
@@ -30,6 +30,8 @@
 #include "util-hash-lookup3.h" //hashlittle_safe
 #include "util-validate.h"    //DEBUG_VALIDATE_BUG_ON
 #include "util-byte.h"        //StringParseUint32
+#include "conf.h"
+#include "util-debug.h"
 
 typedef struct ContainerTHashTable {
     THashTableContext *ht;
diff --git a/src/app-layer-htp-xff.c b/src/app-layer-htp-xff.c
index 4f628f72c8..d4801a3a2d 100644
--- a/src/app-layer-htp-xff.c
+++ b/src/app-layer-htp-xff.c
@@ -31,6 +31,9 @@
 
 #include "util-misc.h"
 #include "util-unittest.h"
+#include "app-layer-protos.h"
+#include "htp/htp_rs.h"
+#include "util-debug.h"
 
 /** Default XFF header name */
 #define XFF_DEFAULT "X-Forwarded-For"
diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index 3adbe5e77a..3033affa5b 100644
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -36,23 +36,17 @@
 #include "suricata.h"
 #include "suricata-common.h"
 #include "conf.h"
-#include "decode.h"
 
-#include "util-print.h"
 #include "util-byte.h"
 
-#include "stream-tcp.h"
-
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
 
-#include "app-layer.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer-frames.h"
 #include "app-layer-htp.h"
 #include "app-layer-htp-body.h"
 #include "app-layer-htp-file.h"
-#include "app-layer-htp-xff.h"
 #include "app-layer-htp-range.h"
 #include "app-layer-htp-mem.h"
 #include "app-layer-events.h"
@@ -61,18 +55,18 @@
 #include "util-file-decompression.h"
 #include "util-misc.h"
 
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
-#include "flow-util.h"
 
-#include "detect-engine.h"
-#include "detect-engine-build.h"
 #include "detect-engine-state.h"
-#include "detect-parse.h"
 
 #include "util-memcmp.h"
 #include "util-random.h"
 #include "util-validate.h"
+#include "flow.h"
+#include "rust.h"
+#include "stream-tcp-reassemble.h"
+#include "util-enum.h"
+#include "util-radix4-tree.h"
+#include "util-radix6-tree.h"
 
 //#define PRINT
 
@@ -2697,6 +2691,16 @@ void RegisterHTPParsers(void)
 
 #ifdef UNITTESTS
 #include "detect-engine-alert.h"
+#include "app-layer-htp-xff.h"
+#include "counters.h"
+#include "detect-engine.h"
+#include "detect-engine-build.h"
+#include "detect-parse.h"
+#include "flow-util.h"
+#include "stream-tcp.h"
+#include "util-print.h"
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
 
 static HTPCfgRec cfglist_backup;
 
diff --git a/src/app-layer-http2.c b/src/app-layer-http2.c
index fc299cdaec..0b1697e8e4 100644
--- a/src/app-layer-http2.c
+++ b/src/app-layer-http2.c
@@ -24,17 +24,18 @@
  */
 
 #include "suricata-common.h"
-#include "stream.h"
-#include "conf.h"
 
 #include "util-unittest.h"
 
 #include "app-layer-detect-proto.h"
-#include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
 #include "app-layer-http2.h"
+#include "app-layer-protos.h"
+#include "htp/htp_rs.h"
+#include "rust-bindings.h"
 #include "rust.h"
+#include "util-streaming-buffer.h"
 
 static int HTTP2RegisterPatternsForProtocolDetection(void)
 {
diff --git a/src/app-layer-ike.c b/src/app-layer-ike.c
index f11ecdd356..bb07e5b0ac 100644
--- a/src/app-layer-ike.c
+++ b/src/app-layer-ike.c
@@ -26,17 +26,20 @@
  */
 
 #include "suricata-common.h"
-#include "stream.h"
-#include "conf.h"
-
-#include "util-unittest.h"
-
-#include "app-layer-detect-proto.h"
-#include "app-layer-parser.h"
 
 #include "app-layer-ike.h"
 #include "rust.h"
 
+#ifdef UNITTESTS
+#include "app-layer-parser.h"
+#include "app-layer-protos.h"
+#include "flow.h"
+#include "util-unittest.h"
+#include "stream-tcp.h"
+#include "util-unittest-helper.h"
+#include "flow-util.h"
+#endif
+
 void RegisterIKEParsers(void)
 {
     SCRegisterIkeParser();
@@ -46,9 +49,6 @@ void RegisterIKEParsers(void)
 }
 
 #ifdef UNITTESTS
-#include "stream-tcp.h"
-#include "util-unittest-helper.h"
-#include "flow-util.h"
 
 static int IkeParserTest(void)
 {
diff --git a/src/app-layer-imap.c b/src/app-layer-imap.c
index 2a6bd8775c..d1264e72de 100644
--- a/src/app-layer-imap.c
+++ b/src/app-layer-imap.c
@@ -22,9 +22,14 @@
  *
  */
 
-#include "app-layer.h"
+#include "suricata-common.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer-imap.h"
+#include "app-layer-protos.h"
+#include "rust.h"
+#include "stream-tcp-private.h"
+#include "stream-tcp-reassemble.h"
+#include "util-debug.h"
 
 static AppProto ImapClientProbingParser(
         const Flow *f, uint8_t direction, const uint8_t *input, uint32_t len, uint8_t *rdir)
diff --git a/src/app-layer-modbus.c b/src/app-layer-modbus.c
index 4a00d70553..f74486b4e6 100644
--- a/src/app-layer-modbus.c
+++ b/src/app-layer-modbus.c
@@ -38,10 +38,32 @@
 
 #include "util-debug.h"
 
-#include "app-layer-parser.h"
 #include "app-layer-modbus.h"
 #include "rust.h"
 
+#ifdef UNITTESTS
+
+#include "app-layer-parser.h"
+#include "app-layer-protos.h"
+#include "counters.h"
+#include "decode.h"
+#include "flow.h"
+#include "threadvars.h"
+#include "detect.h"
+#include "detect-engine.h"
+#include "detect-parse.h"
+#include "detect-engine-build.h"
+#include "detect-engine-alert.h"
+
+#include "flow-util.h"
+
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
+
+#include "stream-tcp.h"
+#include "stream-tcp-private.h"
+#endif
+
 void ModbusParserRegisterTests(void);
 
 /**
@@ -59,21 +81,6 @@ void RegisterModbusParsers(void)
 
 /* UNITTESTS */
 #ifdef UNITTESTS
-#include "detect.h"
-#include "detect-engine.h"
-#include "detect-parse.h"
-#include "detect-engine-build.h"
-#include "detect-engine-alert.h"
-
-#include "flow-util.h"
-
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
-
-#include "stream-tcp.h"
-#include "stream-tcp-private.h"
-
-#include "rust.h"
 
 /* Modbus default stream reassembly depth */
 #define MODBUS_CONFIG_DEFAULT_STREAM_DEPTH 0
diff --git a/src/app-layer-nfs-tcp.c b/src/app-layer-nfs-tcp.c
index 706f91b289..237b3295e1 100644
--- a/src/app-layer-nfs-tcp.c
+++ b/src/app-layer-nfs-tcp.c
@@ -27,18 +27,16 @@
  */
 
 #include "suricata-common.h"
-#include "stream.h"
-#include "conf.h"
 
 #include "util-unittest.h"
 
 #include "app-layer-detect-proto.h"
-#include "app-layer-parser.h"
 
 #include "app-layer-nfs-tcp.h"
 
 #include "rust.h"
-
+#include "rust-bindings.h"
+#include "util-streaming-buffer.h"
 
 static StreamingBufferConfig sbcfg = STREAMING_BUFFER_CONFIG_INITIALIZER;
 static SuricataFileContext sfc = { &sbcfg };
diff --git a/src/app-layer-nfs-udp.c b/src/app-layer-nfs-udp.c
index 65a7d3b184..430169dff4 100644
--- a/src/app-layer-nfs-udp.c
+++ b/src/app-layer-nfs-udp.c
@@ -24,18 +24,16 @@
  */
 
 #include "suricata-common.h"
-#include "stream.h"
-#include "conf.h"
 
 #include "util-unittest.h"
 
-#include "app-layer-detect-proto.h"
-#include "app-layer-parser.h"
 
 #include "app-layer-nfs-udp.h"
 #include "util-enum.h"
 
 #include "rust.h"
+#include "rust-bindings.h"
+#include "util-streaming-buffer.h"
 
 /* Enum of app-layer events for an echo protocol. Normally you might
  * have events for errors in parsing data, like unexpected data being
@@ -65,17 +63,4 @@ void RegisterNFSUDPParsers(void)
     SCNfsInit(&sfc);
     SCRegisterNfsUdpParser();
 
-#ifdef UNITTESTS
-    AppLayerParserRegisterProtocolUnittests(IPPROTO_UDP, ALPROTO_NFS,
-        NFSUDPParserRegisterTests);
-#endif
-}
-
-#ifdef UNITTESTS
-#endif
-
-void NFSUDPParserRegisterTests(void)
-{
-#ifdef UNITTESTS
-#endif
 }
diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
index 051ed6be26..be7d9394fe 100644
--- a/src/app-layer-parser.c
+++ b/src/app-layer-parser.c
@@ -56,6 +56,18 @@
 #include "app-layer-ike.h"
 #include "app-layer-http2.h"
 #include "app-layer-imap.h"
+#include "conf.h"
+#include "decode.h"
+#include "detect.h"
+#include "rust-bindings.h"
+#include "rust.h"
+#include "stream-tcp-reassemble.h"
+#include "suricata.h"
+#include "threadvars.h"
+#include "util-debug.h"
+#include "util-exception-policy.h"
+#include "util-file.h"
+#include "util-var.h"
 
 struct AppLayerParserThreadCtx_ {
     void *(*alproto_local_storage)[FLOW_PROTO_MAX];
diff --git a/src/app-layer-protos.c b/src/app-layer-protos.c
index 4a648dffcd..19cea1aca5 100644
--- a/src/app-layer-protos.c
+++ b/src/app-layer-protos.c
@@ -26,6 +26,8 @@
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "rust.h"
+#include "util-debug.h"
+#include "util-validate.h"
 
 AppProto g_alproto_max = ALPROTO_MAX_STATIC;
 #define ARRAY_CAP_STEP 16
diff --git a/src/app-layer-register.c b/src/app-layer-register.c
index 221ba193f3..45bb6f1a22 100644
--- a/src/app-layer-register.c
+++ b/src/app-layer-register.c
@@ -25,14 +25,13 @@
 
 #include "suricata-common.h"
 #include "suricata.h"
-#include "stream.h"
-#include "conf.h"
 #include "rust.h"
 
 #include "app-layer-detect-proto.h"
 #include "app-layer-parser.h"
 
 #include "app-layer-register.h"
+#include "util-debug.h"
 
 static const char * IpProtoToString(int ip_proto);
 
diff --git a/src/app-layer-smb.c b/src/app-layer-smb.c
index 10bf690635..ff8dc859d2 100644
--- a/src/app-layer-smb.c
+++ b/src/app-layer-smb.c
@@ -22,18 +22,21 @@
  */
 
 #include "suricata-common.h"
-#include "suricata.h"
 
-#include "app-layer-protos.h"
-#include "app-layer-detect-proto.h"
-#include "app-layer-parser.h"
-
-#include "util-unittest.h"
 
 #include "rust.h"
 #include "app-layer-smb.h"
-#include "util-misc.h"
+#include "rust-bindings.h"
+#include "util-streaming-buffer.h"
 
+#ifdef UNITTESTS
+#include "stream-tcp.h"
+#include "util-unittest.h"
+#include "util-unittest-helper.h"
+#include "app-layer-protos.h"
+#include "app-layer-parser.h"
+#include "flow.h"
+#endif
 
 static StreamingBufferConfig sbcfg = STREAMING_BUFFER_CONFIG_INITIALIZER;
 static SuricataFileContext sfc = { &sbcfg };
@@ -53,8 +56,6 @@ void RegisterSMBParsers(void)
 }
 
 #ifdef UNITTESTS
-#include "stream-tcp.h"
-#include "util-unittest-helper.h"
 
 /** \test multi transactions and cleanup */
 static int SMBParserTxCleanupTest(void)
diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c
index 3bc0780418..44e6f5cf65 100644
--- a/src/app-layer-smtp.c
+++ b/src/app-layer-smtp.c
@@ -21,13 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#include "suricata.h"
 #include "suricata-common.h"
-#include "decode.h"
-
-#include "stream-tcp.h"
 
-#include "app-layer.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
@@ -42,18 +37,19 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-memcmp.h"
-#include "flow-util.h"
 
-#include "detect-engine.h"
 #include "detect-engine-state.h"
-#include "detect-engine-build.h"
-#include "detect-parse.h"
 
 #include "conf.h"
 
 #include "util-mem.h"
 #include "util-misc.h"
 #include "util-validate.h"
+#include "detect.h"
+#include "flow.h"
+#include "rust.h"
+#include "stream-tcp-reassemble.h"
+#include "util-prefilter.h"
 
 /* content-limit default value */
 #define FILEDATA_CONTENT_LIMIT 100000
@@ -2193,6 +2189,14 @@ void SMTPParserCleanup(void)
 
 #ifdef UNITTESTS
 #include "detect-engine-alert.h"
+#include "counters.h"
+#include "decode.h"
+#include "detect-engine.h"
+#include "detect-engine-build.h"
+#include "detect-parse.h"
+#include "flow-util.h"
+#include "stream-tcp.h"
+#include "suricata.h"
 
 static void SMTPTestInitConfig(void)
 {
diff --git a/src/app-layer-smtp.h b/src/app-layer-smtp.h
index d6e8a7fd1a..e48b1f36f3 100644
--- a/src/app-layer-smtp.h
+++ b/src/app-layer-smtp.h
@@ -26,7 +26,6 @@
 
 #include "rust.h"
 #include "app-layer-parser.h"
-#include "app-layer-frames.h"
 #include "util-streaming-buffer.h"
 
 /* Limit till the data would be buffered in current line */
diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c
index 6e75c42471..9152863e0b 100644
--- a/src/app-layer-ssh.c
+++ b/src/app-layer-ssh.c
@@ -27,15 +27,6 @@
 
 #include "suricata-common.h"
 #include "decode.h"
-#include "threads.h"
-
-#include "util-print.h"
-#include "util-pool.h"
-
-#include "stream-tcp-private.h"
-#include "stream-tcp-reassemble.h"
-#include "stream-tcp.h"
-#include "stream.h"
 
 #include "app-layer-detect-proto.h"
 #include "app-layer-protos.h"
@@ -45,13 +36,12 @@
 
 #include "conf.h"
 
-#include "util-spm.h"
 #include "util-unittest.h"
 #include "util-debug.h"
-#include "flow-private.h"
 
-#include "util-byte.h"
 #include "util-memcmp.h"
+#include "rust-bindings.h"
+#include "suricata.h"
 
 /* HASSH fingerprints are disabled by default */
 #define SSH_CONFIG_DEFAULT_HASSH false
@@ -138,6 +128,9 @@ void RegisterSSHParsers(void)
 #include "flow-util.h"
 #include "stream-tcp-util.h"
 #include "util-unittest-helper.h"
+#include "stream-tcp-private.h"
+#include "stream-tcp-reassemble.h"
+#include "stream-tcp.h"
 
 static int SSHParserTestUtilCheck(const char *protoexp, const char *softexp, void *tx, uint8_t flags) {
     const uint8_t *protocol = NULL;
diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c
index 60dccc36ac..473b455cc3 100644
--- a/src/app-layer-ssl.c
+++ b/src/app-layer-ssl.c
@@ -25,9 +25,7 @@
  */
 
 #include "suricata-common.h"
-#include "decode.h"
 
-#include "app-layer.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
@@ -43,6 +41,8 @@
 #include "util-ja3.h"
 #include "util-enum.h"
 #include "util-validate.h"
+#include "rust.h"
+#include "suricata.h"
 
 static SCEnumCharMap tls_state_client_table[] = {
     {
diff --git a/src/app-layer-tftp.c b/src/app-layer-tftp.c
index 131906aaaf..1bb399b099 100644
--- a/src/app-layer-tftp.c
+++ b/src/app-layer-tftp.c
@@ -28,11 +28,13 @@
 #include "suricata-common.h"
 #include "suricata.h"
 
-#include "app-layer.h"
 #include "app-layer-detect-proto.h"
 #include "app-layer-parser.h"
 
 #include "app-layer-tftp.h"
+#include "app-layer-protos.h"
+#include "rust.h"
+#include "util-debug.h"
 
 /* The default port to probe if not provided in the configuration file. */
 #define TFTP_DEFAULT_PORT "69"
diff --git a/src/app-layer.c b/src/app-layer.c
index 98fb98cade..e3d314e1a2 100644
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -37,7 +37,6 @@
 #include "app-layer-events.h"
 #include "stream-tcp-reassemble.h"
 #include "stream-tcp-private.h"
-#include "stream-tcp-inline.h"
 #include "stream-tcp.h"
 #include "flow.h"
 #include "flow-util.h"
@@ -47,9 +46,13 @@
 #include "util-print.h"
 #include "util-profiling.h"
 #include "util-validate.h"
-#include "decode-events.h"
 #include "app-layer-htp-mem.h"
 #include "util-exception-policy.h"
+#include "counters.h"
+#include "decode-tcp.h"
+#include "host.h"
+#include "packet-queue.h"
+#include "util-exception-policy-types.h"
 
 extern bool g_stats_eps_per_app_proto_errors;
 /**
@@ -1396,9 +1399,6 @@ void AppLayerDeSetupCounters(void)
 /***** Unittests *****/
 
 #ifdef UNITTESTS
-#include "pkt-var.h"
-#include "stream-tcp-util.h"
-#include "stream.h"
 #include "util-unittest.h"
 
 #define TEST_START                                                                                 \