From 2a1690e1106eb624d9a75c23893976d5d5d21a84 Mon Sep 17 00:00:00 2001
From: Philippe Antoine <contact@catenacyber.fr>
Date: Mon, 20 Sep 2021 21:07:40 +0200
Subject: [PATCH] pcre2: move header include to suricata-common only

---
 src/detect-engine-analyzer.c     | 1 -
 src/detect-parse.h               | 2 --
 src/detect-transform-pcrexform.c | 1 -
 src/log-pcap.c                   | 1 -
 src/suricata-common.h            | 1 +
 src/util-classification-config.c | 1 -
 src/util-debug.h                 | 1 -
 src/util-host-info.c             | 1 -
 src/util-misc.c                  | 1 -
 src/util-reference-config.c      | 1 -
 src/util-unittest.c              | 1 -
 11 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 21b98df42c..77000202c1 100644
--- 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 bc5bf163f4..9d2218462e 100644
--- 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 19fff556e0..490404db07 100644
--- 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 0a954023e7..f3d88eee10 100644
--- 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 ff813c3926..ed37bec946 100644
--- 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 0f875ffa64..11866fe629 100644
--- 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 ff032aecf4..42b4e1b457 100644
--- 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 afd186dca2..568e5e0640 100644
--- 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 deafedfa90..e5feb1be02 100644
--- 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 6768ec5448..d296d375ee 100644
--- 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 a9645ac0e7..202d95bd19 100644
--- 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"