From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 24 Apr 2024 17:57:26 +0000 (-0600)
Subject: misc: remove some unused includes
X-Git-Tag: suricata-8.0.0-beta1~1416
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10952%2Fhead;p=thirdparty%2Fsuricata.git

misc: remove some unused includes

Remove unused includes noticed while updating runmode access.
---

diff --git a/src/detect-engine-loader.c b/src/detect-engine-loader.c
index 9fd5eef4a2..fba39e0879 100644
--- a/src/detect-engine-loader.c
+++ b/src/detect-engine-loader.c
@@ -32,7 +32,6 @@
 #include "threadvars.h"
 #include "tm-threads.h"
 #include "queue.h"
-#include "util-signal.h"
 
 #include "detect-engine-loader.h"
 #include "detect-engine-build.h"
diff --git a/src/detect-replace.c b/src/detect-replace.c
index 63244553b0..78b4a5f1d8 100644
--- a/src/detect-replace.c
+++ b/src/detect-replace.c
@@ -35,29 +35,19 @@
 #include "detect.h"
 #include "detect-parse.h"
 #include "detect-content.h"
-#include "detect-uricontent.h"
-#include "detect-byte-extract.h"
 #include "detect-replace.h"
 #include "app-layer.h"
 
 #include "detect-engine-mpm.h"
 #include "detect-engine.h"
-#include "detect-engine-state.h"
 #include "detect-engine-build.h"
 
 #include "util-checksum.h"
 
 #include "util-unittest.h"
-#include "util-unittest-helper.h"
-
-#include "flow-var.h"
 
 #include "util-debug.h"
 
-#include "pkt-var.h"
-#include "host.h"
-#include "util-profiling.h"
-
 static int DetectReplaceSetup(DetectEngineCtx *, Signature *, const char *);
 #ifdef UNITTESTS
 static void DetectReplaceRegisterTests(void);
diff --git a/src/flow-manager.c b/src/flow-manager.c
index caf91f9148..2e883f9246 100644
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -28,7 +28,6 @@
 #include "tm-threads.h"
 #include "runmodes.h"
 
-#include "util-random.h"
 #include "util-time.h"
 
 #include "flow.h"
@@ -41,21 +40,13 @@
 #include "flow-storage.h"
 #include "flow-spare-pool.h"
 
-#include "stream-tcp-reassemble.h"
 #include "stream-tcp.h"
 
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
 #include "util-device.h"
 
 #include "util-debug.h"
 
 #include "threads.h"
-#include "detect.h"
-#include "detect-engine-state.h"
-#include "stream.h"
-
-#include "app-layer-parser.h"
 
 #include "host-timeout.h"
 #include "defrag-timeout.h"
diff --git a/src/flow.c b/src/flow.c
index 2be14e8d00..ce09ccfe7c 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -31,8 +31,6 @@
 #include "decode.h"
 #include "conf.h"
 #include "threadvars.h"
-#include "tm-threads.h"
-#include "runmodes.h"
 
 #include "util-random.h"
 #include "util-time.h"
@@ -41,17 +39,13 @@
 #include "flow-queue.h"
 #include "flow-hash.h"
 #include "flow-util.h"
-#include "flow-var.h"
 #include "flow-private.h"
-#include "flow-timeout.h"
 #include "flow-manager.h"
 #include "flow-storage.h"
 #include "flow-bypass.h"
 #include "flow-spare-pool.h"
 
 #include "stream-tcp-private.h"
-#include "stream-tcp-reassemble.h"
-#include "stream-tcp.h"
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
@@ -60,12 +54,6 @@
 #include "util-macset.h"
 
 #include "util-debug.h"
-#include "util-privs.h"
-#include "util-validate.h"
-
-#include "detect.h"
-#include "detect-engine-state.h"
-#include "stream.h"
 
 #include "app-layer-parser.h"
 #include "app-layer-expectation.h"
diff --git a/src/log-pcap.c b/src/log-pcap.c
index f4ee094832..5eb77f9e32 100644
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -53,7 +53,6 @@
 #include "util-datalink.h"
 #include "util-misc.h"
 #include "util-path.h"
-#include "util-profiling.h"
 #include "util-time.h"
 
 #define DEFAULT_LOG_FILENAME            "pcaplog"
diff --git a/src/output-json.c b/src/output-json.c
index 63558e514f..af041c0ac0 100644
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -25,13 +25,9 @@
  */
 
 #include "suricata-common.h"
-#include "detect.h"
 #include "flow.h"
 #include "conf.h"
 
-#include "threads.h"
-#include "tm-threads.h"
-#include "threadvars.h"
 #include "util-debug.h"
 #include "util-time.h"
 #include "util-var-name.h"
@@ -40,11 +36,7 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 
-#include "detect-parse.h"
 #include "detect-engine.h"
-#include "detect-engine-mpm.h"
-#include "detect-reference.h"
-#include "app-layer-parser.h"
 #include "util-classification-config.h"
 #include "util-syslog.h"
 
@@ -56,7 +48,6 @@
 #include "output-json.h"
 
 #include "util-byte.h"
-#include "util-privs.h"
 #include "util-print.h"
 #include "util-proto-name.h"
 #include "util-optimize.h"
diff --git a/src/runmodes.c b/src/runmodes.c
index e732ab9596..fb489973ac 100644
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -23,18 +23,11 @@
  */
 
 #include "suricata-common.h"
-#include "detect.h"
 #include "detect-engine.h"
-#include "detect-engine-mpm.h"
 #include "app-layer-parser.h"
-#include "tm-threads.h"
 #include "util-debug.h"
-#include "util-time.h"
-#include "util-cpu.h"
-#include "util-byte.h"
 #include "util-affinity.h"
 #include "conf.h"
-#include "queue.h"
 #include "runmodes.h"
 #include "runmode-af-packet.h"
 #include "runmode-af-xdp.h"
@@ -57,11 +50,6 @@
 
 #include "output.h"
 
-#include "alert-fastlog.h"
-#include "alert-debuglog.h"
-
-#include "log-httplog.h"
-
 #include "source-pfring.h"
 
 #include "tmqh-flow.h"
diff --git a/src/util-dpdk.c b/src/util-dpdk.c
index 8bffa60d27..b5f46a30a5 100644
--- a/src/util-dpdk.c
+++ b/src/util-dpdk.c
@@ -24,7 +24,6 @@
 #include "suricata.h"
 #include "util-dpdk.h"
 #include "util-debug.h"
-#include "util-byte.h"
 
 void DPDKCleanupEAL(void)
 {
diff --git a/src/util-privs.c b/src/util-privs.c
index 905c56b512..08f704197c 100644
--- a/src/util-privs.c
+++ b/src/util-privs.c
@@ -40,7 +40,6 @@
 #include <sys/prctl.h>
 #endif
 #include "threadvars.h"
-#include "util-cpu.h"
 #include "runmodes.h"
 
 /** flag indicating if we'll be using caps */
diff --git a/src/util-reference-config.c b/src/util-reference-config.c
index 3ee4dd85df..e1d6aa3636 100644
--- a/src/util-reference-config.c
+++ b/src/util-reference-config.c
@@ -29,7 +29,6 @@
 #include "util-reference-config.h"
 #include "conf.h"
 #include "util-unittest.h"
-#include "util-error.h"
 #include "util-debug.h"
 #include "util-fmemopen.h"
 
diff --git a/src/util-threshold-config.c b/src/util-threshold-config.c
index aa99915880..8f287adf2c 100644
--- a/src/util-threshold-config.c
+++ b/src/util-threshold-config.c
@@ -36,7 +36,6 @@
 #include "detect.h"
 #include "detect-engine.h"
 #include "detect-engine-address.h"
-#include "detect-engine-threshold.h"
 #include "detect-threshold.h"
 #include "detect-parse.h"
 #include "detect-engine-build.h"
@@ -47,7 +46,6 @@
 #include "util-unittest-helper.h"
 #include "util-byte.h"
 #include "util-time.h"
-#include "util-error.h"
 #include "util-debug.h"
 #include "util-fmemopen.h"