From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com>
Date: Sat, 4 Nov 2023 14:00:49 +0000 (+0000)
Subject: Maintenance: do not include SBuf.h needlessly (#1569)
X-Git-Tag: SQUID_7_0_1~295
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45b2c8c3c784cc8b22bafa8fa30621fb9ef8278a;p=thirdparty%2Fsquid.git

Maintenance: do not include SBuf.h needlessly (#1569)
---

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 58f846b621..9fbd72d4f1 100644
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -23,7 +23,7 @@
 #include "MessageSizes.h"
 #include "Notes.h"
 #include "proxyp/forward.h"
-#include "sbuf/SBuf.h"
+#include "sbuf/forward.h"
 #if ICAP_CLIENT
 #include "adaptation/icap/Elements.h"
 #endif
diff --git a/src/SBufStatsAction.h b/src/SBufStatsAction.h
index 086cc16be6..f090ff70ec 100644
--- a/src/SBufStatsAction.h
+++ b/src/SBufStatsAction.h
@@ -10,7 +10,6 @@
 #define SQUID_SBUFEXTRAS_H
 
 #include "mgr/Action.h"
-#include "sbuf/SBuf.h"
 #include "StatHist.h"
 
 class StoreEntry;
diff --git a/src/acl/InnerNode.cc b/src/acl/InnerNode.cc
index 075f7c4399..64568cd2cb 100644
--- a/src/acl/InnerNode.cc
+++ b/src/acl/InnerNode.cc
@@ -16,6 +16,7 @@
 #include "ConfigParser.h"
 #include "debug/Stream.h"
 #include "globals.h"
+#include "sbuf/SBuf.h"
 #include <algorithm>
 
 void
diff --git a/src/anyp/PortCfg.h b/src/anyp/PortCfg.h
index 97dab0dab6..971ac6acb5 100644
--- a/src/anyp/PortCfg.h
+++ b/src/anyp/PortCfg.h
@@ -15,7 +15,6 @@
 #include "base/CodeContext.h"
 #include "comm/Connection.h"
 #include "comm/Tcp.h"
-#include "sbuf/SBuf.h"
 #include "security/ServerOptions.h"
 
 namespace AnyP
diff --git a/src/globals.h b/src/globals.h
index 3cffecf4d5..8a2ee0f47e 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -14,7 +14,6 @@
 #include "hash.h"
 #include "IoStats.h"
 #include "rfc2181.h"
-#include "sbuf/SBuf.h"
 
 extern char *ConfigFile;    /* NULL */
 extern char *IcpOpcodeStr[];
diff --git a/src/helper/ChildConfig.cc b/src/helper/ChildConfig.cc
index 9fc5f1e2f3..900426df1e 100644
--- a/src/helper/ChildConfig.cc
+++ b/src/helper/ChildConfig.cc
@@ -13,6 +13,7 @@
 #include "globals.h"
 #include "helper/ChildConfig.h"
 #include "Parsing.h"
+#include "sbuf/SBuf.h"
 
 #include <cstring>
 
diff --git a/src/security/KeyLog.h b/src/security/KeyLog.h
index 1b561fc346..59eab41ece 100644
--- a/src/security/KeyLog.h
+++ b/src/security/KeyLog.h
@@ -11,7 +11,6 @@
 
 #include "log/CustomLog.h"
 #include "log/forward.h"
-#include "sbuf/SBuf.h"
 #include "security/forward.h"
 
 namespace Security {