From: Philippe Antoine <pantoine@oisf.net>
Date: Fri, 16 Sep 2022 12:46:42 +0000 (+0200)
Subject: src: fix some include orders
X-Git-Tag: suricata-7.0.0-rc1~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9af0dafbad02fc90b94b0ba9d2af4fd6c373454d;p=thirdparty%2Fsuricata.git

src: fix some include orders

So as to be able to get include removal right
---

diff --git a/src/app-layer-enip.c b/src/app-layer-enip.c
index 87f4d5a396..7c5c1bfb18 100644
--- a/src/app-layer-enip.c
+++ b/src/app-layer-enip.c
@@ -25,6 +25,7 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 
 #include "util-debug.h"
 #include "util-byte.h"
diff --git a/src/app-layer-htp-xff.c b/src/app-layer-htp-xff.c
index 1d60df3633..35e62aff35 100644
--- a/src/app-layer-htp-xff.c
+++ b/src/app-layer-htp-xff.c
@@ -29,8 +29,11 @@
 #include "app-layer-htp.h"
 #include "app-layer-htp-xff.h"
 
-#include "util-misc.h"
+#ifndef HAVE_MEMRCHR
 #include "util-memrchr.h"
+#endif
+
+#include "util-misc.h"
 #include "util-unittest.h"
 
 /** XFF header value minimal length */
diff --git a/src/app-layer-rfb.c b/src/app-layer-rfb.c
index 49f67b6d0a..829e918adc 100644
--- a/src/app-layer-rfb.c
+++ b/src/app-layer-rfb.c
@@ -32,7 +32,7 @@
 #include "app-layer-parser.h"
 #include "app-layer-rfb.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 static int RFBRegisterPatternsForProtocolDetection(void)
 {
diff --git a/src/detect-ike-chosen-sa.c b/src/detect-ike-chosen-sa.c
index 3b7e224e4e..2ab9fbec0b 100644
--- a/src/detect-ike-chosen-sa.c
+++ b/src/detect-ike-chosen-sa.c
@@ -31,7 +31,7 @@
 #include "util-byte.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 /**
  *   [ike.chosen_sa_attribute]:<sa_attribute>=<type>;
diff --git a/src/output-flow.h b/src/output-flow.h
index 04f8784192..2fa26660fe 100644
--- a/src/output-flow.h
+++ b/src/output-flow.h
@@ -26,6 +26,7 @@
 #ifndef __OUTPUT_FLOW_H__
 #define __OUTPUT_FLOW_H__
 
+#include "tm-modules.h"
 
 /** flow logger function pointer type */
 typedef int (*FlowLogger)(ThreadVars *, void *thread_data, Flow *f);
diff --git a/src/output-json.c b/src/output-json.c
index 0b6ea4abf1..3fe7891bd8 100644
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -68,7 +68,7 @@
 #include "flow-bit.h"
 #include "flow-storage.h"
 
-#include "source-pcap-file.h"
+#include "source-pcap-file-helper.h"
 
 #include "suricata-plugin.h"
 
diff --git a/src/output-stats.h b/src/output-stats.h
index e5cd429b40..d2df64c343 100644
--- a/src/output-stats.h
+++ b/src/output-stats.h
@@ -26,6 +26,8 @@
 #ifndef __OUTPUT_STATS_H__
 #define __OUTPUT_STATS_H__
 
+#include "tm-modules.h"
+
 typedef struct StatsRecord_ {
     const char *name;
     const char *tm_name;
diff --git a/src/source-pcap-file-helper.h b/src/source-pcap-file-helper.h
index 2d98f4dc46..7db83b1559 100644
--- a/src/source-pcap-file-helper.h
+++ b/src/source-pcap-file-helper.h
@@ -112,4 +112,6 @@ void CleanupPcapFileFileVars(PcapFileFileVars *pfv);
  */
 TmEcode ValidateLinkType(int datalink, DecoderFunc *decoder);
 
+const char *PcapFileGetFilename(void);
+
 #endif /* __SOURCE_PCAP_FILE_HELPER_H__ */
diff --git a/src/source-pcap-file.h b/src/source-pcap-file.h
index d864fd7e87..30a3c2ec69 100644
--- a/src/source-pcap-file.h
+++ b/src/source-pcap-file.h
@@ -30,7 +30,6 @@ void TmModuleDecodePcapFileRegister (void);
 void PcapIncreaseInvalidChecksum(void);
 
 void PcapFileGlobalInit(void);
-const char *PcapFileGetFilename(void);
 
 #endif /* __SOURCE_PCAP_FILE_H__ */
 
diff --git a/src/util-memcpy.h b/src/util-memcpy.h
index c2b8cd7997..67e5ce7add 100644
--- a/src/util-memcpy.h
+++ b/src/util-memcpy.h
@@ -27,6 +27,8 @@
 #ifndef __UTIL_MEMCPY_H__
 #define __UTIL_MEMCPY_H__
 
+#include "suricata-common.h"
+
 /**
  * \internal
  * \brief Does a memcpy of the input string to lowercase.
diff --git a/src/util-random.c b/src/util-random.c
index 0beee32878..488e90d239 100644
--- a/src/util-random.c
+++ b/src/util-random.c
@@ -61,6 +61,7 @@ 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)
diff --git a/src/util-rule-vars.h b/src/util-rule-vars.h
index a79e5c6c51..a5be2fa3a3 100644
--- a/src/util-rule-vars.h
+++ b/src/util-rule-vars.h
@@ -24,6 +24,8 @@
 #ifndef __UTIL_RULE_VARS_H__
 #define __UTIL_RULE_VARS_H__
 
+#include "detect.h"
+
 /** Enum indicating the various vars type in the yaml conf file */
 typedef enum {
     SC_RULE_VARS_ADDRESS_GROUPS,