src: rework includes as per cppclean

src/alert-fastlog.c

@@ -40,6 +40,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 #include "detect-engine-mpm.h"
 #include "detect-reference.h"
 #include "util-classification-config.h"

src/app-layer-dcerpc-common.h

@@ -18,11 +18,6 @@
 #ifndef __APP_LAYER_DCERPC_COMMON_H__
 #define __APP_LAYER_DCERPC_COMMON_H__
 
-#include "app-layer-protos.h"
-#include "app-layer-parser.h"
-#include "flow.h"
-#include "queue.h"
-#include "util-byte.h"
 
 void RegisterDCERPCParsers(void);
 void DCERPCParserTests(void);

src/app-layer-detect-proto.c

@@ -31,6 +31,7 @@
 
 #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"

src/app-layer-dnp3.c

@@ -16,12 +16,15 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "stream.h"
 #include "util-byte.h"
 #include "util-unittest.h"
 #include "util-hashlist.h"
 
 #include "util-print.h"
+#include "util-spm-bs.h"
+#include "util-enum.h"
 
 #include "app-layer.h"
 #include "app-layer-protos.h"

src/app-layer-dnp3.h

@@ -18,9 +18,6 @@
 #ifndef __APP_LAYER_DNP3_H__
 #define __APP_LAYER_DNP3_H__
 
-#include "detect-engine-state.h"
-#include "util-hashlist.h"
-#include "util-byte.h"
 #include "rust.h"
 
 /**

src/app-layer-enip-common.h

@@ -24,10 +24,7 @@
 #ifndef __APP_LAYER_ENIP_COMMON_H__
 #define __APP_LAYER_ENIP_COMMON_H__
 
-#include "app-layer-protos.h"
-#include "app-layer-parser.h"
-#include "flow.h"
-#include "queue.h"
+#include "rust.h"
 
 // EtherNet/IP commands
 #define NOP                0x0000

src/app-layer-enip.h

@@ -24,9 +24,6 @@
 #ifndef __APP_LAYER_ENIP_H__
 #define __APP_LAYER_ENIP_H__
 
-#include "decode.h"
-#include "detect-engine-state.h"
-#include "queue.h"
 
 void RegisterENIPUDPParsers(void);
 void RegisterENIPTCPParsers(void);

src/app-layer-frames.c

@@ -28,6 +28,7 @@
 
 #include "stream-tcp.h"
 #include "app-layer-frames.h"
+#include "app-layer-parser.h"
 
 static void FrameDebug(const char *prefix, const Frames *frames, const Frame *frame)
 {

src/app-layer-frames.h

@@ -24,12 +24,7 @@
 #ifndef __APP_LAYER_FRAMES_H__
 #define __APP_LAYER_FRAMES_H__
 
-#include "app-layer-events.h"
-#include "detect-engine-state.h"
-#include "util-file.h"
-#include "stream-tcp-private.h"
 #include "rust.h"
-#include "app-layer-parser.h"
 
 typedef int64_t FrameId;
 

src/app-layer-ftp.c

@@ -48,6 +48,7 @@
 #include "app-layer-parser.h"
 #include "app-layer-ftp.h"
 #include "app-layer-expectation.h"
+#include "app-layer-detect-proto.h"
 
 #include "util-spm.h"
 #include "util-mpm.h"

src/app-layer-htp-body.c

@@ -45,6 +45,7 @@
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
 #include "app-layer-htp-body.h"
+#include "app-layer-htp-mem.h"
 
 #include "util-spm.h"
 #include "util-debug.h"

src/app-layer-htp-file.c

@@ -45,6 +45,7 @@
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
 #include "app-layer-htp-file.h"
+#include "app-layer-htp-range.h"
 
 #include "util-spm.h"
 #include "util-debug.h"

src/app-layer-htp-libhtp.h

@@ -42,7 +42,6 @@
 #ifndef __APP_LAYER_HTP_LIBHTP__H__
 #define __APP_LAYER_HTP_LIBHTP__H__
 
-#include "suricata.h"
 #include "suricata-common.h"
 
 bstr *SCHTPGenerateNormalizedUri(htp_tx_t *tx, htp_uri_t *uri, int uri_include_all);

src/app-layer-htp-mem.h

@@ -15,7 +15,6 @@
  * 02110-1301, USA.
  */
 
-#include "stream-tcp-reassemble.h"
 
 void HTPParseMemcap(void);
 void *HTPMalloc(size_t size);

src/app-layer-htp-range.h

@@ -19,10 +19,9 @@
 #define __APP_LAYER_HTP_RANGE_H__
 
 #include "suricata-common.h"
-#include "app-layer-parser.h"
 
 #include "util-thash.h"
-#include "rust-bindings.h"
+#include "rust.h"
 
 void HttpRangeContainersInit(void);
 void HttpRangeContainersDestroy(void);

src/app-layer-htp.c

@@ -56,23 +56,28 @@
 #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-libhtp.h"
 #include "app-layer-htp-xff.h"
+#include "app-layer-htp-range.h"
+#include "app-layer-htp-mem.h"
 
 #include "util-spm.h"
 #include "util-debug.h"
 #include "util-time.h"
 #include "util-misc.h"
+#include "util-enum.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"
 

src/app-layer-htp.h

@@ -33,13 +33,10 @@
 #ifndef __APP_LAYER_HTP_H__
 #define __APP_LAYER_HTP_H__
 
-#include "util-radix-tree.h"
 #include "util-file.h"
-#include "app-layer-htp-mem.h"
-#include "detect-engine-state.h"
 #include "util-streaming-buffer.h"
-#include "app-layer-htp-range.h"
 #include "rust.h"
+#include "app-layer-frames.h"
 
 #include <htp/htp.h>
 

src/app-layer-modbus.c

@@ -40,6 +40,7 @@
 
 #include "app-layer-parser.h"
 #include "app-layer-modbus.h"
+#include "detect-engine-build.h"
 
 void ModbusParserRegisterTests(void);
 

src/app-layer-nbss.h

@@ -24,11 +24,6 @@
 #ifndef __APP_LAYER_NBSS_H__
 #define __APP_LAYER_NBSS_H__
 
-#include "suricata-common.h"
-#include "app-layer-protos.h"
-#include "app-layer-parser.h"
-#include "flow.h"
-#include "stream.h"
 
 /*
  http://ubiqx.org/cifs/rfc-draft/rfc1002.html#s4.3

src/app-layer-nfs-udp.c

@@ -33,6 +33,7 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-nfs-udp.h"
+#include "util-enum.h"
 
 #include "rust.h"
 

src/app-layer-parser.c

@@ -44,6 +44,7 @@
 #include "stream-tcp-reassemble.h"
 
 #include "app-layer.h"
+#include "app-layer-detect-proto.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-smb.h"

src/app-layer-parser.h

@@ -26,10 +26,7 @@
 #define __APP_LAYER_PARSER_H__
 
 #include "app-layer-events.h"
-#include "app-layer-frames.h"
-#include "detect-engine-state.h"
 #include "util-file.h"
-#include "stream-tcp-private.h"
 #include "rust.h"
 #include "util-config.h"
 

src/app-layer-register.c

@@ -24,6 +24,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "stream.h"
 #include "conf.h"
 

src/app-layer-smtp.c

@@ -38,6 +38,7 @@
 #include "app-layer-parser.h"
 #include "app-layer-smtp.h"
 
+#include "util-enum.h"
 #include "util-mpm.h"
 #include "util-debug.h"
 #include "util-print.h"
@@ -49,6 +50,7 @@
 
 #include "detect-engine.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 #include "detect-parse.h"
 
 #include "decode-events.h"

src/app-layer-smtp.h

@@ -24,9 +24,7 @@
 #ifndef __APP_LAYER_SMTP_H__
 #define __APP_LAYER_SMTP_H__
 
-#include "decode-events.h"
 #include "util-decode-mime.h"
-#include "queue.h"
 #include "util-streaming-buffer.h"
 #include "rust.h"
 

src/app-layer-ssh.c

@@ -38,6 +38,7 @@
 #include "stream-tcp.h"
 #include "stream.h"
 
+#include "app-layer-detect-proto.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-ssh.h"

src/app-layer-ssl.c

@@ -35,6 +35,7 @@
 #include "stream.h"
 
 #include "app-layer.h"
+#include "app-layer-detect-proto.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-frames.h"
@@ -50,6 +51,7 @@
 #include "util-pool.h"
 #include "util-byte.h"
 #include "util-ja3.h"
+#include "util-enum.h"
 #include "flow-util.h"
 #include "flow-private.h"
 #include "util-validate.h"

src/app-layer-ssl.h

@@ -26,11 +26,8 @@
 #ifndef __APP_LAYER_SSL_H__
 #define __APP_LAYER_SSL_H__
 
-#include "app-layer-protos.h"
-#include "app-layer-parser.h"
-#include "decode-events.h"
 #include "util-ja3.h"
-#include "queue.h"
+#include "rust.h"
 
 enum TlsFrameTypes {
     TLS_FRAME_PDU = 0, /**< whole PDU, so header + data */

src/app-layer-template.c

@@ -34,6 +34,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "stream.h"
 #include "conf.h"
 #include "app-layer.h"
@@ -43,6 +44,7 @@
 
 #include "util-unittest.h"
 #include "util-validate.h"
+#include "util-enum.h"
 
 /* The default port to probe for echo traffic if not provided in the
  * configuration file. */

src/app-layer-template.h

@@ -24,9 +24,7 @@
 #ifndef __APP_LAYER_TEMPLATE_H__
 #define __APP_LAYER_TEMPLATE_H__
 
-#include "detect-engine-state.h"
 
-#include "queue.h"
 
 #include "rust.h"
 

src/app-layer-tftp.c

@@ -26,6 +26,7 @@
 
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "stream.h"
 #include "conf.h"
 

src/app-layer.h

@@ -29,9 +29,7 @@
 
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
-#include "stream.h"
 
-#include "util-profiling.h"
 
 #include "rust.h"
 

src/decode-erspan.h

@@ -25,8 +25,6 @@
 #ifndef __DECODE_ERSPAN_H__
 #define __DECODE_ERSPAN_H__
 
-#include "decode.h"
-#include "threadvars.h"
 
 typedef struct ErspanHdr_ {
     uint16_t ver_vlan;

src/decode-gre.h

@@ -30,8 +30,6 @@
 #define IPPROTO_GRE 47
 #endif
 
-#include "decode.h"
-#include "threadvars.h"
 
 typedef struct GREHdr_
 {

src/decode-icmpv4.h

@@ -24,9 +24,7 @@
 #ifndef __DECODE_ICMPV4_H__
 #define __DECODE_ICMPV4_H__
 
-#include "decode.h"
 #include "decode-tcp.h"
-#include "decode-sctp.h"
 #include "decode-udp.h"
 
 #define ICMPV4_HEADER_LEN       8

src/decode-icmpv6.h

@@ -25,7 +25,6 @@
 #define __DECODE_ICMPV6_H__
 
 #include "decode-tcp.h"
-#include "decode-sctp.h"
 #include "decode-udp.h"
 #include "decode-ipv6.h"
 

src/decode-nsh.h

@@ -25,8 +25,6 @@
 #ifndef __DECODE_NSH_H__
 #define __DECODE_NSH_H__
 
-#include "decode.h"
-#include "threadvars.h"
 
 #define NSH_NEXT_PROTO_UNASSIGNED  0x0
 #define NSH_NEXT_PROTO_IPV4        0x1

src/decode-null.c

@@ -103,18 +103,6 @@ int DecodeNull(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
     return TM_ECODE_OK;
 }
 
-#ifdef UNITTESTS
-
-#endif /* UNITTESTS */
-
-/**
- * \brief Registers Null unit tests
- */
-void DecodeNullRegisterTests(void)
-{
-#ifdef UNITTESTS
-#endif /* UNITTESTS */
-}
 /**
  * @}
  */

src/decode-null.h

@@ -23,5 +23,5 @@
 
 #ifndef __DECODE_NULL_H__
 #define __DECODE_NULL_H__
-void DecodeNullRegisterTests(void);
+
 #endif /* __DECODE_NULL_H__ */

src/decode-pppoe.h

@@ -24,8 +24,6 @@
 #ifndef __DECODE_PPPOE_H__
 #define __DECODE_PPPOE_H__
 
-#include "decode.h"
-#include "threadvars.h"
 
 // Session header length minus the protocol field
 #define PPPOE_SESSION_HEADER_MIN_LEN     7

src/decode-template.h

@@ -25,8 +25,6 @@
 #ifndef __DECODE_TEMPLATE_H__
 #define __DECODE_TEMPLATE_H__
 
-#include "decode.h"
-#include "threadvars.h"
 
 /* Header layout. Keep things like alignment and endianess in
  * mind while constructing this. */

src/decode.c

@@ -52,6 +52,9 @@
 #include "conf.h"
 #include "decode.h"
 #include "decode-teredo.h"
+#include "decode-erspan.h"
+#include "decode-geneve.h"
+#include "decode-vxlan.h"
 #include "util-debug.h"
 #include "util-mem.h"
 #include "app-layer-detect-proto.h"

src/decode.h

@@ -32,7 +32,10 @@
 #include "threadvars.h"
 #include "util-debug.h"
 #include "decode-events.h"
+#ifdef PROFILING
 #include "flow-worker.h"
+#include "app-layer-protos.h"
+#endif
 
 #ifdef HAVE_NAPATECH
 #include "util-napatech.h"
@@ -78,14 +81,10 @@ enum PktSrcEnum {
 
 #include "action-globals.h"
 
-#include "decode-erspan.h"
 #include "decode-ethernet.h"
-#include "decode-chdlc.h"
 #include "decode-gre.h"
-#include "decode-geneve.h"
 #include "decode-ppp.h"
 #include "decode-pppoe.h"
-#include "decode-sll.h"
 #include "decode-ipv4.h"
 #include "decode-ipv6.h"
 #include "decode-icmpv4.h"
@@ -94,17 +93,9 @@ enum PktSrcEnum {
 #include "decode-udp.h"
 #include "decode-sctp.h"
 #include "decode-esp.h"
-#include "decode-raw.h"
-#include "decode-null.h"
 #include "decode-vlan.h"
-#include "decode-vntag.h"
-#include "decode-vxlan.h"
 #include "decode-mpls.h"
-#include "decode-nsh.h"
 
-#include "detect-reference.h"
-
-#include "app-layer-protos.h"
 
 /* forward declarations */
 struct DetectionEngineThreadCtx_;

src/defrag.h

@@ -24,7 +24,6 @@
 #ifndef __DEFRAG_H__
 #define __DEFRAG_H__
 
-#include "tree.h"
 #include "util-pool.h"
 
 /**

src/detect-app-layer-event.c

@@ -33,6 +33,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 #include "detect-app-layer-event.h"
 
 #include "flow.h"
@@ -42,6 +43,8 @@
 #include "decode-events.h"
 #include "util-byte.h"
 #include "util-debug.h"
+#include "util-enum.h"
+#include "util-profiling.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "stream-tcp-util.h"

src/detect-app-layer-protocol.c

@@ -23,6 +23,7 @@
 
 #include "suricata-common.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-prefilter-common.h"
 #include "detect-parse.h"

src/detect-base64-data.c

@@ -21,6 +21,7 @@
 #include "detect-engine-content-inspection.h"
 #include "detect-parse.h"
 #include "detect-base64-data.h"
+#include "detect-engine-build.h"
 
 #include "util-unittest.h"
 

src/detect-base64-decode.c

@@ -22,6 +22,7 @@
 #include "util-base64.h"
 #include "util-byte.h"
 #include "util-print.h"
+#include "detect-engine-build.h"
 
 /* Arbitrary maximum buffer size for decoded base64 data. */
 #define BASE64_DECODE_MAX 65535

src/detect-base64-decode.h

@@ -18,7 +18,6 @@
 #ifndef __DETECT_BASE64_DECODE_H__
 #define __DETECT_BASE64_DECODE_H__
 
-#include "app-layer-template.h"
 
 typedef struct DetectBase64Decode_ {
     uint32_t bytes;

src/detect-byte-extract.c

@@ -36,6 +36,7 @@
 #include "detect-bytetest.h"
 #include "detect-byte-extract.h"
 #include "detect-isdataat.h"
+#include "detect-engine-build.h"
 
 #include "app-layer-protos.h"
 

src/detect-bytejump.c

@@ -42,6 +42,7 @@
 #include "util-debug.h"
 #include "util-validate.h"
 #include "detect-pcre.h"
+#include "detect-engine-build.h"
 
 /**
  * \brief Regex for parsing our options

src/detect-bytemath.c

@@ -39,6 +39,7 @@
 #include "detect-byte.h"
 #include "detect-bytemath.h"
 #include "detect-isdataat.h"
+#include "detect-engine-build.h"
 
 #include "app-layer-protos.h"
 

src/detect-bytetest.c

@@ -30,6 +30,7 @@
 #include "detect.h"
 #include "detect-engine.h"
 #include "detect-parse.h"
+#include "detect-engine-build.h"
 
 #include "detect-content.h"
 #include "detect-uricontent.h"

src/detect-cipservice.h

@@ -24,10 +24,6 @@
 #ifndef _DETECT_CIPSERVICE_H
 #define	_DETECT_CIPSERVICE_H
 
-#include "app-layer-protos.h"
-#include "app-layer-parser.h"
-#include "flow.h"
-#include "queue.h"
 #include "app-layer-enip-common.h"
 
 #define ENIP_PORT 44818 //standard EtherNet/IP port

src/detect-content.c

@@ -30,6 +30,7 @@
 #include "detect-uricontent.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 #include "detect-engine-state.h"
 #include "detect-parse.h"
 #include "detect-pcre.h"

src/detect-csum.c

@@ -38,6 +38,7 @@
 #include "pkt-var.h"
 #include "host.h"
 #include "util-profiling.h"
+#include "detect-engine-build.h"
 
 /* prototypes for the "ipv4-csum" rule keyword */
 static int DetectIPV4CsumMatch(DetectEngineThreadCtx *,

src/detect-dce-iface.c

@@ -31,6 +31,7 @@
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 #include "detect-dce-iface.h"
 
 #include "flow.h"

src/detect-dce-iface.h

@@ -18,7 +18,6 @@
 #ifndef __DETECT_DCE_IFACE_H__
 #define __DETECT_DCE_IFACE_H__
 
-#include "app-layer-dcerpc-common.h"
 
 void DetectDceIfaceRegister(void);
 

src/detect-dce-opnum.c

@@ -31,6 +31,7 @@
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 
 #include "flow.h"
 #include "flow-var.h"

src/detect-dce-opnum.h

@@ -24,7 +24,6 @@
 #ifndef __DETECT_DCE_OPNUM_H__
 #define __DETECT_DCE_OPNUM_H__
 
-#include "app-layer-dcerpc-common.h"
 
 void DetectDceOpnumRegister(void);
 

src/detect-dce-stub-data.c

@@ -30,6 +30,7 @@
 #include "detect-parse.h"
 
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"
@@ -40,6 +41,7 @@
 #include "flow-util.h"
 
 #include "app-layer.h"
+#include "app-layer-parser.h"
 #include "queue.h"
 #include "stream-tcp-reassemble.h"
 

src/detect-dce-stub-data.h

@@ -24,7 +24,6 @@
 #ifndef __DETECT_DCE_STUB_DATA_H__
 #define __DETECT_DCE_STUB_DATA_H__
 
-#include "app-layer-dcerpc-common.h"
 
 void DetectDceStubDataRegister(void);
 

src/detect-detection-filter.c

@@ -39,6 +39,7 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
+#include "detect-engine-build.h"
 
 #define TRACK_DST      1
 #define TRACK_SRC      2

src/detect-dnp3.c

@@ -28,6 +28,7 @@
 #include "detect-engine-content-inspection.h"
 
 #include "app-layer-dnp3.h"
+#include "util-byte.h"
 
 static int g_dnp3_match_buffer_id = 0;
 static int g_dnp3_data_buffer_id = 0;

src/detect-dns-query.c

@@ -36,6 +36,7 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"

src/detect-dsize.c

@@ -29,6 +29,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "flow-var.h"
 

src/detect-engine-analyzer.c

@@ -38,6 +38,7 @@
 #include "detect-tcp-flags.h"
 #include "feature.h"
 #include "util-print.h"
+#include "util-time.h"
 #include "util-validate.h"
 
 static int rule_warnings_only = 0;

src/detect-engine-build.c

@@ -19,7 +19,9 @@
 #include "detect.h"
 #include "detect-engine.h"
 #include "detect-parse.h"
+#include "detect-content.h"
 
+#include "detect-engine-build.h"
 #include "detect-engine-address.h"
 #include "detect-engine-analyzer.h"
 #include "detect-engine-iponly.h"
@@ -38,6 +40,7 @@
 
 #include "util-profiling.h"
 #include "util-validate.h"
+#include "util-var-name.h"
 
 void SigCleanSignatures(DetectEngineCtx *de_ctx)
 {

src/detect-engine-dcepayload.c

@@ -37,6 +37,8 @@
 #include "detect-content.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-engine-dcepayload.h"
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
 
 #include "stream-tcp.h"
 

src/detect-engine-event.h

@@ -24,7 +24,6 @@
 #ifndef __DETECT_ENGINE_EVENT_H__
 #define __DETECT_ENGINE_EVENT_H__
 
-#include "decode-events.h"
 
 typedef struct DetectEngineEventData_ {
     uint8_t event;

src/detect-engine-iponly.c

@@ -41,6 +41,7 @@
 #include "detect-engine-proto.h"
 #include "detect-engine-port.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-build.h"
 
 #include "detect-engine-threshold.h"
 #include "detect-engine-iponly.h"

src/detect-engine-loader.c

@@ -36,6 +36,7 @@
 #include "util-signal.h"
 
 #include "detect-engine-loader.h"
+#include "detect-engine-build.h"
 #include "detect-engine-analyzer.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-sigorder.h"

src/detect-engine-mpm.h

@@ -24,13 +24,9 @@
 #ifndef __DETECT_ENGINE_MPM_H__
 #define __DETECT_ENGINE_MPM_H__
 
-#include "tm-threads.h"
 
 #include "detect.h"
-#include "detect-content.h"
-#include "detect-uricontent.h"
 
-#include "stream.h"
 
 void DetectMpmInitializeFrameMpms(DetectEngineCtx *de_ctx);
 int DetectMpmPrepareFrameMpms(DetectEngineCtx *de_ctx);

src/detect-engine-payload.c

@@ -36,6 +36,7 @@
 #include "detect-engine-prefilter.h"
 #include "detect-engine-state.h"
 #include "detect-engine-payload.h"
+#include "detect-engine-build.h"
 
 #include "stream.h"
 #include "stream-tcp.h"

src/detect-engine-register.c

@@ -65,6 +65,7 @@
 #include "detect-http-ua.h"
 #include "detect-http-host.h"
 
+#include "detect-mark.h"
 #include "detect-nfs-procedure.h"
 #include "detect-nfs-version.h"
 

src/detect-engine-siggroup.c

@@ -33,6 +33,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 #include "detect-engine-address.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-siggroup.h"

src/detect-engine-sigorder.c

@@ -31,6 +31,7 @@
 #include "detect-parse.h"
 #include "detect-engine-sigorder.h"
 #include "detect-pcre.h"
+#include "detect-engine-build.h"
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"

src/detect-engine-state.c

@@ -45,6 +45,7 @@
 #include "detect-parse.h"
 #include "detect-engine-state.h"
 #include "detect-engine-dcepayload.h"
+#include "detect-engine-build.h"
 
 #include "detect-flowvar.h"
 

src/detect-engine-tag.c

@@ -32,6 +32,7 @@
 #include "util-time.h"
 #include "util-hashlist.h"
 #include "detect-engine-tag.h"
+#include "detect-engine-build.h"
 #include "detect-tag.h"
 #include "host.h"
 #include "host-storage.h"

src/detect-engine-tag.h

@@ -29,6 +29,7 @@
 
 #include "host.h"
 #include "detect.h"
+#include "detect-tag.h"
 
 /* This limit should be overwriten/predefined at the config file
  * to limit the options to prevent possible DOS situations. We should also

src/detect-engine.c

@@ -39,6 +39,7 @@
 #include "detect-parse.h"
 #include "detect-engine-sigorder.h"
 
+#include "detect-engine-build.h"
 #include "detect-engine-siggroup.h"
 #include "detect-engine-address.h"
 #include "detect-engine-port.h"
@@ -46,6 +47,7 @@
 #include "detect-engine-mpm.h"
 #include "detect-engine-iponly.h"
 #include "detect-engine-tag.h"
+#include "detect-engine-frame.h"
 
 #include "detect-engine-file.h"
 
@@ -79,6 +81,7 @@
 #include "util-profiling.h"
 #include "util-validate.h"
 #include "util-hash-string.h"
+#include "util-enum.h"
 
 #include "tm-threads.h"
 #include "runmodes.h"

src/detect-engine.h

@@ -25,10 +25,7 @@
 #define __DETECT_ENGINE_H__
 
 #include "detect.h"
-#include "tm-threads.h"
-#include "flow-private.h"
-
-#include "detect-engine-frame.h"
+#include "suricata.h"
 
 void InspectionBufferInit(InspectionBuffer *buffer, uint32_t initial_size);
 void InspectionBufferSetup(DetectEngineThreadCtx *det_ctx, const int list_id,

src/detect-fast-pattern.c

@@ -30,6 +30,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-build.h"
 #include "detect-fast-pattern.h"
 
 #include "util-error.h"

src/detect-fileext.c

@@ -30,6 +30,7 @@
 
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
 
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

src/detect-fileext.h

@@ -24,7 +24,6 @@
 #ifndef __DETECT_FILEEXT_H__
 #define __DETECT_FILEEXT_H__
 
-#include "util-spm-bm.h"
 
 typedef struct DetectFileextData_ {
     uint8_t *ext;  /** file extension to match */

src/detect-filemagic.c

@@ -29,6 +29,7 @@
 
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
 
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

src/detect-filename.c

@@ -30,6 +30,7 @@
 
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
 
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

src/detect-filesize.c

@@ -35,6 +35,7 @@
 #include "detect-engine.h"
 #include "detect-engine-state.h"
 #include "detect-engine-uint.h"
+#include "detect-engine-build.h"
 
 #include "detect-filesize.h"
 #include "util-debug.h"

src/detect-flow.c

@@ -31,6 +31,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "flow.h"
 #include "flow-var.h"

src/detect-flowbits.c

@@ -40,6 +40,7 @@
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 
 #include "util-var-name.h"
 #include "util-unittest.h"

src/detect-flowint.c

@@ -41,6 +41,7 @@
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-sigorder.h"
+#include "detect-engine-build.h"
 
 #include "pkt-var.h"
 #include "host.h"

src/detect-flowvar.c

@@ -40,6 +40,7 @@
 #include "util-var-name.h"
 #include "util-debug.h"
 #include "util-print.h"
+#include "util-spm.h"
 
 #define PARSE_REGEX         "(.*),(.*)"
 static DetectParseRegex parse_regex;

src/detect-fragbits.h

@@ -24,9 +24,6 @@
 #ifndef __DETECT_FRAGBITS_H__
 #define __DETECT_FRAGBITS_H__
 
-#include "decode-events.h"
-#include "decode-ipv4.h"
-#include "decode-tcp.h"
 
 /**
  * \struct DetectFragBitsData_

src/detect-fragoffset.c

@@ -32,6 +32,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "detect-fragoffset.h"
 

src/detect-ftpbounce.c

@@ -32,6 +32,7 @@
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-content.h"
+#include "detect-engine-build.h"
 
 #include "app-layer.h"
 #include "app-layer-parser.h"

src/detect-ftpdata.h

@@ -24,7 +24,6 @@
 #ifndef __DETECT_FTPDATA_H__
 #define __DETECT_FTPDATA_H__
 
-#include "detect-engine.h"
 #include "app-layer-ftp.h"
 
 /** Per keyword data. This is set up by the DetectFtpcommandSetup() function.

src/detect-geoip.h

@@ -28,7 +28,6 @@
 #ifdef HAVE_GEOIP
 
 #include <maxminddb.h>
-#include "util-spm-bm.h"
 
 #define GEOOPTION_MAXSIZE 3 /* Country Code (2 chars) + NULL */
 #define GEOOPTION_MAXLOCATIONS 64

src/detect-gid.h

@@ -26,9 +26,6 @@
 #ifndef __DETECT_GID_H__
 #define __DETECT_GID_H__
 
-#include "decode-events.h"
-#include "decode-ipv4.h"
-#include "decode-tcp.h"
 
 /**
  * Registration function for gid: keyword

src/detect-hostbits.c

@@ -40,6 +40,7 @@
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 
 #include "flow-bit.h"
 #include "host-bit.h"

src/detect-http-headers-stub.h

@@ -27,25 +27,16 @@
  */
 
 #include "suricata-common.h"
-#include "threads.h"
-#include "decode.h"
 #include "flow.h"
-#include "app-layer.h"
-#include "app-layer-parser.h"
-#include "app-layer-protos.h"
-#include "app-layer-htp.h"
 
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
-#include "detect-engine-state.h"
 #include "detect-engine-prefilter.h"
-#include "detect-engine-content-inspection.h"
-#include "detect-content.h"
-#include "detect-http-header.h"
 
 #include "util-debug.h"
+#include "rust.h"
 
 static int g_buffer_id = 0;