src: remove double includes

Keep the unconditional include to be sure it works

git grep '#include "' src/*.c | sort | uniq -c | awk '$1 > 1'

diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c
index d66f7e27cb29bda706cf0d24585838dfed58ab90..f9a54510dff8f2cdf529c2079efd3539652e3d2c 100644 (file)
--- a/src/app-layer-detect-proto.c
+++ b/src/app-layer-detect-proto.c
@@ -62,7 +62,6 @@
 #include "util-memcmp.h"
 #include "util-spm.h"
 #include "util-debug.h"
-#include "util-validate.h"
 
 #include "runmodes.h"
 

diff --git a/src/app-layer-enip.c b/src/app-layer-enip.c
index 7c5c1bfb18f36c1a569b071f4f5330d28841830e..a46ddb8afbef3d19f3e85af4f3df20cae7afd7d8 100644 (file)
--- a/src/app-layer-enip.c
+++ b/src/app-layer-enip.c
@@ -48,7 +48,6 @@
 
 #include "detect-parse.h"
 #include "detect-engine.h"
-#include "util-byte.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "pkt-var.h"
@@ -607,13 +606,8 @@ void RegisterENIPTCPParsers(void)
 
 /* UNITTESTS */
 #ifdef UNITTESTS
-#include "app-layer-parser.h"
-#include "detect-parse.h"
-#include "detect-engine.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
 
 static uint8_t listIdentity[] = {/* List ID */    0x63, 0x00,
                                  /* Length */     0x00, 0x00,

diff --git a/src/app-layer.c b/src/app-layer.c
index 17907455d93cc2bf54b0b850b8572141c431a9c8..60f0ef5ddcfa88bf67ce262752810d2823a71fb4 100644 (file)
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -1178,7 +1178,6 @@ void AppLayerDeSetupCounters()
 
 #ifdef UNITTESTS
 #include "pkt-var.h"
-#include "stream-tcp.h"
 #include "stream-tcp-util.h"
 #include "stream.h"
 #include "util-unittest.h"

diff --git a/src/defrag.c b/src/defrag.c
index e541ee40256d3e6fff202bba35a9ba3eda17bd98..c93fab31ea2697f09601512c1379db7513231684 100644 (file)
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -63,8 +63,6 @@
 #include "util-unittest.h"
 #endif
 
-#include "util-validate.h"
-
 #define DEFAULT_DEFRAG_HASH_SIZE 0xffff
 #define DEFAULT_DEFRAG_POOL_SIZE 0xffff
 

diff --git a/src/detect-base64-data.c b/src/detect-base64-data.c
index b69dcdbb5b83a03a80e942c50480790db48be9c0..c237e7ac54b641dcaa367a6ad417bc85e75a1f77 100644 (file)
--- a/src/detect-base64-data.c
+++ b/src/detect-base64-data.c
@@ -77,8 +77,6 @@ int DetectBase64DataDoMatch(DetectEngineCtx *de_ctx,
 
 #ifdef UNITTESTS
 
-#include "detect-engine.h"
-
 static int g_file_data_buffer_id = 0;
 
 static int DetectBase64DataSetupTest01(void)

diff --git a/src/detect-bytemath.c b/src/detect-bytemath.c
index 6baeda3ebc54b1240c58213fe7e81ece32c816fb..b7740575b09ae2e17d47573de4b64eaadf29dfc8 100644 (file)
--- a/src/detect-bytemath.c
+++ b/src/detect-bytemath.c
@@ -424,8 +424,6 @@ SigMatch *DetectByteMathRetrieveSMVar(const char *arg, const Signature *s)
 #ifdef UNITTESTS
 #include "detect-engine-alert.h"
 
-#include "app-layer-parser.h"
-
 static int DetectByteMathParseTest01(void)
 {
 

diff --git a/src/detect-csum.c b/src/detect-csum.c
index 825c00d6b449c6fa904be1fb263593ccfe1e2c92..f65958dccd1dedf4037af16547b907dcb432827b 100644 (file)
--- a/src/detect-csum.c
+++ b/src/detect-csum.c
@@ -997,7 +997,6 @@ static int DetectCsumValidArgsTestParse03(void)
 #undef TEST3
 #undef mystr
 
-#include "detect-engine.h"
 #include "stream-tcp.h"
 
 static int DetectCsumICMPV6Test01(void)

diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c
index 8099fea4c447c4e2849b5edf32773c06d348c531..4e9029422cdac086007311a91d46076301036c7a 100644 (file)
--- a/src/detect-dnp3.c
+++ b/src/detect-dnp3.c
@@ -597,7 +597,6 @@ void DetectDNP3Register(void)
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "app-layer-parser.h"
-#include "detect-engine.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
 

diff --git a/src/detect-filesize.c b/src/detect-filesize.c
index 9f3a41d70e2f11fe0315fb72dd09b0bce7c3ba89..05caba8568c19d97c9c03f1840cc402a8c374e10 100644 (file)
--- a/src/detect-filesize.c
+++ b/src/detect-filesize.c
@@ -163,7 +163,6 @@ static void DetectFilesizeFree(DetectEngineCtx *de_ctx, void *ptr)
 #include "stream.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
-#include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "app-layer-parser.h"
 

diff --git a/src/detect-flowvar.c b/src/detect-flowvar.c
index c997276beafdcf629dd75bc3fa79b6baa69840c7..751e48ac72659f993db50c32ff7758786f7a1959 100644 (file)
--- a/src/detect-flowvar.c
+++ b/src/detect-flowvar.c
@@ -40,7 +40,6 @@
 #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-http-header-common.c b/src/detect-http-header-common.c
index 3a8fe08c05ac8b16ffda6358f82440a5dac15a10..401a50fcf54d2c375511e0731c4a1fb0fa7df27c 100644 (file)
--- a/src/detect-http-header-common.c
+++ b/src/detect-http-header-common.c
@@ -52,8 +52,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #include "detect-http-header-common.h"
 
 void *HttpHeaderThreadDataInit(void *data)

diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c
index 717178e948696c2cceee08b95923fd7da564865e..eb9e4f117c1243426c16adb445063f305ef50a22 100644 (file)
--- a/src/detect-http-header-names.c
+++ b/src/detect-http-header-names.c
@@ -63,8 +63,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #define KEYWORD_NAME "http.header_names"
 #define KEYWORD_NAME_LEGACY "http_header_names"
 #define KEYWORD_DOC "http-keywords.html#http-header-names"

diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c
index 0f32154ddd2afde5080d78c9bca92c33917017ba..162066ebeea6d8098a09981f79e1c18f71ca0dd4 100644 (file)
--- a/src/detect-http-protocol.c
+++ b/src/detect-http-protocol.c
@@ -63,8 +63,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #define KEYWORD_NAME "http.protocol"
 #define KEYWORD_NAME_LEGACY "http_protocol"
 #define KEYWORD_DOC "http-keywords.html#http-protocol"

diff --git a/src/detect-http-start.c b/src/detect-http-start.c
index 3341d775b1c980fe1cc5a6e1c9387d11a34d611b..c13d1fcb09473b487f7ca997c1ca0b563fc1a92b 100644 (file)
--- a/src/detect-http-start.c
+++ b/src/detect-http-start.c
@@ -62,8 +62,6 @@
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 
-#include "util-print.h"
-
 #define KEYWORD_NAME "http.start"
 #define KEYWORD_NAME_LEGACY "http_start"
 #define KEYWORD_DOC "http-keywords.html#http-start"

diff --git a/src/detect-mqtt-subscribe-topic.c b/src/detect-mqtt-subscribe-topic.c
index e0793b0144c8785de777e32c9203996df373c1fa..71e359375af5bca8a3853e920b979e9042748f8a 100644 (file)
--- a/src/detect-mqtt-subscribe-topic.c
+++ b/src/detect-mqtt-subscribe-topic.c
@@ -49,7 +49,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-profiling.h"

diff --git a/src/detect-mqtt-unsubscribe-topic.c b/src/detect-mqtt-unsubscribe-topic.c
index 433e18f0e59a901a49be6ceda18aefeb5971cd10..b7f884c08e8690eb502fb29cec8b8d70ace8d2ae 100644 (file)
--- a/src/detect-mqtt-unsubscribe-topic.c
+++ b/src/detect-mqtt-unsubscribe-topic.c
@@ -49,7 +49,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-profiling.h"

diff --git a/src/detect-template-rust-buffer.c b/src/detect-template-rust-buffer.c
index 62823a94e8b2bf792ce243d7c92cd25bfa437325..a3185ddda4e102c24be744acb01457c2dceaaf5e 100644 (file)
--- a/src/detect-template-rust-buffer.c
+++ b/src/detect-template-rust-buffer.c
@@ -121,9 +121,6 @@ static uint8_t DetectEngineInspectTemplateRustBuffer(DetectEngineCtx *de_ctx,
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
-#include "app-layer-parser.h"
-#include "detect-engine.h"
-#include "detect-parse.h"
 #include "flow-util.h"
 #include "stream-tcp.h"
 #include "detect-engine-alert.h"

diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c
index d881d9c457322d679584042c381906c328d8bf88..6364696e5ee22525b7f1fb76e18b0c7df3314bbe 100644 (file)
--- a/src/detect-tls-cert-fingerprint.c
+++ b/src/detect-tls-cert-fingerprint.c
@@ -41,7 +41,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 

diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c
index 72bf4a972e010c4218a000fc6842f3dcf6c4397b..c39ed95c9de4c979e21231a1075a25aa4baef0e5 100644 (file)
--- a/src/detect-tls-cert-issuer.c
+++ b/src/detect-tls-cert-issuer.c
@@ -40,7 +40,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 

diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c
index 4e494ab332463044fbc5d765801592e382c8ef10..72ba6ad9efae3d168cd3aa49f5726aba85c37f24 100644 (file)
--- a/src/detect-tls-cert-serial.c
+++ b/src/detect-tls-cert-serial.c
@@ -40,7 +40,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 

diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c
index 01848518efe4529d5795fa132a518e3695f83796..0cb4ee981b0224e611a347330a4b12334fa0e4b6 100644 (file)
--- a/src/detect-tls-cert-subject.c
+++ b/src/detect-tls-cert-subject.c
@@ -41,7 +41,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 

diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c
index be2dd7aed0db435604e8facaf1348654fa13e6a4..a9e6a6119b0a103c931d0cf4553044dbdb3b7047 100644 (file)
--- a/src/detect-tls-certs.c
+++ b/src/detect-tls-certs.c
@@ -43,7 +43,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 

diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c
index 3d4319359424f6ddb5dfaf0d5fe61553bba58fb8..625c75f3c6018de1f7a7906a6d094a1acdd7258d 100644 (file)
--- a/src/detect-tls-ja3-hash.c
+++ b/src/detect-tls-ja3-hash.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"

diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c
index 3c660bb71182a4e22a1df70f9f8d4973c34449b3..82b6eb5bccb371bcc67fe1281f60eaa156218245 100644 (file)
--- a/src/detect-tls-ja3-string.c
+++ b/src/detect-tls-ja3-string.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"

diff --git a/src/detect-tls-ja3s-hash.c b/src/detect-tls-ja3s-hash.c
index 63bec7a06bf8675dc487572f8c95562aa8f434bb..38f8efc042a65122b69acdee9e78a6c36a7221f1 100644 (file)
--- a/src/detect-tls-ja3s-hash.c
+++ b/src/detect-tls-ja3s-hash.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"

diff --git a/src/detect-tls-ja3s-string.c b/src/detect-tls-ja3s-string.c
index d19bef5c5163b8daa02c8e1145d65e8e3656a0c7..8e454dde0c138876d399800938bc00427869527a 100644 (file)
--- a/src/detect-tls-ja3s-string.c
+++ b/src/detect-tls-ja3s-string.c
@@ -44,7 +44,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 #include "util-ja3.h"

diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c
index 2f31390033c3ead6bef51e2fc4682d355c7cd1a6..eb3f385c56513610c0c2186f83af23265ac666d0 100644 (file)
--- a/src/detect-tls-sni.c
+++ b/src/detect-tls-sni.c
@@ -39,7 +39,6 @@
 #include "flow-var.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 

diff --git a/src/detect-urilen.c b/src/detect-urilen.c
index 6363c6adbb1c141926404b44bcbf7556b79c51f5..ba24b966b47030bffa463483e00f0ec61869348a 100644 (file)
--- a/src/detect-urilen.c
+++ b/src/detect-urilen.c
@@ -235,7 +235,6 @@ bool DetectUrilenValidateContent(const Signature *s, int list, const char **sige
 #include "stream.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
-#include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "app-layer-parser.h"
 #include "detect-engine-alert.h"

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 824e7ea680610f4b40d7428f0479b7dacde23436..9f9f8a777147fb53f5e408932904be1cc5cdf1e0 100644 (file)
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -55,7 +55,6 @@
 #include "app-layer-frames.h"
 #include "util-classification-config.h"
 #include "util-syslog.h"
-#include "util-logopenfile.h"
 #include "log-pcap.h"
 
 #include "output.h"

diff --git a/src/output.c b/src/output.c
index a9929f048d510e8c4c670383338f3febd9efa668..f1d771e6fe28588acd53464f463112e4bc2f44c2 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -64,7 +64,6 @@
 #include "output-json-stats.h"
 #include "log-tcp-data.h"
 #include "log-stats.h"
-#include "output-json.h"
 #include "output-json-nfs.h"
 #include "output-json-ftp.h"
 #include "output-json-tftp.h"

diff --git a/src/runmode-netmap.c b/src/runmode-netmap.c
index 85c9d27e7f90d948774bb0229f12bc4b139e12b1..5aa4128c88c4decd0fb564ef1c04633bf6eb4355 100644 (file)
--- a/src/runmode-netmap.c
+++ b/src/runmode-netmap.c
@@ -43,7 +43,6 @@
 #ifdef HAVE_NETMAP
 #define NETMAP_WITH_LIBS
 #include <net/netmap_user.h>
-#include "util-time.h"
 #endif /* HAVE_NETMAP */
 
 #include "source-netmap.h"

diff --git a/src/source-af-packet.c b/src/source-af-packet.c
index dcdce96501f581bc229687a3cd95617388b87807..f2f8f3a5c9836a27d4aa589b3b7b0318016c8f42 100644 (file)
--- a/src/source-af-packet.c
+++ b/src/source-af-packet.c
@@ -73,7 +73,6 @@
 #endif
 
 #ifdef HAVE_PACKET_EBPF
-#include "util-ebpf.h"
 #include <bpf/libbpf.h>
 #include <bpf/bpf.h>
 #endif

diff --git a/src/util-random.c b/src/util-random.c
index 488e90d2399017d1f6c8880c88d16aa72e17468d..0beee32878802757b9a1de93d56f54a1c7a9cf04 100644 (file)
--- a/src/util-random.c
+++ b/src/util-random.c
@@ -61,7 +61,6 @@ static long int RandomGetPosix(void)
 #endif /* !(defined(HAVE_WINCRYPT_H) &&  defined(OS_WIN32)) */
 
 #if defined(HAVE_WINCRYPT_H) && defined(OS_WIN32)
-#include "util-debug.h"
 #include <wincrypt.h>
 
 long int RandomGet(void)