pcre2: move header include to suricata-common only

diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 21b98df42c4cd99d48fad376c85d74a5a29275cc..77000202c19a87e073ddd7f59f759c54f94a4003 100644 (file)
--- a/src/detect-engine-analyzer.c
+++ b/src/detect-engine-analyzer.c
@@ -38,7 +38,6 @@
 #include "detect-tcp-flags.h"
 #include "feature.h"
 #include "util-print.h"
-#include <pcre2.h>
 
 static int rule_warnings_only = 0;
 static FILE *rule_engine_analysis_FD = NULL;

diff --git a/src/detect-parse.h b/src/detect-parse.h
index bc5bf163f449662fa65db554bcb220b244d70cac..9d2218462e46a5417edeb034163bfe0a4aa81539 100644 (file)
--- a/src/detect-parse.h
+++ b/src/detect-parse.h
@@ -45,8 +45,6 @@ typedef struct DetectParseRegex_ {
     struct DetectParseRegex_ *next;
 } DetectParseRegex;
 
-#include <pcre2.h>
-
 typedef struct DetectParseRegex2 {
     pcre2_code *regex;
     pcre2_match_context *context;

diff --git a/src/detect-transform-pcrexform.c b/src/detect-transform-pcrexform.c
index 19fff556e0ed4cee5db17fa50fdb9744dd979229..490404db0758a9be7957166c6a1d241d2e3bb83c 100644 (file)
--- a/src/detect-transform-pcrexform.c
+++ b/src/detect-transform-pcrexform.c
@@ -25,7 +25,6 @@
 
 #include "suricata-common.h"
 
-#include <pcre2.h>
 #include "detect.h"
 #include "detect-engine.h"
 #include "detect-parse.h"

diff --git a/src/log-pcap.c b/src/log-pcap.c
index 0a954023e70672d8c9106c532908117a874f74ad..f3d88eee1097d2022a3d68b73a8e0332aa870153 100644 (file)
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -58,7 +58,6 @@
 #include "util-misc.h"
 #include "util-cpu.h"
 #include "util-atomic.h"
-#include <pcre2.h>
 
 #include "source-pcap.h"
 

diff --git a/src/suricata-common.h b/src/suricata-common.h
index ff813c39262bd5d2a01cb3a0f50f84bd11b30c81..ed37bec946139b616a81a28d65d8f4274915cd69 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -139,6 +139,7 @@ typedef unsigned char u_char
 #endif
 
 #include <pcre.h>
+#include <pcre2.h>
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>

diff --git a/src/util-classification-config.c b/src/util-classification-config.c
index 0f875ffa6434bcf746e2756d3dfa13b320759b6c..11866fe629d7404ef8b724595b2072169bb42660 100644 (file)
--- a/src/util-classification-config.c
+++ b/src/util-classification-config.c
@@ -35,7 +35,6 @@
 #include "util-debug.h"
 #include "util-fmemopen.h"
 #include "util-byte.h"
-#include <pcre2.h>
 
 /* Regex to parse the classtype argument from a Signature.  The first substring
  * holds the classtype name, the second substring holds the classtype the

diff --git a/src/util-debug.h b/src/util-debug.h
index ff032aecf4e1ffb72f4bc743919a627fd337a3b0..42b4e1b4574fea3b34ddecbea67842b8810b7a29 100644 (file)
--- a/src/util-debug.h
+++ b/src/util-debug.h
@@ -31,7 +31,6 @@
 #include "util-error.h"
 #include "util-debug-filters.h"
 #include "util-atomic.h"
-#include <pcre2.h>
 
 /**
  * \brief ENV vars that can be used to set the properties for the logging module

diff --git a/src/util-host-info.c b/src/util-host-info.c
index afd186dca27ad7f677317976f6ddf91a406a7540..568e5e0640538bda48d2b69acb522ca95db514a1 100644 (file)
--- a/src/util-host-info.c
+++ b/src/util-host-info.c
@@ -27,7 +27,6 @@
 #include "suricata-common.h"
 #include "util-host-info.h"
 #include "util-byte.h"
-#include <pcre2.h>
 
 #ifndef OS_WIN32
 #include <sys/utsname.h>

diff --git a/src/util-misc.c b/src/util-misc.c
index deafedfa90c1caab48598ca6a2d5574fce6695e3..e5feb1be02d77e0b3756cb84d83bd3b44a353d57 100644 (file)
--- a/src/util-misc.c
+++ b/src/util-misc.c
@@ -27,7 +27,6 @@
 #include "util-debug.h"
 #include "util-unittest.h"
 #include "util-misc.h"
-#include <pcre2.h>
 
 #define PARSE_REGEX "^\\s*(\\d+(?:.\\d+)?)\\s*([a-zA-Z]{2})?\\s*$"
 static pcre2_code *parse_regex = NULL;

diff --git a/src/util-reference-config.c b/src/util-reference-config.c
index 6768ec5448a7365c4f5a0c12e5fe850ca96dd070..d296d375ee3766734d8fca3aa9bec1e244a74b08 100644 (file)
--- a/src/util-reference-config.c
+++ b/src/util-reference-config.c
@@ -25,7 +25,6 @@
 #include "detect.h"
 #include "detect-engine.h"
 #include "util-hash.h"
-#include <pcre2.h>
 
 #include "util-reference-config.h"
 #include "conf.h"

diff --git a/src/util-unittest.c b/src/util-unittest.c
index a9645ac0e7c08c7dd399f6001b59e3e331c889ad..202d95bd1951957c960812bf2625a00ab2a75e1c 100644 (file)
--- a/src/util-unittest.c
+++ b/src/util-unittest.c
@@ -38,7 +38,6 @@
 #include "util-debug.h"
 #include "util-time.h"
 #include "conf.h"
-#include <pcre2.h>
 
 #include "stream-tcp.h"
 #include "stream-tcp-reassemble.h"