src: rework includes as per cppclean

diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c
index 5800ea3075e6e2ca1b89ac28f6cc85c03f02bcf8..2d24bd54919f7005c330eb7b2a79a22ec658e5cf 100644 (file)
--- a/src/alert-fastlog.c
+++ b/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"

diff --git a/src/app-layer-dcerpc-common.h b/src/app-layer-dcerpc-common.h
index 0bbfc554012495372917f5abb7ff3eda5152466f..f140ec49a7d0c185aa4ceb28babe49410f2b3008 100644 (file)
--- a/src/app-layer-dcerpc-common.h
+++ b/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);

diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c
index 4398e02959861df00a2a72580498046901009c9a..468cfba9048a3ffc8e61a445839c9276ee3267ac 100644 (file)
--- a/src/app-layer-detect-proto.c
+++ b/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"

diff --git a/src/app-layer-dnp3.c b/src/app-layer-dnp3.c
index 88c3a16150bb6aca231a5bb58bf25a7549dee971..76e664f5039388d738f860ffd9245492eb3552c1 100644 (file)
--- a/src/app-layer-dnp3.c
+++ b/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"

diff --git a/src/app-layer-dnp3.h b/src/app-layer-dnp3.h
index bf74e27aa9adf538313a18a1078ba71e05a2ee0e..220ef1016007fe076ea12f7524d4f8922da67de8 100644 (file)
--- a/src/app-layer-dnp3.h
+++ b/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"
 
 /**

diff --git a/src/app-layer-enip-common.h b/src/app-layer-enip-common.h
index 90c744af0357264b42d3a1301a077674b24590b8..7cfd8d9785408a73f396839dbd5a4a6b59d22a46 100644 (file)
--- a/src/app-layer-enip-common.h
+++ b/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

diff --git a/src/app-layer-enip.h b/src/app-layer-enip.h
index d31cfb3aad0b31fc6cc6785985102ed2532b6119..25cb1d5745dab62975650439e426a30fcd64cb81 100644 (file)
--- a/src/app-layer-enip.h
+++ b/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);

diff --git a/src/app-layer-frames.c b/src/app-layer-frames.c
index 97ef816e795acdbb9193a1bd21cbdb0ebd695d56..9a79edf50e7e0a78147b3d299d749a134676d387 100644 (file)
--- a/src/app-layer-frames.c
+++ b/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)
 {

diff --git a/src/app-layer-frames.h b/src/app-layer-frames.h
index 746c7296926cba6fd2f1338a1ee71b144aa1e070..23cba1753a74300e94f5cada0d0cf81ae2f00ae9 100644 (file)
--- a/src/app-layer-frames.h
+++ b/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;
 

diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
index 6b3bc5c112af6a8e50a0f2f8b7eb1bc32a7df57a..6231ea514a81b1a0fe7efb206e910d1e9c167a92 100644 (file)
--- a/src/app-layer-ftp.c
+++ b/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"

diff --git a/src/app-layer-htp-body.c b/src/app-layer-htp-body.c
index 524aed3578e10beb2f2dc59145388f11a77c27bd..7e645f32fbbbec23473f49508e7adcac0d524ad8 100644 (file)
--- a/src/app-layer-htp-body.c
+++ b/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"

diff --git a/src/app-layer-htp-file.c b/src/app-layer-htp-file.c
index 5d4ef9add899a3625803b4817df89b2d2f8b6a8b..8a79d9840cf9f3ef52cc69d4556eb0a11c08a9aa 100644 (file)
--- a/src/app-layer-htp-file.c
+++ b/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"

diff --git a/src/app-layer-htp-libhtp.h b/src/app-layer-htp-libhtp.h
index 8f321152a2f2d40a1044142e0b78e2cd310f1054..c4a3c991f74be2c7352047f24ec385524b4e148d 100644 (file)
--- a/src/app-layer-htp-libhtp.h
+++ b/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);

diff --git a/src/app-layer-htp-mem.h b/src/app-layer-htp-mem.h
index 414b48821a74719e7b48963209fac88f300d80ce..5df67f824d8718c1cd4705ccfaea79ced2581fa2 100644 (file)
--- a/src/app-layer-htp-mem.h
+++ b/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);

diff --git a/src/app-layer-htp-range.h b/src/app-layer-htp-range.h
index cda202294d2df5cffc98e4c383a0ae86c495492c..1770510b05dc4930a724e44741367b8c21bd0d6d 100644 (file)
--- a/src/app-layer-htp-range.h
+++ b/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);

diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index 9f64a05c6a81e7c76f21bd716b02f9d965f87063..cfe1302bb854518089b994af1ecebe0bc10d235b 100644 (file)
--- a/src/app-layer-htp.c
+++ b/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"
 

diff --git a/src/app-layer-htp.h b/src/app-layer-htp.h
index 0891711a3ec649208e335a8975c2d2ff0ea6f4ee..7f2389213c5dfb4c6164701267c8d7de5883ba25 100644 (file)
--- a/src/app-layer-htp.h
+++ b/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>
 

diff --git a/src/app-layer-modbus.c b/src/app-layer-modbus.c
index 26e9b112065605a59c96bc8df1339182f01a3579..0f608c9c093199314ae2a606991d6924e7e554e9 100644 (file)
--- a/src/app-layer-modbus.c
+++ b/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);
 

diff --git a/src/app-layer-nbss.h b/src/app-layer-nbss.h
index 7ae8f2b44d606e78a73d1f6001994ba62401e1d5..198279ef112a9f256162a24eb400474ee56e51f4 100644 (file)
--- a/src/app-layer-nbss.h
+++ b/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

diff --git a/src/app-layer-nfs-udp.c b/src/app-layer-nfs-udp.c
index 5bfddeb96364a836c4e8828e7dcb2fa73adb9e72..b972803034c6590fbefafb5996de1c820ef66f49 100644 (file)
--- a/src/app-layer-nfs-udp.c
+++ b/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"
 

diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
index 59a0c13aeac73cda9cd4a88b7dca7c6e78b339b0..57e19a057e6cea01a6dfd5821b4f801168c7113e 100644 (file)
--- a/src/app-layer-parser.c
+++ b/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"

diff --git a/src/app-layer-parser.h b/src/app-layer-parser.h
index daeaa31431ec2607c5c5d2a0ee3ca3adafa4e4be..e47051753262a0c917181754e5ec5631abfc2ec8 100644 (file)
--- a/src/app-layer-parser.h
+++ b/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"
 

diff --git a/src/app-layer-register.c b/src/app-layer-register.c
index 70649e7a8495d55da454876de5d5d385fe2606bd..12fd2bb31c368d95ad0d269057150caa2438b152 100644 (file)
--- a/src/app-layer-register.c
+++ b/src/app-layer-register.c
@@ -24,6 +24,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "stream.h"
 #include "conf.h"
 

diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c
index f5ab4ca13ba9954338cddb339f8c8ad1c5ca4d16..efc918df7be6a985bb544c8a2e80d0046f7e593d 100644 (file)
--- a/src/app-layer-smtp.c
+++ b/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"

diff --git a/src/app-layer-smtp.h b/src/app-layer-smtp.h
index 148b2a1b75afdc784d4eab1518f6d67b40f74eb1..af6550b560d93d9f0731a6bfc424405c5026ab1a 100644 (file)
--- a/src/app-layer-smtp.h
+++ b/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"
 

diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c
index cfc1a0c06df1cc1e633647b32b6ca74cfbd2123d..c573c5b55dc14b99e7916ddc8bb56f84aa7b1073 100644 (file)
--- a/src/app-layer-ssh.c
+++ b/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"

diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c
index 6ccc1c94e50ba3efb18b45f202d44c56fb8620c9..1cebb2bd2c16914a415482bbcda8e87af4d111cc 100644 (file)
--- a/src/app-layer-ssl.c
+++ b/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"

diff --git a/src/app-layer-ssl.h b/src/app-layer-ssl.h
index d7e769e5b9055ded8081277ba6519915dac39bf0..0a8c0db35c10b8a25600dc38a3863eef5d96f884 100644 (file)
--- a/src/app-layer-ssl.h
+++ b/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 */

diff --git a/src/app-layer-template.c b/src/app-layer-template.c
index c28706f156a900716178c5f0e7d6470ae3297c6a..d53a0e6cf78607f9e26f972e8ce6e0c4ef336910 100644 (file)
--- a/src/app-layer-template.c
+++ b/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. */

diff --git a/src/app-layer-template.h b/src/app-layer-template.h
index 461a7e46db4529677d0867d13eb73616139e9aa6..3c28278426e5d54c7cad567b83dc7faaf1bf5e49 100644 (file)
--- a/src/app-layer-template.h
+++ b/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"
 

diff --git a/src/app-layer-tftp.c b/src/app-layer-tftp.c
index 7c8ea7cce663a7936c8f8e2f8640ba3f5532c4b9..37b1846bbbb996db083f48f00c692d4db4e6b914 100644 (file)
--- a/src/app-layer-tftp.c
+++ b/src/app-layer-tftp.c
@@ -26,6 +26,7 @@
 
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "stream.h"
 #include "conf.h"
 

diff --git a/src/app-layer.h b/src/app-layer.h
index 27532dc8b40c7c8bfbcca68d54f1c0a80715e1fc..6a8889640cb56a518e56f738254886e3147e6717 100644 (file)
--- a/src/app-layer.h
+++ b/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"
 

diff --git a/src/decode-erspan.h b/src/decode-erspan.h
index 5b4af04ea89ae8e5f32cbddaf36e501dd98b1e72..d92965db027fce812c46d6d22ea288d275a95999 100644 (file)
--- a/src/decode-erspan.h
+++ b/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;

diff --git a/src/decode-gre.h b/src/decode-gre.h
index 8cec9207f5a83853695d5b1fbd8daf0472c70b8a..adf576fbd980d0aeb807cc239f82802c96f9ae9e 100644 (file)
--- a/src/decode-gre.h
+++ b/src/decode-gre.h
@@ -30,8 +30,6 @@
 #define IPPROTO_GRE 47
 #endif
 
-#include "decode.h"
-#include "threadvars.h"
 
 typedef struct GREHdr_
 {

diff --git a/src/decode-icmpv4.h b/src/decode-icmpv4.h
index ed24fce06665fa19d6c04c8f740b63bbbd7dc628..f3a94ad2e5942ee15a0ab6c0dc278e6e91ae3d1f 100644 (file)
--- a/src/decode-icmpv4.h
+++ b/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

diff --git a/src/decode-icmpv6.h b/src/decode-icmpv6.h
index 3b836499b5d3dd172afb44d5796df4c37dd55843..aa66c1f64a3efe29ba54104500871f5f1f663768 100644 (file)
--- a/src/decode-icmpv6.h
+++ b/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"
 

diff --git a/src/decode-nsh.h b/src/decode-nsh.h
index e9c6af065be9f76e672d6f64e96c426d219f5903..a45cce3029e0db84e35907382af580d6c2b9c5b6 100644 (file)
--- a/src/decode-nsh.h
+++ b/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

diff --git a/src/decode-null.c b/src/decode-null.c
index efb4adf29b36e1db15cd54d5e8db69ccf4016f12..dc7051edc3f6cba9c3849cefd40fd48c01db4aae 100644 (file)
--- a/src/decode-null.c
+++ b/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 */
-}
 /**
  * @}
  */

diff --git a/src/decode-null.h b/src/decode-null.h
index 22d988c72481a8ca5da4ad24080f9101c01f9feb..a0f465d493699a216b9c338321da291426155e37 100644 (file)
--- a/src/decode-null.h
+++ b/src/decode-null.h
@@ -23,5 +23,5 @@
 
 #ifndef __DECODE_NULL_H__
 #define __DECODE_NULL_H__
-void DecodeNullRegisterTests(void);
+
 #endif /* __DECODE_NULL_H__ */

diff --git a/src/decode-pppoe.h b/src/decode-pppoe.h
index 44550ad1122e5a3a119b0173811a67a7bf3b3531..836d4a30c35016982805dfa3dbd5fc9570366db5 100644 (file)
--- a/src/decode-pppoe.h
+++ b/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

diff --git a/src/decode-template.h b/src/decode-template.h
index 5ee42e8cfe14cab8a2bf08682ac140f7784f6080..9ce0be415fb86bf34ea8ec1f21e88958aca9d28f 100644 (file)
--- a/src/decode-template.h
+++ b/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. */

diff --git a/src/decode.c b/src/decode.c
index 3f6a3a674bd3af3293a6551ff821c2b5f9bdbe07..df0c6ab37bbe2298388801a427e8ec8075cf16a9 100644 (file)
--- a/src/decode.c
+++ b/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"

diff --git a/src/decode.h b/src/decode.h
index 010c3ad6296812384a7f2efddf3e70fe00c60086..cc8ee21d84dc9835561f5c8c6803fe35acc45895 100644 (file)
--- a/src/decode.h
+++ b/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_;

diff --git a/src/defrag.h b/src/defrag.h
index 856e0d41f41efff7b1348edba9185cc3a7b7fc4c..fe452dec32e93dc26bf70ddcfb77c0efe37a20ef 100644 (file)
--- a/src/defrag.h
+++ b/src/defrag.h
@@ -24,7 +24,6 @@
 #ifndef __DEFRAG_H__
 #define __DEFRAG_H__
 
-#include "tree.h"
 #include "util-pool.h"
 
 /**

diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c
index a581812e2114a9583d6d1e0c160eece8c1c76c9a..ab19162514af6bbaa933db44a04d20d02dcc329d 100644 (file)
--- a/src/detect-app-layer-event.c
+++ b/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"

diff --git a/src/detect-app-layer-protocol.c b/src/detect-app-layer-protocol.c
index b99e8ecf34f85ad19fb58290b4a604d41fddb213..b51d99b86a9c5365c99688deb993dbfedd5a36fd 100644 (file)
--- a/src/detect-app-layer-protocol.c
+++ b/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"

diff --git a/src/detect-base64-data.c b/src/detect-base64-data.c
index d8df651e9298d314f281432f06820f1556c9c0b1..b69dcdbb5b83a03a80e942c50480790db48be9c0 100644 (file)
--- a/src/detect-base64-data.c
+++ b/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"
 

diff --git a/src/detect-base64-decode.c b/src/detect-base64-decode.c
index d82d2da507bfba6050be449687c52d9f60098984..ebbe9558151c354f376bfeb1471cb0c107a99f44 100644 (file)
--- a/src/detect-base64-decode.c
+++ b/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

diff --git a/src/detect-base64-decode.h b/src/detect-base64-decode.h
index e8a117c215b257988aa4ba64707702a2011301a7..a5be8710b89fb97ddd0411171fffab125bcff1b4 100644 (file)
--- a/src/detect-base64-decode.h
+++ b/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;

diff --git a/src/detect-byte-extract.c b/src/detect-byte-extract.c
index b96c43b225e8bc0b0c47b0dc4e1ddce95b4061d1..e4e07952c489427cb3e8b1ba9c72ac59a5a2287d 100644 (file)
--- a/src/detect-byte-extract.c
+++ b/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"
 

diff --git a/src/detect-bytejump.c b/src/detect-bytejump.c
index 02072bab57f681e8fb2d2d465de93461ef27135a..9ca8da411f44500c80c65a39d8fdc678cbbd6e25 100644 (file)
--- a/src/detect-bytejump.c
+++ b/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

diff --git a/src/detect-bytemath.c b/src/detect-bytemath.c
index 316a4e0413cce855290f7f9bc733388cb9b356fe..649b5dc09588f24b1200c5ac3e2dd5c955d0f273 100644 (file)
--- a/src/detect-bytemath.c
+++ b/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"
 

diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c
index e84822d4e23697f2265aa1e9701f3c06266dac76..71506fd4eeb7f6ca14886bbbf97deabdd5f6946e 100644 (file)
--- a/src/detect-bytetest.c
+++ b/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"

diff --git a/src/detect-cipservice.h b/src/detect-cipservice.h
index fc6c5aaf7004a5dbdae51a564802536660ad7e9f..9c774104a819b79b778b38efe891227a3a8c2173 100644 (file)
--- a/src/detect-cipservice.h
+++ b/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

diff --git a/src/detect-content.c b/src/detect-content.c
index b457a83a992b9bd7aebeada05900ee5b9d5f9c8e..d3c7935e116b8a4dde8d3a02928d04cd87d09b13 100644 (file)
--- a/src/detect-content.c
+++ b/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"

diff --git a/src/detect-csum.c b/src/detect-csum.c
index ed4e58d854d9da63ae872f0f8effbcce64231925..5de0842b95dd41e7ddfe9c6320c7ba95609cac56 100644 (file)
--- a/src/detect-csum.c
+++ b/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 *,

diff --git a/src/detect-dce-iface.c b/src/detect-dce-iface.c
index 6f28f3309fb382baed384eee48c8a8b43ecd5169..431c1925f538ad8912b255fbb3d0b7adab76bc78 100644 (file)
--- a/src/detect-dce-iface.c
+++ b/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"

diff --git a/src/detect-dce-iface.h b/src/detect-dce-iface.h
index 0cbbb728f71d9d02748c4fc406fe2f6ddf692210..edaded404442035a62f2166ec55a36d75afbc419 100644 (file)
--- a/src/detect-dce-iface.h
+++ b/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);
 

diff --git a/src/detect-dce-opnum.c b/src/detect-dce-opnum.c
index 09ea401bdae79173aaf9daf0a1f5f8dd12249bbd..6b91cefa85b49880bbaefda5287ebb0a003faa76 100644 (file)
--- a/src/detect-dce-opnum.c
+++ b/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"

diff --git a/src/detect-dce-opnum.h b/src/detect-dce-opnum.h
index 5f3db11802e80107e2150253695fefd998d50cc6..1072a60bba62fb4b059b8b51f27ec9973bd56ba8 100644 (file)
--- a/src/detect-dce-opnum.h
+++ b/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);
 

diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c
index c87ca9d078e672c9a78facb741fc38d51fa67270..411009d320a751154b2138dd4e7f7ea441fde09f 100644 (file)
--- a/src/detect-dce-stub-data.c
+++ b/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"
 

diff --git a/src/detect-dce-stub-data.h b/src/detect-dce-stub-data.h
index 13de6ff56a80c8801a7c93b373270ad94b01f27e..035fa258a558f492c1c3736bfac3ad8091504e4e 100644 (file)
--- a/src/detect-dce-stub-data.h
+++ b/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);
 

diff --git a/src/detect-detection-filter.c b/src/detect-detection-filter.c
index 557f72b89ba56a1e604c13c07db637c8cd9b7b2a..61198bcbabbe076c7e89875f6658e35f6159d80f 100644 (file)
--- a/src/detect-detection-filter.c
+++ b/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

diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c
index ee73ebf89f2fb8b95f81eb8af1d9d28d8ff858a8..042dc058ebd5286555f0002f3cb7d05d0bbf0f77 100644 (file)
--- a/src/detect-dnp3.c
+++ b/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;

diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index 8faa935fe4bde76d591e6b6b2f8c6936a50f4c13..10cd19b008567fd78e64dd46c5abd4bf6753ca18 100644 (file)
--- a/src/detect-dns-query.c
+++ b/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"

diff --git a/src/detect-dsize.c b/src/detect-dsize.c
index b2e84c063583ddf8f7fa1744e574d40e564b80a1..8702f99493142650196a2f9b032f85f613f2894b 100644 (file)
--- a/src/detect-dsize.c
+++ b/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"
 

diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 103bbc8f713b61aa6ad2a90dcdbcb8554f868ad8..8376286612a55589d5f7829b67931e3098b967a7 100644 (file)
--- a/src/detect-engine-analyzer.c
+++ b/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;

diff --git a/src/detect-engine-build.c b/src/detect-engine-build.c
index b9fb4ca6c79da9bedf19b0db05f60df2e4ba8e86..5458ec4a26bb1794411338e27b6757344626270a 100644 (file)
--- a/src/detect-engine-build.c
+++ b/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)
 {

diff --git a/src/detect-engine-dcepayload.c b/src/detect-engine-dcepayload.c
index a44fb75e427505c554c07c192574133a9ca3149d..1e865ced25f28948f1f9b1f154701647641e18ad 100644 (file)
--- a/src/detect-engine-dcepayload.c
+++ b/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"
 

diff --git a/src/detect-engine-event.h b/src/detect-engine-event.h
index 3f52753bc54657c1d326e85541b717e109096e94..178af0472ffbb814cd7574fe844645c7faac88bf 100644 (file)
--- a/src/detect-engine-event.h
+++ b/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;

diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c
index 29c98cc80237e9343b698b269a38472ecbaa2a75..e6bbbca3657667c813358b38343fe8a93ad10e2e 100644 (file)
--- a/src/detect-engine-iponly.c
+++ b/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"

diff --git a/src/detect-engine-loader.c b/src/detect-engine-loader.c
index f6c6b74739b5a1218d1f4e4fc7031fc947908972..1ae1a5e28cd86739ff36762d60ae2167f02aa4e3 100644 (file)
--- a/src/detect-engine-loader.c
+++ b/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"

diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h
index 2aa2e1a666643de11d7bd76ebad9d1bfb4a8c5dd..15746ae34103afba1c91a614e57a4d9d77fb4206 100644 (file)
--- a/src/detect-engine-mpm.h
+++ b/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);

diff --git a/src/detect-engine-payload.c b/src/detect-engine-payload.c
index 110ac6c26faaf3a0c3b7085d801130dd5393949d..a0d4aea981086d943308884b660b4ec697a1e1b5 100644 (file)
--- a/src/detect-engine-payload.c
+++ b/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"

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
index d473fb06c1cf800c5044ede4c58cb6059eb98f6c..e0d8eefa6173afeb3b58162e5227e3539d1a51cd 100644 (file)
--- a/src/detect-engine-register.c
+++ b/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"
 

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index b9e00f777ebee03dc46de730f3541303e6b31eca..7a895104f276402b20471e7676cfca9c4f3f4d38 100644 (file)
--- a/src/detect-engine-siggroup.c
+++ b/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"

diff --git a/src/detect-engine-sigorder.c b/src/detect-engine-sigorder.c
index 469af1f60b82b8b67074f947e66d2713de1b7d1f..53ac1fdbe51a45b8bedac1215e6722b5cf9d5744 100644 (file)
--- a/src/detect-engine-sigorder.c
+++ b/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"

diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c
index e18ade0f1fb54c30ccf2c596cbd2cc79bbdcc398..9d55d8abfaa835200549137c410bb929f3ba3ab1 100644 (file)
--- a/src/detect-engine-state.c
+++ b/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"
 

diff --git a/src/detect-engine-tag.c b/src/detect-engine-tag.c
index 66409d17bdc94a47366fd58f6155aed8bb9b4831..d445560f3914b9db73e6b3b5d2d12864d48a3d4e 100644 (file)
--- a/src/detect-engine-tag.c
+++ b/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"

diff --git a/src/detect-engine-tag.h b/src/detect-engine-tag.h
index 93243cef1ed064699fdebd34e6958a9fd853c30d..19ddaa121b21f26a186ca1020449d023fb62fb48 100644 (file)
--- a/src/detect-engine-tag.h
+++ b/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

diff --git a/src/detect-engine.c b/src/detect-engine.c
index bbdaa53a09589dadca85bc942b37adc288d3844a..81250cc758a14a1f0e729cb089b8bd96009440b0 100644 (file)
--- a/src/detect-engine.c
+++ b/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"

diff --git a/src/detect-engine.h b/src/detect-engine.h
index a55b140d956f6c6aacaf2962c35f35c73be49154..ab1e05ce954be3ad8228500287c7065e9db549ad 100644 (file)
--- a/src/detect-engine.h
+++ b/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,

diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c
index f6302af6ecb7e03ab5452da59ab760103e3dbdb4..373682bf0028d7254bc2135e1889bf30b75eba61 100644 (file)
--- a/src/detect-fast-pattern.c
+++ b/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"

diff --git a/src/detect-fileext.c b/src/detect-fileext.c
index 2ddd55ccc85f210465c53d7e927edbfcff9bf0f1..b2be82d7e00438c66e0719f53566d629b2c92d6f 100644 (file)
--- a/src/detect-fileext.c
+++ b/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"

diff --git a/src/detect-fileext.h b/src/detect-fileext.h
index 4981763bba4f5c67882da682257486c641054393..f202fca0eeb7e04feeca6b0c47c76b10910d33f2 100644 (file)
--- a/src/detect-fileext.h
+++ b/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 */

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index 8b40f06ab49f8aa1a27a1bf507f64e700a112e6c..502383b39ee2d7cdfa7af1f22c0fbf2ce3ec67cb 100644 (file)
--- a/src/detect-filemagic.c
+++ b/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"

diff --git a/src/detect-filename.c b/src/detect-filename.c
index 382881034eb603070b89926fa967575cc81a3999..5dda5db58042370e6221a0ec1d707f8938a20d3e 100644 (file)
--- a/src/detect-filename.c
+++ b/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"

diff --git a/src/detect-filesize.c b/src/detect-filesize.c
index 044dc8bbfe2cc136394b98b77e26a312ccff04df..50e84671fe62aa798a3f811c324b888db41353eb 100644 (file)
--- a/src/detect-filesize.c
+++ b/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"

diff --git a/src/detect-flow.c b/src/detect-flow.c
index 897d5d3ac3cea87af3f6e499bc779eb1e6dd63a7..e6bcab26addf7de964c66119ef6a6b1330d94325 100644 (file)
--- a/src/detect-flow.c
+++ b/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"

diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c
index 92944574684e5b7aac7ee32e9d4ba0ba466a15e1..c7516f765261750cadd3a4dd38d5ac4ce238550d 100644 (file)
--- a/src/detect-flowbits.c
+++ b/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"

diff --git a/src/detect-flowint.c b/src/detect-flowint.c
index ad80c122c1860c1a272c77324a1c13aed2e5b1e6..631fafc1061881f426b0a1d34b0b8c6c158fcd3a 100644 (file)
--- a/src/detect-flowint.c
+++ b/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"

diff --git a/src/detect-flowvar.c b/src/detect-flowvar.c
index 751e48ac72659f993db50c32ff7758786f7a1959..c997276beafdcf629dd75bc3fa79b6baa69840c7 100644 (file)
--- a/src/detect-flowvar.c
+++ b/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;

diff --git a/src/detect-fragbits.h b/src/detect-fragbits.h
index e2d77cc29b144ec9963f5356f57c405313eece32..1ab6cae310e3527b04fb19e021fc9379541b8a08 100644 (file)
--- a/src/detect-fragbits.h
+++ b/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_

diff --git a/src/detect-fragoffset.c b/src/detect-fragoffset.c
index f2f1eb2d4223ad1c558f7cd8dd3b911171030fe2..c3e4268bf8b704d36929dca0d619c9462e71e3d2 100644 (file)
--- a/src/detect-fragoffset.c
+++ b/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"
 

diff --git a/src/detect-ftpbounce.c b/src/detect-ftpbounce.c
index 3f556cedaa123fd2ff93a3c68f4f3144eeb4d167..cf74dd59f5f8c3ede749d9b7674ce2d4bbfbec84 100644 (file)
--- a/src/detect-ftpbounce.c
+++ b/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"

diff --git a/src/detect-ftpdata.h b/src/detect-ftpdata.h
index 0f03ee1c97277eb0072b5cba4a2fc60c9e6af3d3..aa16215973c99ef1757f2baf5b8405bb144f2ff8 100644 (file)
--- a/src/detect-ftpdata.h
+++ b/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.

diff --git a/src/detect-geoip.h b/src/detect-geoip.h
index 24ba075734d0d516c7fa7979dfd8835da8d7995c..4ec97b5df8686828d408ca93ac677a6bf3d2101e 100644 (file)
--- a/src/detect-geoip.h
+++ b/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

diff --git a/src/detect-gid.h b/src/detect-gid.h
index aa9a8f9d1f0f8c5e58e276b473497b71174e69d1..fa714ef8f5cfb0306f39e6b7714084d67311a146 100644 (file)
--- a/src/detect-gid.h
+++ b/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

diff --git a/src/detect-hostbits.c b/src/detect-hostbits.c
index af3287b4f2f2d444b48e508ea1d15350db4e4e35..cb3747aeb893ce9ec1c2ca2bbaf9fa9518ecbee4 100644 (file)
--- a/src/detect-hostbits.c
+++ b/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"

diff --git a/src/detect-http-headers-stub.h b/src/detect-http-headers-stub.h
index 9cae4433e7b97a8bb16f2fcdac005c005b4b8dce..d1f472718acf21abd5bf592a96727d976d175c52 100644 (file)
--- a/src/detect-http-headers-stub.h
+++ b/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;
 

diff --git a/src/detect-http2.c b/src/detect-http2.c
index 75af58c43f9f535821de2e46399d991298147598..bcc23a39886171833f412b63816ccd3b6591632b 100644 (file)
--- a/src/detect-http2.c
+++ b/src/detect-http2.c
@@ -26,6 +26,8 @@
 
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
+
 #include "detect-engine.h"
 #include "detect-engine-uint.h"
 #include "detect-engine-mpm.h"

diff --git a/src/detect-icmp-id.c b/src/detect-icmp-id.c
index 7e943ca0b4220a2b992a7bf716c35db37f49fe22..31cd636a94f841b2a976676508fe42f4b278c19f 100644 (file)
--- a/src/detect-icmp-id.c
+++ b/src/detect-icmp-id.c
@@ -30,6 +30,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "detect-icmp-id.h"
 

diff --git a/src/detect-icmp-seq.c b/src/detect-icmp-seq.c
index d4f2fcf7b2bfe146204bcc79527cd8801be683a6..69814b43a9dccac5400e46fc283087994d2ec459 100644 (file)
--- a/src/detect-icmp-seq.c
+++ b/src/detect-icmp-seq.c
@@ -30,6 +30,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "detect-icmp-seq.h"
 

diff --git a/src/detect-icode.c b/src/detect-icode.c
index 6a42c0c40ba277e7d94b9168fbe398a0c9427e04..1bf6cf07bd4edb3ab3d95388de8468fdd168077c 100644 (file)
--- a/src/detect-icode.c
+++ b/src/detect-icode.c
@@ -31,6 +31,7 @@
 #include "detect-parse.h"
 #include "detect-engine-prefilter-common.h"
 #include "detect-engine-uint.h"
+#include "detect-engine-build.h"
 
 #include "detect-icode.h"
 

diff --git a/src/detect-ipopts.h b/src/detect-ipopts.h
index 2c599d82e2e4a4b4fda81d6bf2d2a949e1816283..4089ea5ad6552e88d92b07b68bfaa621332851b0 100644 (file)
--- a/src/detect-ipopts.h
+++ b/src/detect-ipopts.h
@@ -24,8 +24,6 @@
 #ifndef __DETECT_IPOPTS_H__
 #define __DETECT_IPOPTS_H__
 
-#include "decode-events.h"
-#include "decode-ipv4.h"
 
 /**
  * \struct DetectIpOptsData_

diff --git a/src/detect-ipproto.c b/src/detect-ipproto.c
index f8174194de7b9bc408bb95d3003e73d042280a30..33f7a82ea661719b097f6b54a305a3655802a933 100644 (file)
--- a/src/detect-ipproto.c
+++ b/src/detect-ipproto.c
@@ -33,6 +33,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-build.h"
 
 #include "detect-engine-siggroup.h"
 #include "detect-engine-address.h"

diff --git a/src/detect-iprep.c b/src/detect-iprep.c
index 2474ff17d7aa400d17cdc3d7df62ac8736e04e21..59c3d1aec39d3800aa834817d6e1aa36d953fc73 100644 (file)
--- a/src/detect-iprep.c
+++ b/src/detect-iprep.c
@@ -40,6 +40,7 @@
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 #include "detect-engine-uint.h"
+#include "detect-engine-build.h"
 
 #include "util-debug.h"
 #include "util-byte.h"

diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c
index 67dfd746404417a0b00620a33a759516ea6d6cb1..91d50e1a0f75de6fd65cf8e6688d9c838cc3d6c6 100644 (file)
--- a/src/detect-isdataat.c
+++ b/src/detect-isdataat.c
@@ -37,6 +37,7 @@
 #include "detect-isdataat.h"
 #include "detect-content.h"
 #include "detect-uricontent.h"
+#include "detect-engine-build.h"
 
 #include "flow.h"
 #include "flow-var.h"

diff --git a/src/detect-itype.c b/src/detect-itype.c
index 0a404bef2a700a4ef4fcec611c5d7bcc64bee2ea..03fa5462aa7b81166cf6ae09cbf9d40104ac2760 100644 (file)
--- a/src/detect-itype.c
+++ b/src/detect-itype.c
@@ -30,6 +30,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "detect-itype.h"
 #include "detect-engine-uint.h"

diff --git a/src/detect-l3proto.c b/src/detect-l3proto.c
index 87ef8b6cf8f2fdc3009a4b0a358ad55e45d2498a..78e7c07e8c204513b223b075b4fa1cce29470969 100644 (file)
--- a/src/detect-l3proto.c
+++ b/src/detect-l3proto.c
@@ -34,6 +34,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-build.h"
 
 #include "detect-engine-siggroup.h"
 #include "detect-engine-address.h"
@@ -369,4 +370,4 @@ static void DetectL3protoRegisterTests(void)
     UtRegisterTest("DetectL3protoTestSig2", DetectL3protoTestSig2);
     UtRegisterTest("DetectL3protoTestSig3", DetectL3protoTestSig3);
 }
-#endif /* UNITTESTS */
\ No newline at end of file
+#endif /* UNITTESTS */

diff --git a/src/detect-lua.c b/src/detect-lua.c
index 4d055981ed6351501104884ee47d5dc11eeaea63..e3c27228408e1610832c881eb58bc9192896db4b 100644 (file)
--- a/src/detect-lua.c
+++ b/src/detect-lua.c
@@ -35,6 +35,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"

diff --git a/src/detect-mark.h b/src/detect-mark.h
index 1c456a4843679c9d5e7ee1839194658f7aee2386..b8de378fd20d20ee607941f1349097abd8c2c086 100644 (file)
--- a/src/detect-mark.h
+++ b/src/detect-mark.h
@@ -28,8 +28,6 @@
 #ifndef __DETECT_MARK_H__
 #define __DETECT_MARK_H__
 
-#include "decode.h"
-#include "detect.h"
 
 /**
  * \struct DetectMarkData_

diff --git a/src/detect-nocase.c b/src/detect-nocase.c
index 60f7330597aaf17ca41b8e95a57f0418d439f5e1..b2d8b834a0c9d83113ffc6a34365d2c552d9c867 100644 (file)
--- a/src/detect-nocase.c
+++ b/src/detect-nocase.c
@@ -24,6 +24,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 
 #include "detect.h"

diff --git a/src/detect-parse.c b/src/detect-parse.c
index 32d7a5ee5296fcc55588c8bbb1c6209d8b60bac5..3fd1d9934cace1973e5ba9c0d0f559a9e0a8229d 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -32,6 +32,7 @@
 #include "detect-engine-port.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 
 #include "detect-content.h"
 #include "detect-pcre.h"

diff --git a/src/detect-pcre.c b/src/detect-pcre.c
index ea5da8b3a9a4503383d3b08868b72721ed34cd99..2df85d8711043346763ec07579710d38ab0e1327 100644 (file)
--- a/src/detect-pcre.c
+++ b/src/detect-pcre.c
@@ -36,10 +36,12 @@
 #include "detect-flowvar.h"
 
 #include "detect-parse.h"
+#include "detect-content.h"
 #include "detect-engine.h"
 #include "detect-engine-sigorder.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 
 #include "util-var-name.h"
 #include "util-unittest-helper.h"

diff --git a/src/detect-pktvar.c b/src/detect-pktvar.c
index ca2e61a8ff82fb139f941e3376db3e1e8744fcc9..2b3abac1d7818dd940a61ac332c227bc56c8ef5e 100644 (file)
--- a/src/detect-pktvar.c
+++ b/src/detect-pktvar.c
@@ -35,6 +35,7 @@
 #include "detect-content.h"
 #include "util-spm.h"
 #include "util-debug.h"
+#include "util-var-name.h"
 
 #define PARSE_REGEX         "(.*),(.*)"
 static DetectParseRegex parse_regex;

diff --git a/src/detect-quic-cyu-hash.c b/src/detect-quic-cyu-hash.c
index 50a8170ac12e0228925e2cf161681ab3210092a0..095453037a604ddd17db443cc94bbe86f8e1a945 100644 (file)
--- a/src/detect-quic-cyu-hash.c
+++ b/src/detect-quic-cyu-hash.c
@@ -23,11 +23,14 @@
 #include "suricata-common.h"
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
+
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-quic-cyu-hash.h"
+#include "detect-engine-build.h"
 #include "rust.h"
 
 #ifdef UNITTESTS

diff --git a/src/detect-quic-cyu-string.c b/src/detect-quic-cyu-string.c
index 7e27ecd698dc9d3a19dfcaaf18120fa893f20a55..6a49f2667a20eda9e4d19aa16791629843fd801b 100644 (file)
--- a/src/detect-quic-cyu-string.c
+++ b/src/detect-quic-cyu-string.c
@@ -28,6 +28,7 @@
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"
 #include "detect-quic-cyu-string.h"
+#include "detect-engine-build.h"
 #include "rust.h"
 
 #ifdef UNITTESTS

diff --git a/src/detect-reference.h b/src/detect-reference.h
index dbab5af00a56a7308066b775a9e4337a842eae1c..ddf9233987cbd51b21cb0394955d7947d16c6cee 100644 (file)
--- a/src/detect-reference.h
+++ b/src/detect-reference.h
@@ -24,9 +24,6 @@
 #ifndef __DETECT_REFERENCE_H__
 #define __DETECT_REFERENCE_H__
 
-#include "decode-events.h"
-#include "decode-ipv4.h"
-#include "decode-tcp.h"
 
 /**
  * \brief Signature reference list.

diff --git a/src/detect-replace.c b/src/detect-replace.c
index a7384475a0e80491a68041b1bed22942387a65b8..4164a651a93fa2ad17d5053052604e02fa8dd894 100644 (file)
--- a/src/detect-replace.c
+++ b/src/detect-replace.c
@@ -45,6 +45,7 @@ extern int run_mode;
 #include "detect-engine-mpm.h"
 #include "detect-engine.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 
 #include "util-checksum.h"
 
@@ -862,4 +863,4 @@ void DetectReplaceRegisterTests(void)
     UtRegisterTest("DetectReplaceParseTest06", DetectReplaceParseTest06);
     UtRegisterTest("DetectReplaceParseTest07", DetectReplaceParseTest07);
 }
-#endif /* UNITTESTS */
\ No newline at end of file
+#endif /* UNITTESTS */

diff --git a/src/detect-replace.h b/src/detect-replace.h
index ab858419c9f8137925c043c248af5af50ab81b08..c444188c094880ce800837ab4b48f948e6ab7646 100644 (file)
--- a/src/detect-replace.h
+++ b/src/detect-replace.h
@@ -24,6 +24,8 @@
 #ifndef __DETECT_REPLACE_H__
 #define __DETECT_REPLACE_H__
 
+#include "detect-content.h"
+
 DetectReplaceList * DetectReplaceAddToList(DetectReplaceList *replist, uint8_t *found, DetectContentData *cd);
 
 /* Internal functions are only called via the inline functions below. */

diff --git a/src/detect-rpc.c b/src/detect-rpc.c
index 8f56f723a04f63e0c0943f55ca24fb8d620b53af..6ccc7086dfe14a92737970a825c2f3c3ea792e40 100644 (file)
--- a/src/detect-rpc.c
+++ b/src/detect-rpc.c
@@ -34,6 +34,7 @@
 #include "detect-engine-mpm.h"
 #include "detect-engine-siggroup.h"
 #include "detect-engine-address.h"
+#include "detect-engine-build.h"
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"

diff --git a/src/detect-sameip.c b/src/detect-sameip.c
index 15363365ca802c384c27759d87aae39d1a743cad..d15c48d3eb3151469aad7f8cf28d156d5ecff64f 100644 (file)
--- a/src/detect-sameip.c
+++ b/src/detect-sameip.c
@@ -31,6 +31,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-build.h"
 
 #include "detect-sameip.h"
 
@@ -174,4 +175,4 @@ static void DetectSameipRegisterTests(void)
 {
     UtRegisterTest("DetectSameipSigTest01", DetectSameipSigTest01);
 }
-#endif /* UNITTESTS */
\ No newline at end of file
+#endif /* UNITTESTS */

diff --git a/src/detect-snmp-community.h b/src/detect-snmp-community.h
index c7b82c86f3ddafef7f6ec615b86eb48fc90b6ad5..11de2abbf99ab9ad19bea883155bacdc59751ac1 100644 (file)
--- a/src/detect-snmp-community.h
+++ b/src/detect-snmp-community.h
@@ -24,7 +24,6 @@
 #ifndef __DETECT_SNMP_COMMUNITY_H__
 #define __DETECT_SNMP_COMMUNITY_H__
 
-#include "app-layer-snmp.h"
 
 void DetectSNMPCommunityRegister(void);
 

diff --git a/src/detect-snmp-pdu_type.h b/src/detect-snmp-pdu_type.h
index 8aee17fb0d74246c4f3d64e657f4adaffaa679df..5197885a588b5daa74e059cf4a9eae23e321e18a 100644 (file)
--- a/src/detect-snmp-pdu_type.h
+++ b/src/detect-snmp-pdu_type.h
@@ -24,7 +24,6 @@
 #ifndef __DETECT_SNMP_PDU_TYPE_H__
 #define __DETECT_SNMP_PDU_TYPE_H__
 
-#include "app-layer-snmp.h"
 
 void DetectSNMPPduTypeRegister(void);
 

diff --git a/src/detect-snmp-version.h b/src/detect-snmp-version.h
index 281ae51450ab5f95c742a4c0ed0ba2034cef8f72..3c8d5915d82eb8dc21b11ac00f60f09af455c3e7 100644 (file)
--- a/src/detect-snmp-version.h
+++ b/src/detect-snmp-version.h
@@ -24,7 +24,6 @@
 #ifndef __DETECT_SNMP_VERSION_H__
 #define __DETECT_SNMP_VERSION_H__
 
-#include "app-layer-snmp.h"
 
 void DetectSNMPVersionRegister(void);
 

diff --git a/src/detect-ssh-hassh-server.c b/src/detect-ssh-hassh-server.c
index 34aaecdb1dfa094ace671f800798d211de6a00b4..679ca8583b3e453431d01a0e39ff360bea2c6d49 100644 (file)
--- a/src/detect-ssh-hassh-server.c
+++ b/src/detect-ssh-hassh-server.c
@@ -28,6 +28,7 @@
 
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
 
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/detect-ssh-hassh.c b/src/detect-ssh-hassh.c
index 12404e29912ea0e4ebfbce74b4f37621e4e54bd8..d7cc837e318a55c620d4942bfc5aabf0c71b2ac4 100644 (file)
--- a/src/detect-ssh-hassh.c
+++ b/src/detect-ssh-hassh.c
@@ -28,6 +28,7 @@
 
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
 
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/detect-ssh-proto-version.c b/src/detect-ssh-proto-version.c
index d1e9eda845c80e54112b49ed2224771ead3a8283..056db6fc897458c7082a732eeaa35a339441a718 100644 (file)
--- a/src/detect-ssh-proto-version.c
+++ b/src/detect-ssh-proto-version.c
@@ -38,6 +38,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"

diff --git a/src/detect-ssh-software-version.c b/src/detect-ssh-software-version.c
index 35be28ee444119f483ee048d970b75f45aaf83c7..b85ad7203a41991d2b4098bc841429556388396b 100644 (file)
--- a/src/detect-ssh-software-version.c
+++ b/src/detect-ssh-software-version.c
@@ -42,6 +42,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"

diff --git a/src/detect-ssl-state.h b/src/detect-ssl-state.h
index 9246d8f34767b56dcd2a94af561242176acdd17c..39179612ad9c055af7ef45199b3f59080d99f0e4 100644 (file)
--- a/src/detect-ssl-state.h
+++ b/src/detect-ssl-state.h
@@ -24,7 +24,6 @@
 #ifndef DETECT_SSL_STATE_H
 #define        DETECT_SSL_STATE_H
 
-#include "app-layer-ssl.h"
 
 /* we pick these flags flags from the parser */
 #define DETECT_SSL_STATE_CLIENT_HELLO SSL_AL_FLAG_STATE_CLIENT_HELLO

diff --git a/src/detect-tag.h b/src/detect-tag.h
index 6db80e4096d915f94408a4e0d8143a512b53d0da..642e58d2c62fc7f8fad5472708f7fd848fe6155d 100644 (file)
--- a/src/detect-tag.h
+++ b/src/detect-tag.h
@@ -26,8 +26,6 @@
 #define __DETECT_TAG_H__
 
 #include "suricata-common.h"
-#include "suricata.h"
-#include "util-time.h"
 
 /* Limit the number of times a session can be tagged by the
  * same rule without finishing older tags */

diff --git a/src/detect-tcp-ack.c b/src/detect-tcp-ack.c
index 963b6a20564c333fcbd6048883c88c7b7303c17e..3e5046d231395e5f1cdb72e48b7a0a4a68ceb02c 100644 (file)
--- a/src/detect-tcp-ack.c
+++ b/src/detect-tcp-ack.c
@@ -34,6 +34,7 @@
 #include "detect-engine-mpm.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "detect-tcp-ack.h"
 

diff --git a/src/detect-tcp-flags.h b/src/detect-tcp-flags.h
index 9b6b24021fc99adb644c6c0a7441ef6c39ef4885..994def6261f30d3824c052218bb7043f05e6ad8c 100644 (file)
--- a/src/detect-tcp-flags.h
+++ b/src/detect-tcp-flags.h
@@ -24,9 +24,6 @@
 #ifndef __DETECT_FLAGS_H__
 #define __DETECT_FLAGS_H__
 
-#include "decode-events.h"
-#include "decode-ipv4.h"
-#include "decode-tcp.h"
 
 /**
  * \struct DetectFlagsData_

diff --git a/src/detect-tcp-seq.c b/src/detect-tcp-seq.c
index bbb597a5b7b6b455cc358fe4e750e4e83f516de6..0f7025d5681fd12aeace01e6c941ed0d62c0402d 100644 (file)
--- a/src/detect-tcp-seq.c
+++ b/src/detect-tcp-seq.c
@@ -32,6 +32,7 @@
 #include "detect-engine.h"
 #include "detect-engine-prefilter.h"
 #include "detect-engine-prefilter-common.h"
+#include "detect-engine-build.h"
 
 #include "detect-tcp-seq.h"
 

diff --git a/src/detect-template-buffer.h b/src/detect-template-buffer.h
index c23062a40656ded28b42e21f3d88244f1800723a..0c974cfeac6087b4e3ac4f363294b971e7634a8c 100644 (file)
--- a/src/detect-template-buffer.h
+++ b/src/detect-template-buffer.h
@@ -24,7 +24,6 @@
 #ifndef __DETECT_TEMPLATE_BUFFER_H__
 #define __DETECT_TEMPLATE_BUFFER_H__
 
-#include "app-layer-template.h"
 
 void DetectTemplateBufferRegister(void);
 

diff --git a/src/detect-template-rust-buffer.c b/src/detect-template-rust-buffer.c
index 5e118655aa75ee782e3be9583db25e40fafda440..24f81f6245c75e7e01c9d34d3238d3f4ee48669f 100644 (file)
--- a/src/detect-template-rust-buffer.c
+++ b/src/detect-template-rust-buffer.c
@@ -38,6 +38,7 @@
 #include "detect-engine-content-inspection.h"
 #include "detect-template-rust-buffer.h"
 #include "app-layer-parser.h"
+#include "detect-engine-build.h"
 #include "rust.h"
 
 

diff --git a/src/detect-template-rust-buffer.h b/src/detect-template-rust-buffer.h
index 59059a76b8619a01e01c9383ad621f839917b9a3..8778a6efe6274228efe9cbd0546514b1b8ca4c25 100644 (file)
--- a/src/detect-template-rust-buffer.h
+++ b/src/detect-template-rust-buffer.h
@@ -24,7 +24,6 @@
 #ifndef __DETECT_TEMPLATE_RUST_BUFFER_H__
 #define __DETECT_TEMPLATE_RUST_BUFFER_H__
 
-#include "app-layer-template.h"
 
 void DetectTemplateRustBufferRegister(void);
 

diff --git a/src/detect-threshold.c b/src/detect-threshold.c
index e3991b41a2b9cd6463c5995785f4aab3acec3d15..1395a33898a761fe8ae8630aec47dd59e8671b28 100644 (file)
--- a/src/detect-threshold.c
+++ b/src/detect-threshold.c
@@ -49,6 +49,7 @@
 #include "detect-threshold.h"
 #include "detect-engine-threshold.h"
 #include "detect-engine-address.h"
+#include "detect-engine-build.h"
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"

diff --git a/src/detect-threshold.h b/src/detect-threshold.h
index 4accda399c95ac62b664c97feaff6cac3af73d8c..69da3c9773b551add2f68fac3290f2e8032a7fe7 100644 (file)
--- a/src/detect-threshold.h
+++ b/src/detect-threshold.h
@@ -24,9 +24,6 @@
 #ifndef __DETECT_THRESHOLD_H__
 #define __DETECT_THRESHOLD_H__
 
-#include "decode-events.h"
-#include "decode-ipv4.h"
-#include "decode-tcp.h"
 
 #define TYPE_LIMIT     1
 #define TYPE_BOTH      2

diff --git a/src/detect-tls-cert-issuer.h b/src/detect-tls-cert-issuer.h
index 8e26cb75965cf72b78e9331401446a2d1833cf3e..fdfda510da260ce4879627796d5bd6ab6ddbc7e7 100644 (file)
--- a/src/detect-tls-cert-issuer.h
+++ b/src/detect-tls-cert-issuer.h
@@ -24,7 +24,6 @@
 #ifndef __DETECT_TLS_ISSUER_H__
 #define __DETECT_TLS_ISSUER_H__
 
-#include "app-layer-ssl.h"
 
 void DetectTlsIssuerRegister(void);
 

diff --git a/src/detect-tls-cert-subject.h b/src/detect-tls-cert-subject.h
index 8d037275e34baf2c7608a20bf14314c90ad7e6ad..23f3e77859c78f8312afb9b9c23f065c75efe86d 100644 (file)
--- a/src/detect-tls-cert-subject.h
+++ b/src/detect-tls-cert-subject.h
@@ -24,7 +24,6 @@
 #ifndef __DETECT_TLS_SUBJECT_H__
 #define __DETECT_TLS_SUBJECT_H__
 
-#include "app-layer-ssl.h"
 
 void DetectTlsSubjectRegister(void);
 

diff --git a/src/detect-tls.c b/src/detect-tls.c
index afa4a34a60c09a6626d0e82b3ebdd9ac11b54376..74f076236bb69634bd6aa0d90dde7fdfae5bab47 100644 (file)
--- a/src/detect-tls.c
+++ b/src/detect-tls.c
@@ -40,6 +40,7 @@
 
 #include "detect.h"
 #include "detect-parse.h"
+#include "detect-content.h"
 
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/detect-transform-dotprefix.c b/src/detect-transform-dotprefix.c
index 061b0f1925b201ba54999a9f0d475897a4b487be..52a263372b43531d759fc4f2007a5a40cb59bfce 100644 (file)
--- a/src/detect-transform-dotprefix.c
+++ b/src/detect-transform-dotprefix.c
@@ -30,6 +30,7 @@
 #include "detect-engine-prefilter.h"
 #include "detect-parse.h"
 #include "detect-transform-dotprefix.h"
+#include "detect-engine-build.h"
 
 #include "util-unittest.h"
 #include "util-print.h"

diff --git a/src/detect-transform-strip-whitespace.c b/src/detect-transform-strip-whitespace.c
index 055a7e00d06157f69a1dbbf54f9cadcfacdd0dc7..7ca48b104851dcf36d31fe0c0b9dc0218ca35ec6 100644 (file)
--- a/src/detect-transform-strip-whitespace.c
+++ b/src/detect-transform-strip-whitespace.c
@@ -28,6 +28,7 @@
 #include "detect.h"
 #include "detect-engine.h"
 #include "detect-engine-prefilter.h"
+#include "detect-engine-build.h"
 #include "detect-parse.h"
 #include "detect-transform-strip-whitespace.h"
 

diff --git a/src/detect-transform-urldecode.c b/src/detect-transform-urldecode.c
index 70717aac73328cf45322c25f3bb36213a3568a2b..f74e694970032b0db058dc363597eae8c82d8973 100644 (file)
--- a/src/detect-transform-urldecode.c
+++ b/src/detect-transform-urldecode.c
@@ -28,6 +28,7 @@
 #include "detect.h"
 #include "detect-engine.h"
 #include "detect-engine-prefilter.h"
+#include "detect-engine-build.h"
 #include "detect-parse.h"
 #include "detect-transform-urldecode.h"
 

diff --git a/src/detect-urilen.c b/src/detect-urilen.c
index 518f216fca6f865382db79203c46a398d007984e..ad4ca72f6bf50d316b33c49ff3f25112c778dfb1 100644 (file)
--- a/src/detect-urilen.c
+++ b/src/detect-urilen.c
@@ -34,6 +34,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-state.h"
+#include "detect-engine-build.h"
 #include "detect-content.h"
 #include "detect-engine-uint.h"
 

diff --git a/src/detect-xbits.c b/src/detect-xbits.c
index 8fc2b0315d3fc6d6331c8f8597d11577d71bd6e0..6dc3dd425c15acde83b9083b3e174a3fc60395f3 100644 (file)
--- a/src/detect-xbits.c
+++ b/src/detect-xbits.c
@@ -42,6 +42,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"

diff --git a/src/detect.c b/src/detect.c
index 2888fb363629f2b12e9ec70d20ade8109c59ebd3..0a666285917008608c2417e77e38d0911e8c8e23 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -32,10 +32,13 @@
 #include "stream-tcp.h"
 #include "app-layer.h"
 #include "app-layer-parser.h"
+#include "app-layer-frames.h"
 
 #include "detect.h"
 #include "detect-dsize.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
+#include "detect-engine-frame.h"
 #include "detect-engine-profile.h"
 
 #include "detect-engine-alert.h"
@@ -59,6 +62,7 @@
 
 #include "util-validate.h"
 #include "util-detect.h"
+#include "util-profiling.h"
 
 typedef struct DetectRunScratchpad {
     const AppProto alproto;

diff --git a/src/detect.h b/src/detect.h
index 6f3744529aae6664c347eca5db7f0eb9d363a55d..b483d48ba3ab779b5f71930272347ebb3d5a1f27 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -32,25 +32,16 @@
 #include "detect-reference.h"
 #include "detect-metadata.h"
 #include "detect-engine-register.h"
-#include "packet-queue.h"
 
 #include "util-prefilter.h"
 #include "util-mpm.h"
 #include "util-spm.h"
 #include "util-hash.h"
 #include "util-hashlist.h"
-#include "util-debug.h"
-#include "util-error.h"
 #include "util-radix-tree.h"
 #include "util-file.h"
 #include "reputation.h"
 
-#include "detect-mark.h"
-
-#include "stream.h"
-
-#include "util-var-name.h"
-
 #include "app-layer-events.h"
 
 #define DETECT_MAX_RULE_SIZE 8192
@@ -1567,8 +1558,6 @@ int DetectEngineGetEventInfo(const char *event_name, int *event_id,
 
 void DumpPatterns(DetectEngineCtx *de_ctx);
 
-#include "detect-engine-build.h"
-#include "detect-engine-register.h"
 
 #endif /* __DETECT_H__ */
 

diff --git a/src/device-storage.h b/src/device-storage.h
index 046c8dd45433db16dc5ceeb882c11b7813aeaf8c..49fb59761df4e269ab3dfc835716928d07292abe 100644 (file)
--- a/src/device-storage.h
+++ b/src/device-storage.h
@@ -26,7 +26,6 @@
 #ifndef __DEVICE_STORAGE_H__
 #define __DEVICE_STORAGE_H__
 
-#include "util-storage.h"
 #include "util-device.h"
 
 typedef struct LiveDevStorageId_ {

diff --git a/src/feature.c b/src/feature.c
index a6ea9bc9d32537440e60cb84e7cc94a4d7aa176e..0cc27861261e7f0e307048b22808ebd9c6c3418f 100644 (file)
--- a/src/feature.c
+++ b/src/feature.c
@@ -24,6 +24,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "feature.h"
 
 #include "util-hash.h"

diff --git a/src/flow-bypass.c b/src/flow-bypass.c
index 9b4e75e702fee4bc22f5fc7e1c30577f80574fb1..98e62f519e25a83868f129d15d744185468366a0 100644 (file)
--- a/src/flow-bypass.c
+++ b/src/flow-bypass.c
@@ -27,6 +27,7 @@
 #include "flow-bypass.h"
 #include "flow-private.h"
 #include "util-ebpf.h"
+#include "runmodes.h"
 
 #ifdef CAPTURE_OFFLOAD_MANAGER
 

diff --git a/src/flow-manager.c b/src/flow-manager.c
index d65505eb8211c2342b708a8298644fd4a045a72d..b68eb22ffc17239128fec81e94130e61109be2f6 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -51,6 +51,7 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-byte.h"
+#include "util-device.h"
 
 #include "util-debug.h"
 #include "util-privs.h"

diff --git a/src/flow-storage.h b/src/flow-storage.h
index fb4958dc08f1c2f244890b134d3a64674659515e..f6111ab9bc2478eeb5f4088b93f17bba71c42595 100644 (file)
--- a/src/flow-storage.h
+++ b/src/flow-storage.h
@@ -26,7 +26,6 @@
 #ifndef __FLOW_STORAGE_H__
 #define __FLOW_STORAGE_H__
 
-#include "util-storage.h"
 #include "flow.h"
 
 typedef struct FlowStorageId {

diff --git a/src/flow-util.c b/src/flow-util.c
index ec449a96038e7f0e262920bc267d9a71b7f466dc..91c14eb3ebe60c73eca3a52b98e1093858177d8d 100644 (file)
--- a/src/flow-util.c
+++ b/src/flow-util.c
@@ -34,6 +34,7 @@
 
 #include "util-var.h"
 #include "util-debug.h"
+#include "util-macset.h"
 #include "flow-storage.h"
 
 #include "detect.h"

diff --git a/src/flow-util.h b/src/flow-util.h
index 7ef542ea2668c7532635f8198bdc7014681e7958..919ab95ef326b1564c064333575f3c03dbd5250c 100644 (file)
--- a/src/flow-util.h
+++ b/src/flow-util.h
@@ -24,8 +24,6 @@
 #ifndef __FLOW_UTIL_H__
 #define __FLOW_UTIL_H__
 
-#include "detect-engine-state.h"
-#include "tmqh-flow.h"
 #include "stream-tcp-private.h"
 
 #define COPY_TIMESTAMP(src,dst) ((dst)->tv_sec = (src)->tv_sec, (dst)->tv_usec = (src)->tv_usec)

diff --git a/src/flow-worker.c b/src/flow-worker.c
index 97f3f192a7e7ede0e60d5163dfec7c595706145f..66fa73baad39aebec06d73afd2f5269f9692275e 100644 (file)
--- a/src/flow-worker.c
+++ b/src/flow-worker.c
@@ -41,13 +41,18 @@
 #include "detect-engine.h"
 #include "output.h"
 #include "app-layer-parser.h"
+#include "app-layer-frames.h"
 
+#include "util-profiling.h"
 #include "util-validate.h"
+#include "util-time.h"
+#include "tmqh-packetpool.h"
 
 #include "flow-util.h"
 #include "flow-manager.h"
 #include "flow-timeout.h"
 #include "flow-spare-pool.h"
+#include "flow-worker.h"
 
 typedef DetectEngineThreadCtx *DetectEngineThreadCtxPtr;
 

diff --git a/src/flow.c b/src/flow.c
index a785290800a2791467515078a0caa731e0c23c6b..9f4d1450845ff1725cb7bbfeacb837a0c2de7719 100644 (file)
--- a/src/flow.c
+++ b/src/flow.c
@@ -54,6 +54,7 @@
 #include "util-unittest-helper.h"
 #include "util-byte.h"
 #include "util-misc.h"
+#include "util-macset.h"
 
 #include "util-debug.h"
 #include "util-privs.h"

diff --git a/src/flow.h b/src/flow.h
index 2ec7f531fcfa67686d366acefada13326d91c846..8bbe6e600aad5ed48bd8ea7e46636a8a36c61e58 100644 (file)
--- a/src/flow.h
+++ b/src/flow.h
@@ -30,11 +30,8 @@ typedef struct FlowStorageId FlowStorageId;
 #include "decode.h"
 #include "util-exception-policy.h"
 #include "util-var.h"
-#include "util-atomic.h"
-#include "util-device.h"
-#include "detect-tag.h"
-#include "util-macset.h"
 #include "util-optimize.h"
+#include "app-layer-protos.h"
 
 /* Part of the flow structure, so we declare it here.
  * The actual declaration is in app-layer-parser.c */

diff --git a/src/host-storage.h b/src/host-storage.h
index 25e8b962c1108bacee2379ce1a715726df8c9233..e315b33f63e8b00e0b3f0107593a8c4005fac98c 100644 (file)
--- a/src/host-storage.h
+++ b/src/host-storage.h
@@ -26,7 +26,6 @@
 #ifndef __HOST_STORAGE_H__
 #define __HOST_STORAGE_H__
 
-#include "util-storage.h"
 #include "host.h"
 
 typedef struct HostStorageId_ {

diff --git a/src/ippair-bit.h b/src/ippair-bit.h
index cbc7cb739be82d94a8036d7983ab0877c7dfeed2..6b2476a887fb53d729705897b6c228ecce1ceac2 100644 (file)
--- a/src/ippair-bit.h
+++ b/src/ippair-bit.h
@@ -25,7 +25,6 @@
 #define __IPPAIR_BIT_H__
 
 #include "ippair.h"
-#include "util-var.h"
 
 void IPPairBitInitCtx(void);
 void IPPairBitRegisterTests(void);

diff --git a/src/ippair-storage.h b/src/ippair-storage.h
index 6175084c34268847ef66c7d5e7a52ef0d783023d..1d5ba7d2ea240c492bdabc51a08d5b806b91fb4e 100644 (file)
--- a/src/ippair-storage.h
+++ b/src/ippair-storage.h
@@ -26,7 +26,6 @@
 #ifndef __IPPAIR_STORAGE_H__
 #define __IPPAIR_STORAGE_H__
 
-#include "util-storage.h"
 #include "ippair.h"
 
 typedef struct IPPairStorageId {

diff --git a/src/log-cf-common.c b/src/log-cf-common.c
index 35a3168eafcc4f86a2c427d55aa30603576e8f63..236926613a5c35da13bf224bd9304a088c44f7ea 100644 (file)
--- a/src/log-cf-common.c
+++ b/src/log-cf-common.c
@@ -28,6 +28,7 @@
 #include "log-cf-common.h"
 #include "util-print.h"
 #include "util-unittest.h"
+#include "util-time.h"
 
 /**
  *  \brief Creates a custom format node

diff --git a/src/log-pcap.c b/src/log-pcap.c
index 982c3acaa2baa95d8b1df4add11f2197fb8d62d7..61b2ba2779d6443fd74cdf4ca501c07ccd31b941 100644 (file)
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -29,6 +29,7 @@
 #include "util-fmemopen.h"
 #include "util-datalink.h"
 #include "stream-tcp-util.h"
+#include "stream.h"
 
 #ifdef HAVE_LIBLZ4
 #include <lz4frame.h>

diff --git a/src/output-flow.h b/src/output-flow.h
index 8445d6fa1346d38ebd7566a8965846f9044fe959..04f878419213ad2b7ee0d9f5f2dba536de386eee 100644 (file)
--- a/src/output-flow.h
+++ b/src/output-flow.h
@@ -26,7 +26,6 @@
 #ifndef __OUTPUT_FLOW_H__
 #define __OUTPUT_FLOW_H__
 
-#include "decode.h"
 
 /** flow logger function pointer type */
 typedef int (*FlowLogger)(ThreadVars *, void *thread_data, Flow *f);

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 3e0f69e8a91668e82bf87e28ffe45e9f6465b4cd..69d6f7c30f361d9d43fe44570df33d02b2ef4553 100644 (file)
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -30,6 +30,7 @@
 #include "flow.h"
 #include "conf.h"
 
+#include "stream.h"
 #include "threads.h"
 #include "tm-threads.h"
 #include "threadvars.h"
@@ -37,6 +38,7 @@
 
 #include "util-logopenfile.h"
 #include "util-misc.h"
+#include "util-time.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 

diff --git a/src/output-json-email-common.c b/src/output-json-email-common.c
index 5d110c0ea308d502ccf173acde5a21ec5282bb21..cadad2c1c2d56624812bf018d6a41da7a95b4420 100644 (file)
--- a/src/output-json-email-common.c
+++ b/src/output-json-email-common.c
@@ -29,6 +29,7 @@
 #include "detect.h"
 #include "pkt-var.h"
 #include "conf.h"
+#include "suricata.h"
 
 #include "threads.h"
 #include "threadvars.h"

diff --git a/src/output-json-flow.c b/src/output-json-flow.c
index 1a999da4df0d32ffcda853e018a75537730e9e50..17b4c0f33a653ad454ae3e497f682acb0ceca99f 100644 (file)
--- a/src/output-json-flow.c
+++ b/src/output-json-flow.c
@@ -41,6 +41,7 @@
 #include "output.h"
 #include "util-privs.h"
 #include "util-buffer.h"
+#include "util-device.h"
 #include "util-proto-name.h"
 #include "util-logopenfile.h"
 #include "util-time.h"

diff --git a/src/output-json-frame.h b/src/output-json-frame.h
index 5560a07eea533615927b12a664fe2d8a13ced352..009e7b6426bb17743a438d7b8eea2e5f412c7f66 100644 (file)
--- a/src/output-json-frame.h
+++ b/src/output-json-frame.h
@@ -27,6 +27,9 @@
 #ifndef __OUTPUT_JSON_FRAME_H__
 #define __OUTPUT_JSON_FRAME_H__
 
+#include "app-layer-frames.h"
+#include "stream-tcp-private.h"
+
 void FrameJsonLogOneFrame(const uint8_t ipproto, const Frame *frame, const Flow *f,
         const TcpStream *stream, const Packet *p, JsonBuilder *jb);
 void JsonFrameLogRegister(void);

diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index 16267a9f3b58341aee1d0b4e20ac79fc716c6e8d..0aa90a49bbbebdc460abfb5d7f9d5c75d792174a 100644 (file)
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -41,6 +41,7 @@
 #include "output.h"
 #include "util-privs.h"
 #include "util-buffer.h"
+#include "util-device.h"
 #include "util-proto-name.h"
 #include "util-logopenfile.h"
 #include "util-time.h"

diff --git a/src/output-json-stats.c b/src/output-json-stats.c
index 181bb54106c3965a87ec48cb1cc01457b8123e16..9b9c22151b8cdc26157c58269e54ee51e4562be5 100644 (file)
--- a/src/output-json-stats.c
+++ b/src/output-json-stats.c
@@ -35,6 +35,7 @@
 #include "tm-threads.h"
 
 #include "util-print.h"
+#include "util-time.h"
 #include "util-unittest.h"
 
 #include "util-debug.h"

diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index 4cc13b4cac2ba5b1c38171eef25c63fc0616e319..fce953ae38bfb95fbff74814c87c943aed79c9a2 100644 (file)
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -34,6 +34,7 @@
 #include "tm-threads.h"
 
 #include "util-print.h"
+#include "util-time.h"
 #include "util-unittest.h"
 
 #include "util-debug.h"

diff --git a/src/output-json.c b/src/output-json.c
index 4a89c1030bd38221a238d17201d6fb29465f9fa7..de322104c519811bdf67b5d5ca7a500d8b424d30 100644 (file)
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -34,6 +34,9 @@
 #include "tm-threads.h"
 #include "threadvars.h"
 #include "util-debug.h"
+#include "util-time.h"
+#include "util-var-name.h"
+#include "util-macset.h"
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
@@ -45,6 +48,7 @@
 #include "app-layer-parser.h"
 #include "util-classification-config.h"
 #include "util-syslog.h"
+#include "output-eve-syslog.h"
 
 #include "output.h"
 #include "output-json.h"

diff --git a/src/output-packet.h b/src/output-packet.h
index d51f8554537583d89a5bc490f3066e9172c99da8..3953b9d939adfb955a560ef7a70740b0453ab161 100644 (file)
--- a/src/output-packet.h
+++ b/src/output-packet.h
@@ -27,7 +27,7 @@
 #define __OUTPUT_PACKET_H__
 
 #include "decode.h"
-#include "output.h"
+#include "tm-modules.h"
 
 /** packet logger function pointer type */
 typedef int (*PacketLogger)(ThreadVars *, void *thread_data, const Packet *);

diff --git a/src/output-streaming.h b/src/output-streaming.h
index d47a3e432c52431cb469fc05abec198dc0fe45b3..07c3722d8e3d07aabde1984aef3c80e32d7ab2fe 100644 (file)
--- a/src/output-streaming.h
+++ b/src/output-streaming.h
@@ -26,8 +26,6 @@
 #ifndef __OUTPUT_STREAMING_H__
 #define __OUTPUT_STREAMING_H__
 
-#include "decode.h"
-#include "util-file.h"
 
 #define OUTPUT_STREAMING_FLAG_OPEN          0x01
 #define OUTPUT_STREAMING_FLAG_CLOSE         0x02

diff --git a/src/output.h b/src/output.h
index 3f73a1bada15e818736137dd14cfb692d1c24f90..62d3f6b90f6bb738701bc85981236ff6d4ed8675 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -24,9 +24,6 @@
 #ifndef __OUTPUT_H__
 #define __OUTPUT_H__
 
-#include "suricata.h"
-#include "tm-threads.h"
-
 #define DEFAULT_LOG_MODE_APPEND     "yes"
 #define DEFAULT_LOG_FILETYPE        "regular"
 
@@ -38,7 +35,6 @@
 #include "output-streaming.h"
 #include "output-stats.h"
 
-#include "util-config.h"
 
 typedef struct OutputLoggerThreadStore_ {
     void *thread_data;

diff --git a/src/packet-queue.h b/src/packet-queue.h
index b61a5a59c82c613fdc8bd8bde89d76f4a7ffe256..c7070d3e51f7b1a8a070cc926e9f5b9b6938cc36 100644 (file)
--- a/src/packet-queue.h
+++ b/src/packet-queue.h
@@ -55,7 +55,6 @@ typedef struct PacketQueue_ {
     SCCondT cond_q;
 } PacketQueue;
 
-#include "decode.h"
 
 void PacketEnqueueNoLock(PacketQueueNoLock *qnl, struct Packet_ *p);
 void PacketEnqueue (PacketQueue *, struct Packet_ *);

diff --git a/src/queue.h b/src/queue.h
index 1ece2d101c2fcec6d3a985880f59eb59c920516d..3ba7062f556b2c76a840aac855460cf616bafd4a 100644 (file)
--- a/src/queue.h
+++ b/src/queue.h
@@ -49,7 +49,6 @@
  * from queue.h instead the Suricata copy.
  */
 
-#include "autoconf.h"
 
 #if defined(HAVE_SYS_QUEUE_H) && !defined(__clang_analyzer__)
 #include <sys/queue.h>

diff --git a/src/respond-reject-libnet11.c b/src/respond-reject-libnet11.c
index 4c7be9dfb54fbfe5824faf1921be470a3e538eb9..9a646bc013fd503e495fb0adeb0d3daed232f391 100644 (file)
--- a/src/respond-reject-libnet11.c
+++ b/src/respond-reject-libnet11.c
@@ -33,6 +33,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 
 #include "decode.h"
 #include "decode-ipv4.h"

diff --git a/src/respond-reject.h b/src/respond-reject.h
index 9baeaf753193ad29016b20c6b599bdf4f51c0592..0df165591cee221d017490d3ef6396b5d6837a0b 100644 (file)
--- a/src/respond-reject.h
+++ b/src/respond-reject.h
@@ -24,7 +24,6 @@
 #ifndef __RESPOND_REJECT_H__
 #define __RESPOND_REJECT_H__
 
-#include "tm-threads.h"
 
 enum RejectDirection {
     REJECT_DIR_SRC = 0,

diff --git a/src/runmode-dpdk.c b/src/runmode-dpdk.c
index f58e4506c0457ded910f36d859f48c1d117c3be0..170679ae32294a708768aec785d381b2412c200a 100644 (file)
--- a/src/runmode-dpdk.c
+++ b/src/runmode-dpdk.c
@@ -41,6 +41,7 @@
 #include "util-dpdk-i40e.h"
 #include "util-dpdk-ice.h"
 #include "util-dpdk-ixgbe.h"
+#include "util-time.h"
 
 #ifdef HAVE_DPDK
 

diff --git a/src/runmode-napatech.h b/src/runmode-napatech.h
index b80d77732500f1285c8f645478177468badd0a70..d77133addaa2bda77f7511f9c54c5caa368407b7 100644 (file)
--- a/src/runmode-napatech.h
+++ b/src/runmode-napatech.h
@@ -27,7 +27,6 @@
 #define __RUNMODE_NAPATECH_H__
 
 #ifdef HAVE_NAPATECH
-#include "util-napatech.h"
 #include <nt.h>
 #endif /* HAVE_NAPATECH */
 

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index d55c7b8141084f08c34fe9050659d5cc3a7c9e23..851de186e90e195f9d032f547ca785d17297e60d 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -103,6 +103,14 @@
 
 #include "util-streaming-buffer.h"
 #include "util-lua.h"
+#include "tm-modules.h"
+#include "tmqh-packetpool.h"
+#include "decode-chdlc.h"
+#include "decode-geneve.h"
+#include "decode-nsh.h"
+#include "decode-raw.h"
+#include "decode-vntag.h"
+#include "decode-vxlan.h"
 
 #ifdef OS_WIN32
 #include "win32-syscall.h"

diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c
index 6fedc5d391c5a499731ac590a879388118bc2033..24ac172179fe4b6215d9ea952180917b2c3aac91 100644 (file)
--- a/src/runmode-unix-socket.c
+++ b/src/runmode-unix-socket.c
@@ -27,6 +27,7 @@
 #include "util-time.h"
 #include "util-cpu.h"
 #include "util-affinity.h"
+#include "util-var-name.h"
 #include "unix-manager.h"
 
 #include "detect-engine.h"
@@ -50,6 +51,7 @@
 #include "conf-yaml-loader.h"
 
 #include "datasets.h"
+#include "runmode-unix-socket.h"
 
 int unix_socket_mode_is_running = 0;
 

diff --git a/src/runmodes.c b/src/runmodes.c
index 0e88dae3082143619ea5f5a03f8f50c6daf47a71..8f729a46a913dc3f95234a747fb13b5524b1a7ac 100644 (file)
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -36,6 +36,20 @@
 #include "conf.h"
 #include "queue.h"
 #include "runmodes.h"
+#include "runmode-af-packet.h"
+#include "runmode-dpdk.h"
+#include "runmode-erf-dag.h"
+#include "runmode-erf-file.h"
+#include "runmode-ipfw.h"
+#include "runmode-napatech.h"
+#include "runmode-netmap.h"
+#include "runmode-nflog.h"
+#include "runmode-nfq.h"
+#include "runmode-pcap.h"
+#include "runmode-pcap-file.h"
+#include "runmode-pfring.h"
+#include "runmode-unix-socket.h"
+#include "runmode-windivert.h"
 #include "util-unittest.h"
 #include "util-misc.h"
 #include "util-plugin.h"

diff --git a/src/runmodes.h b/src/runmodes.h
index d9eb24e988c3ddd120d32c773af889b3e202e437..026b05f5c5578fcaebdc6f2842a2202f84c5cadd 100644 (file)
--- a/src/runmodes.h
+++ b/src/runmodes.h
@@ -98,20 +98,6 @@ bool IsRunModeSystem(enum RunModes run_mode_to_check);
 void RunModeEnablesBypassManager(void);
 int RunModeNeedsBypassManager(void);
 
-#include "runmode-pcap.h"
-#include "runmode-pcap-file.h"
-#include "runmode-pfring.h"
-#include "runmode-nfq.h"
-#include "runmode-ipfw.h"
-#include "runmode-erf-file.h"
-#include "runmode-erf-dag.h"
-#include "runmode-napatech.h"
-#include "runmode-af-packet.h"
-#include "runmode-nflog.h"
-#include "runmode-unix-socket.h"
-#include "runmode-netmap.h"
-#include "runmode-windivert.h"
-#include "runmode-dpdk.h"
 
 extern int threading_set_cpu_affinity;
 extern float threading_detect_ratio;

diff --git a/src/rust.h b/src/rust.h
index a01e6e602b518c71b6f196e98bdf229ef819b48e..dc345412a9bb79bd56003a90f2f09bf918bd5f11 100644 (file)
--- a/src/rust.h
+++ b/src/rust.h
@@ -21,6 +21,7 @@
 #include "util-lua.h"
 // hack for include orders cf SCSha256
 typedef struct HttpRangeContainerBlock HttpRangeContainerBlock;
+#include "detect-engine-state.h"
 #include "rust-context.h"
 #include "rust-bindings.h"
 

diff --git a/src/source-dpdk.h b/src/source-dpdk.h
index afde13ec738dd61c2addf9b9073bb208680400dd..b20b7fc6097e8648ac8cecc1a64a5a62c58f61f9 100644 (file)
--- a/src/source-dpdk.h
+++ b/src/source-dpdk.h
@@ -24,8 +24,9 @@
 #ifndef __SOURCE_DPDK_H__
 #define __SOURCE_DPDK_H__
 
-#include "queue.h"
-#include "util-dpdk.h"
+#ifdef HAVE_DPDK
+#include <rte_ethdev.h>
+#endif
 
 typedef enum { DPDK_COPY_MODE_NONE, DPDK_COPY_MODE_TAP, DPDK_COPY_MODE_IPS } DpdkCopyModeEnum;
 

diff --git a/src/source-pcap-file-directory-helper.c b/src/source-pcap-file-directory-helper.c
index 7cdad36254700d839d51dda3cf1bbcad3f307a83..07ad53e10982a16e936a21427ce0ec52e48bc383 100644 (file)
--- a/src/source-pcap-file-directory-helper.c
+++ b/src/source-pcap-file-directory-helper.c
@@ -26,7 +26,9 @@
 #include "source-pcap-file-directory-helper.h"
 #include "runmode-unix-socket.h"
 #include "util-mem.h"
+#include "util-time.h"
 #include "source-pcap-file.h"
+#include "suricata.h"
 
 static void GetTime(struct timespec *tm);
 static void CopyTime(struct timespec *from, struct timespec *to);

diff --git a/src/source-pcap-file-helper.c b/src/source-pcap-file-helper.c
index d19c456244d55cc98ceeabf1ec568c6652cd4120..1594e77eeb4de1a1f1b7c0cd9bf4b7de6afdccf6 100644 (file)
--- a/src/source-pcap-file-helper.c
+++ b/src/source-pcap-file-helper.c
@@ -29,6 +29,7 @@
 #include "util-profiling.h"
 #include "source-pcap-file.h"
 #include "util-exception-policy.h"
+#include "suricata.h"
 
 extern int max_pending_packets;
 extern PcapFileGlobalVars pcap_g;

diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index f1865f17342ef3eb3bec63b91675aa6626f42be3..eb2683378951cd0d3622f77bcdc836c89cda4e0a 100644 (file)
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -29,6 +29,8 @@
 #include "source-pcap-file-directory-helper.h"
 #include "flow-manager.h"
 #include "util-checksum.h"
+#include "runmode-unix-socket.h"
+#include "suricata.h"
 
 extern int max_pending_packets;
 PcapFileGlobalVars pcap_g;

diff --git a/src/source-pcap.c b/src/source-pcap.c
index 97b2085cdc52f495cc575960622bf5b9c25c3e14..5e7ebc5f8874967fe54525ca2fc2102bffcfe939 100644 (file)
--- a/src/source-pcap.c
+++ b/src/source-pcap.c
@@ -41,6 +41,7 @@
 #include "util-optimize.h"
 #include "util-checksum.h"
 #include "util-ioctl.h"
+#include "util-time.h"
 #include "tmqh-packetpool.h"
 
 #define PCAP_STATE_DOWN 0

diff --git a/src/stream-tcp-list.h b/src/stream-tcp-list.h
index a910bb95ecabdf9436faff80216a805871a0c57e..5612354a86a1e478006e0489d13c4fcf4ba0453f 100644 (file)
--- a/src/stream-tcp-list.h
+++ b/src/stream-tcp-list.h
@@ -24,7 +24,6 @@
 #ifndef __STREAM_TCP_LIST_H__
 #define __STREAM_TCP_LIST_H__
 
-#include "stream-tcp-private.h"
 
 #ifdef UNITTESTS
 void StreamTcpListRegisterTests(void);

diff --git a/src/stream-tcp-private.h b/src/stream-tcp-private.h
index b1f431667c80da32e9ababe58327bbf9e27d1d57..cf7f882eeb6c69edde5293cfd480cbde97ffcb27 100644 (file)
--- a/src/stream-tcp-private.h
+++ b/src/stream-tcp-private.h
@@ -24,9 +24,6 @@
 #ifndef __STREAM_TCP_PRIVATE_H__
 #define __STREAM_TCP_PRIVATE_H__
 
-#include "tree.h"
-#include "decode.h"
-#include "util-pool.h"
 #include "util-pool-thread.h"
 #include "util-streaming-buffer.h"
 

diff --git a/src/stream-tcp-reassemble.h b/src/stream-tcp-reassemble.h
index 49bff569d05073161e078fb0d88a3edb6e543bae..ce7cf16bcb05474be06801ca41e4e53959033ed4 100644 (file)
--- a/src/stream-tcp-reassemble.h
+++ b/src/stream-tcp-reassemble.h
@@ -26,10 +26,12 @@
 #define __STREAM_TCP_REASSEMBLE_H__
 
 #include "stream-tcp-private.h"
-#include "stream.h"
-#include "app-layer-detect-proto.h"
 #include "stream-tcp-private.h"
 
+#ifdef UNITTESTS
+#include "suricata.h"
+#endif
+
 /** Supported OS list and default OS policy is BSD */
 enum
 {

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 44e2e425342ab69092eed864410e44e13434fa89..5378d86c81765358af724620d0dc6cd9bdfa2d73 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -75,6 +75,7 @@
 #include "util-runmodes.h"
 #include "util-random.h"
 #include "util-exception-policy.h"
+#include "util-time.h"
 
 #include "source-pcap-file.h"
 

diff --git a/src/stream-tcp.h b/src/stream-tcp.h
index 15cfee210d91b3d09e6b9338a57ce916f51e3af4..62a14f008469d7ea11190bc8634dd9d83aa89d7d 100644 (file)
--- a/src/stream-tcp.h
+++ b/src/stream-tcp.h
@@ -29,6 +29,7 @@
 
 #include "stream.h"
 #include "stream-tcp-reassemble.h"
+#include "suricata.h"
 
 #define STREAM_VERBOSE false
 /* Flag to indicate that the checksum validation for the stream engine

diff --git a/src/stream.h b/src/stream.h
index 583747ca558679f69d2052f50e615b19c5bfcd5f..53f1f6e0cc2414b015f56d48d441cb8572cfdd9e 100644 (file)
--- a/src/stream.h
+++ b/src/stream.h
@@ -24,7 +24,6 @@
 #ifndef __STREAM_H__
 #define __STREAM_H__
 
-#include "flow.h"
 #include "stream-tcp-private.h"
 
 #define STREAM_FLAGS_FOR_PACKET(p) PKT_IS_TOSERVER((p)) ? STREAM_TOSERVER : STREAM_TOCLIENT

diff --git a/src/suricata.c b/src/suricata.c
index de6d7e22c6893355a8c015be40aa83b8d78bfe7a..14a65e0fcb65988114271294ec97e043d4ceaa87 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -48,6 +48,7 @@
 #include "util-ioctl.h"
 #include "util-device.h"
 #include "util-misc.h"
+#include "util-macset.h"
 #include "util-running-modes.h"
 
 #include "detect-engine.h"
@@ -153,11 +154,13 @@
 
 #include "runmodes.h"
 #include "runmode-unittests.h"
+#include "runmode-af-packet.h"
 
 #include "util-debug.h"
 #include "util-error.h"
 #include "util-daemon.h"
 #include "util-byte.h"
+#include "util-luajit.h"
 #include "reputation.h"
 
 #include "output.h"

diff --git a/src/suricata.h b/src/suricata.h
index 5d15424809fdb24348135ee6e04ceeb4cf23c864..321f21a786b726f92e8587fe53ed96d45086582f 100644 (file)
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -65,7 +65,6 @@
 #define __SURICATA_H__
 
 #include "suricata-common.h"
-#include "packet-queue.h"
 
 /* the name of our binary */
 #define PROG_NAME "Suricata"

diff --git a/src/tests/detect-engine-content-inspection.c b/src/tests/detect-engine-content-inspection.c
index aea1c95c9dcd7ab68998cd91c2e79ce13fbdd626..43cf0b805eb08d086ce7d1b63b629e658977500b 100644 (file)
--- a/src/tests/detect-engine-content-inspection.c
+++ b/src/tests/detect-engine-content-inspection.c
@@ -27,6 +27,7 @@
 #include "../decode.h"
 #include "../flow.h"
 #include "../detect.h"
+#include "detect-engine-build.h"
 
 #define TEST_HEADER                                     \
     ThreadVars tv;                                      \

diff --git a/src/tests/detect-http-client-body.c b/src/tests/detect-http-client-body.c
index bdd560b82557c1a231cf222c736f5880ef67da1f..6bcb4ff325bb24327b36d0339989945e026bcd1c 100644 (file)
--- a/src/tests/detect-http-client-body.c
+++ b/src/tests/detect-http-client-body.c
@@ -45,7 +45,7 @@
 #include "detect-engine-prefilter.h"
 #include "detect-isdataat.h"
 #include "stream-tcp-reassemble.h"
-
+#include "detect-engine-build.h"
 
 #include "flow-util.h"
 #include "util-debug.h"

diff --git a/src/tests/detect-http-cookie.c b/src/tests/detect-http-cookie.c
index 93b0ac8b6ba10d733a761952bf11291ff4c3fa10..a85c331372969b4e0df69527d97f2253840f7b0f 100644 (file)
--- a/src/tests/detect-http-cookie.c
+++ b/src/tests/detect-http-cookie.c
@@ -42,6 +42,7 @@
 #include "../app-layer-htp.h"
 #include "../app-layer-protos.h"
 #include "../detect-isdataat.h"
+#include "../detect-engine-build.h"
 
 /***********************************Unittests**********************************/
 

diff --git a/src/tests/detect-http-header.c b/src/tests/detect-http-header.c
index c4baf937a16ce42e1ea86873e9a34764a4461f46..687eb2b1d8a0c7105ea22cf92809c5e8b71a73e1 100644 (file)
--- a/src/tests/detect-http-header.c
+++ b/src/tests/detect-http-header.c
@@ -41,6 +41,7 @@
 #include "../app-layer-htp.h"
 #include "../detect-http-header.h"
 #include "../detect-http-header-common.h"
+#include "../detect-engine-build.h"
 
 #include "../detect-isdataat.h"
 

diff --git a/src/tests/detect-http-host.c b/src/tests/detect-http-host.c
index 60b437ca16e651caea7e38c88fa02fc68f3275a1..f4365a92f3e150b7e79dd9eee39aa5cfa77511b2 100644 (file)
--- a/src/tests/detect-http-host.c
+++ b/src/tests/detect-http-host.c
@@ -42,6 +42,7 @@
 #include "app-layer.h"
 #include "app-layer-htp.h"
 #include "app-layer-protos.h"
+#include "detect-engine-build.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 44ee21f21c4c40b958e90e68767402c1dacc15d8..530a60e5758fc884a1b147385b6ab955526a6709 100644 (file)
--- a/src/tests/detect-http-method.c
+++ b/src/tests/detect-http-method.c
@@ -42,6 +42,7 @@
 #include "../app-layer-htp.h"
 #include "../app-layer-protos.h"
 #include "../detect-isdataat.h"
+#include "../detect-engine-build.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 484bd5757badb893249bc67616f71afaee6ddb82..cab73ed8a41d53ccaa92f41d1e612c1419fccb69 100644 (file)
--- a/src/tests/detect-http-raw-header.c
+++ b/src/tests/detect-http-raw-header.c
@@ -39,6 +39,7 @@
 #include "../detect-engine.h"
 #include "../detect-isdataat.h"
 #include "../detect-pcre.h"
+#include "../detect-engine-build.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 5f797b1cda04ea0808cea75fb824c7b34ba2e8e0..42f3b5e055b8d0767a903f0e29f5d31adab07353 100644 (file)
--- a/src/tests/detect-http-server-body.c
+++ b/src/tests/detect-http-server-body.c
@@ -28,6 +28,7 @@
 #include "../decode.h"
 #include "../flow.h"
 #include "../detect.h"
+#include "../detect-engine-build.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 a2c693fd9e105b3def6f5535528578b6362121f6..9f16d9963d4614281ce399d4e420dc4484df7349 100644 (file)
--- a/src/tests/detect-http-stat-code.c
+++ b/src/tests/detect-http-stat-code.c
@@ -38,6 +38,7 @@
 #include "../app-layer.h"
 #include "../app-layer-htp.h"
 #include "../app-layer-protos.h"
+#include "../detect-engine-build.h"
 
 static int DetectEngineHttpStatCodeTest01(void)
 {

diff --git a/src/tests/detect-http-stat-msg.c b/src/tests/detect-http-stat-msg.c
index 6346a0276cf5f1fefa76f5539245983c7e359502..e4317181e90a43d72be731cf1a943662a37b455e 100644 (file)
--- a/src/tests/detect-http-stat-msg.c
+++ b/src/tests/detect-http-stat-msg.c
@@ -38,6 +38,7 @@
 #include "../app-layer.h"
 #include "../app-layer-htp.h"
 #include "../app-layer-protos.h"
+#include "../detect-engine-build.h"
 
 static int DetectEngineHttpStatMsgTest01(void)
  {

diff --git a/src/tests/detect-http-uri.c b/src/tests/detect-http-uri.c
index b6a5ca9edee91e24bdacd4b52ceb7fce0905ab56..9bd5b63d57a15b714ef62cf2a06eb1258d887acb 100644 (file)
--- a/src/tests/detect-http-uri.c
+++ b/src/tests/detect-http-uri.c
@@ -32,6 +32,7 @@
 #include "../flow-util.h"
 
 #include "../detect-isdataat.h"
+#include "../detect-engine-build.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 dda97fa81984575ca9c01a55d7d549c35bada51c..f0c6fcc5df6204b2f0de41194d34b49c374c4b8f 100644 (file)
--- a/src/tests/detect-http-user-agent.c
+++ b/src/tests/detect-http-user-agent.c
@@ -41,6 +41,7 @@
 #include "app-layer.h"
 #include "app-layer-htp.h"
 #include "app-layer-protos.h"
+#include "detect-engine-build.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 3589255a3f8791ba9b986747d64f7e1e6eb74686..9b978168dd28d1c5778e7a03e33562c992fd9cbd 100644 (file)
--- a/src/tests/detect-snmp-community.c
+++ b/src/tests/detect-snmp-community.c
@@ -22,6 +22,7 @@
 #include "detect-parse.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
+#include "detect-engine-build.h"
 
 static int DetectSNMPCommunityTest(void)
 {

diff --git a/src/tests/detect-ssl-state.c b/src/tests/detect-ssl-state.c
index ef594d035546e84eb4b808dcea378987841ed72f..eba25b07d2c50542ff488f412d1f5387fb72ea94 100644 (file)
--- a/src/tests/detect-ssl-state.c
+++ b/src/tests/detect-ssl-state.c
@@ -22,6 +22,8 @@
  *
  */
 
+#include "detect-engine-build.h"
+
 static int DetectSslStateTest01(void)
 {
     DetectSslStateData *ssd = DetectSslStateParse("client_hello");

diff --git a/src/tests/detect-ssl-version.c b/src/tests/detect-ssl-version.c
index 2e16b2b0337a86f321dd2cd0785710ca6ccd29fa..3923ff8d67efc0d1f3a093746614de76acaf8836 100644 (file)
--- a/src/tests/detect-ssl-version.c
+++ b/src/tests/detect-ssl-version.c
@@ -22,6 +22,8 @@
  *
  */
 
+#include "detect-engine-build.h"
+
 /**
  * \test DetectSslVersionTestParse01 is a test to make sure that we parse the
  *      "ssl_version" option correctly when given valid ssl_version option

diff --git a/src/tests/detect-template-buffer.c b/src/tests/detect-template-buffer.c
index 9fca91b3ce503e6b7f71ce22fca3f9944f95e013..7e04025a96daf1900237afe2109ea43556c14643 100644 (file)
--- a/src/tests/detect-template-buffer.c
+++ b/src/tests/detect-template-buffer.c
@@ -22,6 +22,7 @@
 #include "../detect-parse.h"
 #include "../flow-util.h"
 #include "../stream-tcp.h"
+#include "../detect-engine-build.h"
 
 static int DetectTemplateBufferTest(void)
 {

diff --git a/src/tests/detect-tls-cert-fingerprint.c b/src/tests/detect-tls-cert-fingerprint.c
index 7da2daa07fda988e447b906efbb930c22cc23e92..735a7ab771ef2b8c961c2a44cc4e1f8e92b6c170 100644 (file)
--- a/src/tests/detect-tls-cert-fingerprint.c
+++ b/src/tests/detect-tls-cert-fingerprint.c
@@ -22,6 +22,8 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
 /**
  * \test Test that a signature containing tls_cert_fingerprint is correctly parsed
  *       and that the keyword is registered.

diff --git a/src/tests/detect-tls-cert-issuer.c b/src/tests/detect-tls-cert-issuer.c
index 118ff04575d70604466f5073f0efaa5166a8d832..f46520d1a9ccf7b4f0b49f7573d97a99486726f3 100644 (file)
--- a/src/tests/detect-tls-cert-issuer.c
+++ b/src/tests/detect-tls-cert-issuer.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test that a signature containing a tls_cert_issuer is correctly parsed
  *       and that the keyword is registered.

diff --git a/src/tests/detect-tls-cert-serial.c b/src/tests/detect-tls-cert-serial.c
index 2acf5c884f69c4b1f515c1eab15320bb64603e75..fbcb9ceb6c066138284993bfa22c33ce22e7ee1a 100644 (file)
--- a/src/tests/detect-tls-cert-serial.c
+++ b/src/tests/detect-tls-cert-serial.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test that a signature containing tls.cert_serial is correctly parsed
  *       and that the keyword is registered.

diff --git a/src/tests/detect-tls-cert-subject.c b/src/tests/detect-tls-cert-subject.c
index 29e514efab5ed8ad4fc11d8781e3045f6a961b1e..5f7c1f812def2710d5c12f9a52590207550daf0c 100644 (file)
--- a/src/tests/detect-tls-cert-subject.c
+++ b/src/tests/detect-tls-cert-subject.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test that a signature containing a tls.cert_subject is correctly parsed
  *       and that the keyword is registered.

diff --git a/src/tests/detect-tls-cert-validity.c b/src/tests/detect-tls-cert-validity.c
index 3865e3b59d85f02a039de44b7aeaeef025a95f46..fa05412553f75ae75cfaa33e55034420682e7c89 100644 (file)
--- a/src/tests/detect-tls-cert-validity.c
+++ b/src/tests/detect-tls-cert-validity.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test This is a test for a valid value 1430000000.
  *

diff --git a/src/tests/detect-tls-certs.c b/src/tests/detect-tls-certs.c
index 6521e714ca3698f65b29cb8bbb847ef106c3221d..dac9c9eadf629e5d0b768371bf03f7a522414c13 100644 (file)
--- a/src/tests/detect-tls-certs.c
+++ b/src/tests/detect-tls-certs.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test that a signature containing tls.certs is correctly parsed
  *       and that the keyword is registred.

diff --git a/src/tests/detect-tls-ja3-hash.c b/src/tests/detect-tls-ja3-hash.c
index a49b849acf85edb93ade6b6599e101f5ee377e47..1a562fe7094c65a0c502062d92355f5650928d45 100644 (file)
--- a/src/tests/detect-tls-ja3-hash.c
+++ b/src/tests/detect-tls-ja3-hash.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test matching on a simple client hello packet
  */

diff --git a/src/tests/detect-tls-ja3-string.c b/src/tests/detect-tls-ja3-string.c
index 048744678b3d9e5a4fe4cdb2ad937fbaffd51d16..ef3dcef0ff4ba9acd972e586d847bd937354cb4d 100644 (file)
--- a/src/tests/detect-tls-ja3-string.c
+++ b/src/tests/detect-tls-ja3-string.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test matching on a simple client hello packet
  */

diff --git a/src/tests/detect-tls-ja3s-hash.c b/src/tests/detect-tls-ja3s-hash.c
index ed8019105aa09550b3b0c25936544783c8263ca2..cf9fedec274a3d716df9c333032f6e0c66310d2f 100644 (file)
--- a/src/tests/detect-tls-ja3s-hash.c
+++ b/src/tests/detect-tls-ja3s-hash.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test matching on a JA3S hash from a ServerHello record
  */

diff --git a/src/tests/detect-tls-ja3s-string.c b/src/tests/detect-tls-ja3s-string.c
index 86a08fb38d73ddf39cc3f83ab80447e8aadeebd8..e61ccb7bd3374550721ac485fff94e71c461be34 100644 (file)
--- a/src/tests/detect-tls-ja3s-string.c
+++ b/src/tests/detect-tls-ja3s-string.c
@@ -15,6 +15,9 @@
  * 02110-1301, USA.
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test matching on a simple client hello packet
  */

diff --git a/src/tests/detect-tls-sni.c b/src/tests/detect-tls-sni.c
index 78824007594d7009e970028ade5007d2ff59bff5..a9b45e894e74aee75abbd9739cc01731e96df383 100644 (file)
--- a/src/tests/detect-tls-sni.c
+++ b/src/tests/detect-tls-sni.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test Test matching on a simple google.com SNI
  */

diff --git a/src/tests/detect-tls-version.c b/src/tests/detect-tls-version.c
index 946a459bcf0d205b03cd7fbdcc1b812698ba872b..a0a42909d4763bb1a6908b5a47a1462dbeb9ad08 100644 (file)
--- a/src/tests/detect-tls-version.c
+++ b/src/tests/detect-tls-version.c
@@ -22,6 +22,9 @@
  *
  */
 
+#include "detect-engine-build.h"
+#include "app-layer-parser.h"
+
 /**
  * \test DetectTlsVersionTestParse01 is a test to make sure that we parse the "id"
  *       option correctly when given valid id option

diff --git a/src/tests/detect-ttl.c b/src/tests/detect-ttl.c
index 0d014582f821d4989f1653f74a9da1e05b0a0343..d8052ecd7a0b1c80160260d543e51598eba3dafd 100644 (file)
--- a/src/tests/detect-ttl.c
+++ b/src/tests/detect-ttl.c
@@ -18,6 +18,7 @@
 
 #include "../detect-engine.h"
 #include "../util-unittest.h"
+#include "../detect-engine-build.h"
 
 /**
  * \test DetectTtlParseTest01 is a test for setting up an valid ttl value.

diff --git a/src/tests/detect.c b/src/tests/detect.c
index 3445459dfde5802e4674e4dd85ad8c863719ce02..30d653fa9e77903f0258bc107ac72e589843efb0 100644 (file)
--- a/src/tests/detect.c
+++ b/src/tests/detect.c
@@ -21,10 +21,12 @@
 #include "../conf-yaml-loader.h"
 #include "../detect-parse.h"
 #include "../detect-engine-content-inspection.h"
+#include "../detect-engine-build.h"
 #include "../pkt-var.h"
 #include "../flow-util.h"
 #include "../stream-tcp-reassemble.h"
 #include "../util-unittest.h"
+#include "../util-var-name.h"
 #include "../util-unittest-helper.h"
 
 static const char *dummy_conf_string =

diff --git a/src/tests/fuzz/fuzz_applayerparserparse.c b/src/tests/fuzz/fuzz_applayerparserparse.c
index 1a501eb430e127809d14743185a4118ea1115725..b1bfdbdee1534458137104f32407df9b7465a7e6 100644 (file)
--- a/src/tests/fuzz/fuzz_applayerparserparse.c
+++ b/src/tests/fuzz/fuzz_applayerparserparse.c
@@ -5,6 +5,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "app-layer-detect-proto.h"
 #include "flow-util.h"
 #include "app-layer-parser.h"

diff --git a/src/tests/fuzz/fuzz_applayerprotodetectgetproto.c b/src/tests/fuzz/fuzz_applayerprotodetectgetproto.c
index 7f30d459e84a849d06ecf36e2b1d52b0e758b5d2..6106a5905e7c992edb23865ba896b5b9a035a748 100644 (file)
--- a/src/tests/fuzz/fuzz_applayerprotodetectgetproto.c
+++ b/src/tests/fuzz/fuzz_applayerprotodetectgetproto.c
@@ -6,6 +6,7 @@
 
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "app-layer-detect-proto.h"
 #include "flow-util.h"
 #include "app-layer-parser.h"

diff --git a/src/tests/fuzz/fuzz_confyamlloadstring.c b/src/tests/fuzz/fuzz_confyamlloadstring.c
index 2f897ccc389c99790e718e88aca38877088278fa..f5f9ed39831e85fca12075f8b82c25c63f788afb 100644 (file)
--- a/src/tests/fuzz/fuzz_confyamlloadstring.c
+++ b/src/tests/fuzz/fuzz_confyamlloadstring.c
@@ -6,6 +6,7 @@
 
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "conf-yaml-loader.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);

diff --git a/src/tests/fuzz/fuzz_decodepcapfile.c b/src/tests/fuzz/fuzz_decodepcapfile.c
index c0c5ae4e524853d98858570f34cde4b7a8c07955..3bf60af573bf43ebecff3c93ea7d1d80d0aed39d 100644 (file)
--- a/src/tests/fuzz/fuzz_decodepcapfile.c
+++ b/src/tests/fuzz/fuzz_decodepcapfile.c
@@ -5,6 +5,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "app-layer-detect-proto.h"
 #include "defrag.h"
 #include "tm-modules.h"
@@ -12,6 +13,7 @@
 #include "source-pcap-file.h"
 #include "util-unittest-helper.h"
 #include "conf-yaml-loader.h"
+#include "util-time.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 

diff --git a/src/tests/fuzz/fuzz_mimedecparseline.c b/src/tests/fuzz/fuzz_mimedecparseline.c
index e07f5ea31dbba4460b16af7d858b817f54028b8f..5c79d8e520566c1023d277ddaa9738756a592b02 100644 (file)
--- a/src/tests/fuzz/fuzz_mimedecparseline.c
+++ b/src/tests/fuzz/fuzz_mimedecparseline.c
@@ -6,6 +6,7 @@
 
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "util-decode-mime.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);

diff --git a/src/tests/fuzz/fuzz_predefpcap_aware.c b/src/tests/fuzz/fuzz_predefpcap_aware.c
index fbdc5648c0fb070ee3242ba7716e8364bd21b670..80dc3bb7e1e07d3eea24d3219bbe0482c7bbc1e9 100644 (file)
--- a/src/tests/fuzz/fuzz_predefpcap_aware.c
+++ b/src/tests/fuzz/fuzz_predefpcap_aware.c
@@ -12,6 +12,7 @@
 #include "app-layer.h"
 #include "tm-queuehandlers.h"
 #include "util-cidr.h"
+#include "util-profiling.h"
 #include "util-proto-name.h"
 #include "detect-engine-tag.h"
 #include "detect-engine-threshold.h"
@@ -23,6 +24,8 @@
 #include "conf-yaml-loader.h"
 #include "pkt-var.h"
 #include "flow-util.h"
+#include "tm-modules.h"
+#include "tmqh-packetpool.h"
 
 #include <fuzz_pcap.h>
 

diff --git a/src/tests/fuzz/fuzz_sigpcap.c b/src/tests/fuzz/fuzz_sigpcap.c
index 5c4fb02eae3fc2f8a451fd0a407b82ef6b72f4ca..04f2be6a1f51563d88c68eca42107125214bee8f 100644 (file)
--- a/src/tests/fuzz/fuzz_sigpcap.c
+++ b/src/tests/fuzz/fuzz_sigpcap.c
@@ -12,6 +12,7 @@
 #include "app-layer.h"
 #include "tm-queuehandlers.h"
 #include "util-cidr.h"
+#include "util-profiling.h"
 #include "util-proto-name.h"
 #include "detect-engine-tag.h"
 #include "detect-engine-threshold.h"
@@ -23,6 +24,9 @@
 #include "conf-yaml-loader.h"
 #include "pkt-var.h"
 #include "flow-util.h"
+#include "flow-worker.h"
+#include "tm-modules.h"
+#include "tmqh-packetpool.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 fb69d66189dbefdb4cf669faaf613b2e3904e041..611dba1e2933154b5d995a48b9f88bea04583572 100644 (file)
--- a/src/tests/fuzz/fuzz_sigpcap_aware.c
+++ b/src/tests/fuzz/fuzz_sigpcap_aware.c
@@ -12,6 +12,7 @@
 #include "app-layer.h"
 #include "tm-queuehandlers.h"
 #include "util-cidr.h"
+#include "util-profiling.h"
 #include "util-proto-name.h"
 #include "detect-engine-tag.h"
 #include "detect-engine-threshold.h"
@@ -23,6 +24,9 @@
 #include "conf-yaml-loader.h"
 #include "pkt-var.h"
 #include "flow-util.h"
+#include "flow-worker.h"
+#include "tm-modules.h"
+#include "tmqh-packetpool.h"
 
 #include <fuzz_pcap.h>
 

diff --git a/src/threadvars.h b/src/threadvars.h
index 8b604445ed55f6b6d4675d3d04f999fd8b1ee602..3827a73fe72a82a804a78aac2f7addce925e45df 100644 (file)
--- a/src/threadvars.h
+++ b/src/threadvars.h
@@ -24,10 +24,8 @@
 #ifndef __THREADVARS_H__
 #define __THREADVARS_H__
 
-#include "util-affinity.h"
 #include "tm-queues.h"
 #include "counters.h"
-#include "threads.h"
 #include "packet-queue.h"
 #include "util-atomic.h"
 

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 36d9e4ad0fadafff9c75efaf3f6088940b3a8c8a..80915f33dd2003bd0722c9789ea7895112ff3f7a 100644 (file)
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -35,6 +35,7 @@
 #include "tm-threads.h"
 #include "tmqh-packetpool.h"
 #include "threads.h"
+#include "util-affinity.h"
 #include "util-debug.h"
 #include "util-privs.h"
 #include "util-cpu.h"

diff --git a/src/tmqh-packetpool.h b/src/tmqh-packetpool.h
index 2b6b90b04e956f84350784a5685cfd8aeed7c551..0cabb69dfd2a5e02779d987bc0810fca6a573b14 100644 (file)
--- a/src/tmqh-packetpool.h
+++ b/src/tmqh-packetpool.h
@@ -26,7 +26,6 @@
 
 #include "decode.h"
 #include "threads.h"
-#include "util-atomic.h"
 
     /* Return stack, onto which other threads free packets. */
 typedef struct PktPoolLockedStack_{

diff --git a/src/unix-manager.c b/src/unix-manager.c
index 9213039db93c2c4664da4b7517ba2fe0cbaaac37..0f0c846c88a50d87bbc714ba47c6da6cb5f3bc41 100644 (file)
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -28,6 +28,7 @@
 #include "tm-threads.h"
 #include "runmodes.h"
 #include "conf.h"
+#include "runmode-unix-socket.h"
 
 #include "output-json-stats.h"
 

diff --git a/src/util-base64.h b/src/util-base64.h
index ac78d0806dc60b5a23d4b0b654dbb10714faa67f..3b66cddb55cf3e6885750433dee8f7c39047c39d 100644 (file)
--- a/src/util-base64.h
+++ b/src/util-base64.h
@@ -26,23 +26,10 @@
 #define __UTIL_BASE64_H_
 
 #include "suricata-common.h"
-#include "threads.h"
-#include "debug.h"
-#include "decode.h"
 
-#include "detect.h"
-#include "detect-parse.h"
 
-#include "detect-engine.h"
-#include "detect-engine-mpm.h"
-#include "detect-engine-state.h"
 
-#include "flow.h"
-#include "flow-var.h"
-#include "flow-util.h"
 
-#include "util-debug.h"
-#include "util-spm-bm.h"
 
 /* Constants */
 #define ASCII_BLOCK         3

diff --git a/src/util-conf.c b/src/util-conf.c
index a135b4b3884ae44a728585d5124658741e054fa0..4abdeca7c840cc1ba6b7a03434f3274119a1bb62 100644 (file)
--- a/src/util-conf.c
+++ b/src/util-conf.c
@@ -23,6 +23,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "conf.h"
 #include "runmodes.h"
 #include "util-conf.h"

diff --git a/src/util-debug-filters.c b/src/util-debug-filters.c
index a94db699a5d21b017f52a3bf97c27cff356d510b..cbf8d5426211f3d5805d31fe2d3a37a1e677168b 100644 (file)
--- a/src/util-debug-filters.c
+++ b/src/util-debug-filters.c
@@ -24,6 +24,7 @@
  */
 
 #include "suricata-common.h"
+#include "util-debug-filters.h"
 
 /* both of these are defined in util-debug.c */
 extern int sc_log_module_initialized;

diff --git a/src/util-debug-filters.h b/src/util-debug-filters.h
index bbbcf9afc2daaf9313f7d7257d3b1c1b39f05424..5c6764c7120743d787696ecb9915797a4c3d564b 100644 (file)
--- a/src/util-debug-filters.h
+++ b/src/util-debug-filters.h
@@ -25,8 +25,6 @@
 #define __DEBUG_FILTERS_H__
 
 #include <pthread.h>
-#include "threads.h"
-#include "util-mem.h"
 
 /**
  * \brief Enum that holds the different kinds of filters available

diff --git a/src/util-debug.c b/src/util-debug.c
index 3c8a95f35f55154eee07463698a6e515357a7081..f2beabd6cbdddedd4a835e3e2ee10e907d51c953 100644 (file)
--- a/src/util-debug.c
+++ b/src/util-debug.c
@@ -29,6 +29,7 @@
 #include "util-error.h"
 #include "util-enum.h"
 #include "util-debug-filters.h"
+#include "suricata.h"
 
 #include "decode.h"
 #include "detect.h"
@@ -42,6 +43,7 @@
 
 #include "util-unittest.h"
 #include "util-syslog.h"
+#include "util-time.h"
 #include "rust.h"
 
 

diff --git a/src/util-debug.h b/src/util-debug.h
index c23256938a11a8371f8a0e3086bacc81660fdc9b..2e4a69f34eae84763bd2a50eef64d07d79bbab1e 100644 (file)
--- a/src/util-debug.h
+++ b/src/util-debug.h
@@ -27,10 +27,8 @@
 #include "suricata-common.h"
 
 #include "threads.h"
-#include "util-enum.h"
 #include "util-error.h"
 #include "util-debug-filters.h"
-#include "util-atomic.h"
 
 /**
  * \brief ENV vars that can be used to set the properties for the logging module

diff --git a/src/util-decode-mime.h b/src/util-decode-mime.h
index d6aeb154723678a71d5cdd0a003f10ef5ddfd4dc..657a90b9d61b3b543f53d1ee6542228c6db9c5e2 100644 (file)
--- a/src/util-decode-mime.h
+++ b/src/util-decode-mime.h
@@ -30,9 +30,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "suricata.h"
 #include "util-base64.h"
-#include "util-debug.h"
 
 /* Content Flags */
 #define CTNT_IS_MSG           1

diff --git a/src/util-device.h b/src/util-device.h
index b43479b06aa63c88c24cceb05b93b22e221caf48..ec6fc65bcd395d3626f98cb47299aabbce7d3654 100644 (file)
--- a/src/util-device.h
+++ b/src/util-device.h
@@ -19,7 +19,6 @@
 #define __UTIL_DEVICE_H__
 
 #include "queue.h"
-#include "unix-manager.h"
 
 #define OFFLOAD_FLAG_SG     (1<<0)
 #define OFFLOAD_FLAG_TSO    (1<<1)

diff --git a/src/util-dpdk-i40e.h b/src/util-dpdk-i40e.h
index 3d77b1152f7d6dae8d5455bd12bc4fabf1f6ec2a..6b1eb7fd13cfb2762f1c2425790700a3325de31c 100644 (file)
--- a/src/util-dpdk-i40e.h
+++ b/src/util-dpdk-i40e.h
@@ -25,7 +25,6 @@
 #define UTIL_DPDK_I40E_H
 
 #include "suricata-common.h"
-#include "util-dpdk.h"
 
 #ifdef HAVE_DPDK
 

diff --git a/src/util-dpdk-ice.h b/src/util-dpdk-ice.h
index 0049dbcba59e495b34a650af389ee7a074031d43..cdc2185cca125bb2a0ad24f4bb082bf9dbc291d4 100644 (file)
--- a/src/util-dpdk-ice.h
+++ b/src/util-dpdk-ice.h
@@ -25,7 +25,6 @@
 #define UTIL_DPDK_ICE_H
 
 #include "suricata-common.h"
-#include "util-dpdk.h"
 
 #ifdef HAVE_DPDK
 

diff --git a/src/util-dpdk-ixgbe.h b/src/util-dpdk-ixgbe.h
index bbd984acd1712de164b88c9b615c4046461d1edd..3cb18fa55d7509e07b05b505d967b953169b8fe8 100644 (file)
--- a/src/util-dpdk-ixgbe.h
+++ b/src/util-dpdk-ixgbe.h
@@ -25,7 +25,6 @@
 #define UTIL_DPDK_IXGBE_H
 
 #include "suricata-common.h"
-#include "util-dpdk.h"
 
 #ifdef HAVE_DPDK
 

diff --git a/src/util-ebpf.c b/src/util-ebpf.c
index c616346f2ac80c747cae1c3fba7b2cbee8f08a6f..407a436013dc7b151a1b8261eb3606fe6af75ab7 100644 (file)
--- a/src/util-ebpf.c
+++ b/src/util-ebpf.c
@@ -42,6 +42,7 @@
 #include <sys/resource.h>
 
 #include "util-ebpf.h"
+#include "util-affinity.h"
 #include "util-cpu.h"
 #include "util-device.h"
 

diff --git a/src/util-ebpf.h b/src/util-ebpf.h
index 2f411ddeadfc057075101b53b49140519ad79522..39e154dda1cbdb629dac1a7bba4cf66b5e073405 100644 (file)
--- a/src/util-ebpf.h
+++ b/src/util-ebpf.h
@@ -24,6 +24,8 @@
 #ifndef __UTIL_EBPF_H__
 #define __UTIL_EBPF_H__
 
+#include "flow-bypass.h"
+
 #ifdef HAVE_PACKET_EBPF
 
 #define XDP_FLAGS_UPDATE_IF_NOEXIST    (1U << 0)
@@ -31,7 +33,6 @@
 #define XDP_FLAGS_DRV_MODE             (1U << 2)
 #define XDP_FLAGS_HW_MODE              (1U << 3)
 
-#include "flow-bypass.h"
 
 struct flowv4_keys {
     __be32 src;

diff --git a/src/util-exception-policy.c b/src/util-exception-policy.c
index a214900702072366f6195aa0b2e564c1c326081c..9afddaee42ada2356e3ff568a51b233a670986f8 100644 (file)
--- a/src/util-exception-policy.c
+++ b/src/util-exception-policy.c
@@ -20,6 +20,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "util-exception-policy.h"
 #include "util-misc.h"
 

diff --git a/src/util-ioctl.c b/src/util-ioctl.c
index 83ae688f6305ddf593a91950340677d52862a035..e0f7009e329796a31c8255a278ae2c9e87a4907b 100644 (file)
--- a/src/util-ioctl.c
+++ b/src/util-ioctl.c
@@ -25,6 +25,7 @@
 #include "suricata-common.h"
 #include "conf.h"
 #include "util-device.h"
+#include "decode-sll.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>

diff --git a/src/util-ioctl.h b/src/util-ioctl.h
index 50884389724611911d9cfd9cbc3c5a3225842f98..7f12b42e2d58e8609577d7674bf61a299e4f3bf5 100644 (file)
--- a/src/util-ioctl.h
+++ b/src/util-ioctl.h
@@ -25,7 +25,6 @@
 #include "util-device.h"
 
 #ifdef OS_WIN32
-#include "win32-syscall.h"
 #endif
 
 int GetIfaceMTU(const char *pcap_dev);

diff --git a/src/util-logopenfile.c b/src/util-logopenfile.c
index 8e0f89dd16ac012a007e08b1e6fdea6f6fc3d425..ae042af81c0b906082b0afac3e24ab83a2ad7937 100644 (file)
--- a/src/util-logopenfile.c
+++ b/src/util-logopenfile.c
@@ -29,6 +29,8 @@
 #include "output.h"          /* DEFAULT_LOG_* */
 #include "util-byte.h"
 #include "util-logopenfile.h"
+#include "util-time.h"
+#include "suricata.h"
 
 #if defined(HAVE_SYS_UN_H) && defined(HAVE_SYS_SOCKET_H) && defined(HAVE_SYS_TYPES_H)
 #define BUILD_WITH_UNIXSOCKET

diff --git a/src/util-lua.c b/src/util-lua.c
index 86969348f9d2fba13751532fedff2a61d7531493..084a3e132dd2d89bc2b015fd7dbb15f8fd93c533 100644 (file)
--- a/src/util-lua.c
+++ b/src/util-lua.c
@@ -35,6 +35,7 @@
 
 #include "util-print.h"
 #include "util-unittest.h"
+#include "util-luajit.h"
 
 #include "util-debug.h"
 

diff --git a/src/util-lua.h b/src/util-lua.h
index 273b786eae28c76603c4c48b7becd07a1653b519..fa4737955518eaba7d0d0402a7187dd7ca6cb9ff 100644 (file)
--- a/src/util-lua.h
+++ b/src/util-lua.h
@@ -36,7 +36,6 @@ typedef void lua_State;
 #include <lualib.h>
 #include <lauxlib.h>
 
-#include "util-luajit.h"
 
 typedef struct LuaStreamingBuffer_ {
     const uint8_t *data;

diff --git a/src/util-luajit.c b/src/util-luajit.c
index 31e5117b73584c2f6e04bd846d4de91ce768c176..5ecaf9447e455bfd03156db71112ea01fa2c921c 100644 (file)
--- a/src/util-luajit.c
+++ b/src/util-luajit.c
@@ -28,6 +28,7 @@
 #include "conf.h"
 #include "util-pool.h"
 #include "util-lua.h"
+#include "util-luajit.h"
 
 /** \brief lua_State pool
  *

diff --git a/src/util-luajit.h b/src/util-luajit.h
index 5aa810b1eaa9fbfa38fb92d849c3696c4eaa7c7f..b90cef431b47bdd64aba0ca64a33d0bd7d860bd2 100644 (file)
--- a/src/util-luajit.h
+++ b/src/util-luajit.h
@@ -26,6 +26,8 @@
 
 #ifdef HAVE_LUAJIT
 
+#include "util-lua.h"
+
 int LuajitSetupStatesPool(void);
 void LuajitFreeStatesPool(void);
 lua_State *LuajitGetState(void);

diff --git a/src/util-memcmp.h b/src/util-memcmp.h
index bb6df864966b7ad960ce2084dcea9746ea0c9237..1ab636abae2e22f11003118fd06e96c0053a9b15 100644 (file)
--- a/src/util-memcmp.h
+++ b/src/util-memcmp.h
@@ -30,6 +30,7 @@
 #define __UTIL_MEMCMP_H__
 
 #include "util-optimize.h"
+#include "suricata.h"
 
 /** \brief compare two patterns, converting the 2nd to lowercase
  *  \warning *ONLY* the 2nd pattern is converted to lowercase

diff --git a/src/util-misc.h b/src/util-misc.h
index 8ae730931af770e3946c92e06baaf4b3358c6540..5bd2d03e1bca0fb0c3aa539d7c0b1fa7b5961f05 100644 (file)
--- a/src/util-misc.h
+++ b/src/util-misc.h
@@ -24,7 +24,6 @@
 #ifndef __UTIL_MISC_H__
 #define __UTIL_MISC_H__
 
-#include "util-error.h"
 
 /**
  * \brief Generic API that can be used by all to log an

diff --git a/src/util-mpm-ac-bs.c b/src/util-mpm-ac-bs.c
index 3fd35bd440292dbc2f55b1a7d086c8d6ae57db7e..8a51c59811d202a863b416c460a46f865bc5c3e5 100644 (file)
--- a/src/util-mpm-ac-bs.c
+++ b/src/util-mpm-ac-bs.c
@@ -51,6 +51,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 #include "util-mpm-ac-bs.h"
 
 #include "conf.h"

diff --git a/src/util-mpm-ac-ks.c b/src/util-mpm-ac-ks.c
index 5f6dbf9d328ea10b6b2546b6833bc466cf3ffcbb..dc699a79c7c553f5840f8afa8e5a901b26799a59 100644 (file)
--- a/src/util-mpm-ac-ks.c
+++ b/src/util-mpm-ac-ks.c
@@ -71,6 +71,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 
 #include "conf.h"
 #include "util-debug.h"

diff --git a/src/util-mpm-ac.c b/src/util-mpm-ac.c
index c6f5f9b0d44e051387c260f725e58f39b0472ffb..8b9f5107b9e859b1c21cf5eb2759db4d4602f459 100644 (file)
--- a/src/util-mpm-ac.c
+++ b/src/util-mpm-ac.c
@@ -51,6 +51,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 
 #include "conf.h"
 #include "util-debug.h"

diff --git a/src/util-mpm-hs.c b/src/util-mpm-hs.c
index 420c091dd1a2fa26fa6e10bec82d7aff0e08a35b..2fff553bc7c529d199db8c9e498f1819e19667ba 100644 (file)
--- a/src/util-mpm-hs.c
+++ b/src/util-mpm-hs.c
@@ -30,6 +30,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
+#include "detect-engine-build.h"
 
 #include "conf.h"
 #include "util-debug.h"

diff --git a/src/util-plugin.c b/src/util-plugin.c
index f7a96fcbced4b4745179e85b8129e878f500d8f5..6a59f257c3675e92fb24c46facd91349b2c80078 100644 (file)
--- a/src/util-plugin.c
+++ b/src/util-plugin.c
@@ -17,6 +17,8 @@
 
 #include "suricata-common.h"
 #include "suricata-plugin.h"
+#include "suricata.h"
+#include "runmodes.h"
 #include "output-eve-syslog.h"
 #include "util-plugin.h"
 

diff --git a/src/util-plugin.h b/src/util-plugin.h
index cafe314f75a3887c38cd68b1bc45ff59b84b1ff7..c958f2d79ccdf2b63abb0bfe6070ccda8c7d01d8 100644 (file)
--- a/src/util-plugin.h
+++ b/src/util-plugin.h
@@ -19,7 +19,6 @@
 #define __UTIL_PLUGIN_H__
 
 #include "suricata-plugin.h"
-#include "output-eve-syslog.h"
 
 void SCPluginsLoad(const char *capture_plugin_name, const char *capture_plugin_args);
 SCEveFileType *SCPluginFindFileType(const char *name);

diff --git a/src/util-pool-thread.h b/src/util-pool-thread.h
index b1ca22306d51d531a771b6d50e83adea34fd82c8..a67fdf5d64c2d660e96d32c822cc580ed7763aa7 100644 (file)
--- a/src/util-pool-thread.h
+++ b/src/util-pool-thread.h
@@ -39,6 +39,8 @@
 #ifndef __UTIL_POOL_THREAD_H__
 #define __UTIL_POOL_THREAD_H__
 
+#include "util-pool.h"
+
 struct PoolThreadElement_ {
     SCMutex lock;                   /**< lock, should have low contention */
     Pool *pool;                     /**< actual pool */

diff --git a/src/util-privs.h b/src/util-privs.h
index 1464731a1c3381722485bc6b76033f853954940b..6d1f0c60f98814a52e3cc399ad39889eae039799 100644 (file)
--- a/src/util-privs.h
+++ b/src/util-privs.h
@@ -37,8 +37,6 @@
 #define SCDropCaps(...)
 #define SCDropMainThreadCaps(...)
 #else
-#include "threadvars.h"
-#include "util-debug.h"
 #include <cap-ng.h>
 
 /**Drop the previliges of the given thread tv, based on the thread cap_flags

diff --git a/src/util-profiling-keywords.c b/src/util-profiling-keywords.c
index 417517529c989893c414fbc29e47b8ea5a28f793..3aba66c09400927507c130c471f556f4940f866b 100644 (file)
--- a/src/util-profiling-keywords.c
+++ b/src/util-profiling-keywords.c
@@ -36,6 +36,7 @@
 #include "util-byte.h"
 #include "util-profiling.h"
 #include "util-profiling-locks.h"
+#include "util-time.h"
 
 #ifdef PROFILING
 

diff --git a/src/util-profiling-prefilter.c b/src/util-profiling-prefilter.c
index 737eaf3fcc86a681c1c5a9e12c5b26d54d3c4418..1831a5dd52d2c2f486c14ee143b5de3a8ea7082d 100644 (file)
--- a/src/util-profiling-prefilter.c
+++ b/src/util-profiling-prefilter.c
@@ -37,6 +37,7 @@
 #include "util-byte.h"
 #include "util-profiling.h"
 #include "util-profiling-locks.h"
+#include "util-time.h"
 
 #ifdef PROFILING
 

diff --git a/src/util-profiling-rulegroups.c b/src/util-profiling-rulegroups.c
index 11ef3bd569fdb13fc29b62ec8ee14b4814645b4a..1a89908cd46273c5d8b1ad3c58dda107eb2b3afa 100644 (file)
--- a/src/util-profiling-rulegroups.c
+++ b/src/util-profiling-rulegroups.c
@@ -36,6 +36,7 @@
 #include "util-byte.h"
 #include "util-profiling.h"
 #include "util-profiling-locks.h"
+#include "util-time.h"
 
 #ifdef PROFILING
 

diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c
index af2cd9b43a77db8cbc0ce71b02e5202dc60a07bd..d41985adf2eb221c24c191c12c8115d19391f7ff 100644 (file)
--- a/src/util-profiling-rules.c
+++ b/src/util-profiling-rules.c
@@ -35,6 +35,7 @@
 #include "util-byte.h"
 #include "util-profiling.h"
 #include "util-profiling-locks.h"
+#include "util-time.h"
 
 #ifdef PROFILING
 

diff --git a/src/util-profiling.h b/src/util-profiling.h
index ee0a88b5a5c3a4cd4ad011d288b0ab4ddc5051ed..3ef032d5d862869dd6e9ca822081f3c610163ace 100644 (file)
--- a/src/util-profiling.h
+++ b/src/util-profiling.h
@@ -27,8 +27,6 @@
 
 #ifdef PROFILING
 
-#include "util-profiling-locks.h"
-#include "util-cpu.h"
 
 extern int profiling_rules_enabled;
 extern int profiling_packets_enabled;

diff --git a/src/util-random.c b/src/util-random.c
index 1bade5428b0fc2eec536781e5c9a6a9dfeb4d237..cac3f2864d26d7c5f8bca7c2f6d9c59152828040 100644 (file)
--- a/src/util-random.c
+++ b/src/util-random.c
@@ -25,6 +25,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "util-random.h"
 
 

diff --git a/src/util-rohash.h b/src/util-rohash.h
index 720eace5f60a20316aff69db85808d7dd49e885c..3b044274a54baa5036f7433a74761266d1db48d8 100644 (file)
--- a/src/util-rohash.h
+++ b/src/util-rohash.h
@@ -24,7 +24,6 @@
 #ifndef __UTIL_ROHASH_H__
 #define __UTIL_ROHASH_H__
 
-#include "queue.h"
 
 typedef struct ROHashTable_ {
     uint8_t locked;

diff --git a/src/util-spm-bm.h b/src/util-spm-bm.h
index 0512b096177b5cd20ea5bc02973aec53b59e5a4a..de7cc492e6d94b44259a40513da1d171ec6c2411 100644 (file)
--- a/src/util-spm-bm.h
+++ b/src/util-spm-bm.h
@@ -26,7 +26,6 @@
 #define __UTIL_SPM_BM__
 
 #include "suricata-common.h"
-#include "suricata.h"
 
 #define ALPHABET_SIZE 256
 

diff --git a/src/util-spm-bs.h b/src/util-spm-bs.h
index 1e97f0baa07c96d615e06c4633a01177b28bb700..ddd9302390520867836a9d127c86ed852fc7774b 100644 (file)
--- a/src/util-spm-bs.h
+++ b/src/util-spm-bs.h
@@ -26,7 +26,6 @@
 #define __UTIL_SPM_BS__
 
 #include "suricata-common.h"
-#include "suricata.h"
 
 uint8_t *BasicSearch(const uint8_t *, uint32_t, const uint8_t *, uint16_t);
 uint8_t *BasicSearchNocase(const uint8_t *, uint32_t, const uint8_t *, uint16_t);

diff --git a/src/util-spm-bs2bm.h b/src/util-spm-bs2bm.h
index 99cd7abfd78009341f7925864a1e4bda3cd5a0f2..74df96aae1e2a15ca18962e600623153cf085def 100644 (file)
--- a/src/util-spm-bs2bm.h
+++ b/src/util-spm-bs2bm.h
@@ -25,7 +25,6 @@
 #define __UTIL_SPM_BS2BM__
 
 #include "suricata-common.h"
-#include "suricata.h"
 
 #define ALPHABET_SIZE 256
 

diff --git a/src/util-spm.h b/src/util-spm.h
index 6e4372f40a39ef34e5adfbd3b2a568e2cd0c7c0f..ae3fe7f025d22a39aa5ea0634d317fbe20950fc4 100644 (file)
--- a/src/util-spm.h
+++ b/src/util-spm.h
@@ -25,8 +25,6 @@
 #define __UTIL_SPM_H__
 
 #include "util-spm-bs.h"
-#include "util-spm-bs2bm.h"
-#include "util-spm-bm.h"
 
 enum {
     SPM_BM, /* Boyer-Moore */

diff --git a/src/util-syslog.h b/src/util-syslog.h
index ebbc8478c0d564949cf8445c5561ed3c0f8dbe5f..473057a102a0684e33c8e6e8d2939f7885d20d0d 100644 (file)
--- a/src/util-syslog.h
+++ b/src/util-syslog.h
@@ -25,6 +25,8 @@
 #ifndef UTIL_SYSLOG_H
 #define        UTIL_SYSLOG_H
 
+#include "util-enum.h"
+
 SCEnumCharMap *SCSyslogGetFacilityMap(void);
 SCEnumCharMap *SCSyslogGetLogLevelMap(void);
 

diff --git a/src/util-thash.h b/src/util-thash.h
index 34fa9c20a44b05a044952178cfc2fa92c5b5bc01..644d7ac2018ec5ee50ab039f80752f0d474c44fa 100644 (file)
--- a/src/util-thash.h
+++ b/src/util-thash.h
@@ -26,8 +26,6 @@
 #ifndef __THASH_H__
 #define __THASH_H__
 
-#include "decode.h"
-#include "util-storage.h"
 
 /** Spinlocks or Mutex for the buckets. */
 //#define HRLOCK_SPIN

diff --git a/src/util-threshold-config.c b/src/util-threshold-config.c
index 84dd61ecd1f1a3623fe0133144f6a7a977de7b8b..9b63e8447d890dac2db2bb14e3c4669e941dd31b 100644 (file)
--- a/src/util-threshold-config.c
+++ b/src/util-threshold-config.c
@@ -41,6 +41,7 @@
 #include "detect-engine-threshold.h"
 #include "detect-threshold.h"
 #include "detect-parse.h"
+#include "detect-engine-build.h"
 
 #include "conf.h"
 #include "util-threshold-config.h"

diff --git a/src/util-time.c b/src/util-time.c
index dacd01d8d5e976cde0ddfb6eae9a9f816acbf214..8ab12072913854d005b41fc1f11122fdf86ae418 100644 (file)
--- a/src/util-time.c
+++ b/src/util-time.c
@@ -59,10 +59,12 @@
 #endif
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "detect.h"
 #include "threads.h"
 #include "tm-threads.h"
 #include "util-debug.h"
+#include "util-time.h"
 
 #ifdef UNITTESTS
 static struct timeval current_time = { 0, 0 };

diff --git a/src/util-unittest-helper.c b/src/util-unittest-helper.c
index 493c7cae32100801a6227090695f28d9b1dfb478..05e313727706f494f8683a859570415a8e1de351 100644 (file)
--- a/src/util-unittest-helper.c
+++ b/src/util-unittest-helper.c
@@ -36,6 +36,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-sigorder.h"
+#include "detect-engine-build.h"
 
 #include "stream-tcp.h"
 #include "stream-tcp-private.h"