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

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 58f846b62117a804f769c6c7ebf74d7f0cefad27..9fbd72d4f11ed351eb5fbf38e8360e2badc6df28 100644 (file)
--- 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 086cc16be62c99a9dc98bf220615b4b8b111da3e..f090ff70ece7adc3cbaf1d8d7808ea93419bcef7 100644 (file)
--- 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 075f7c4399570110a311dc486247c395dcc161c6..64568cd2cba07df3b0c156b3a90f4d209e5d927a 100644 (file)
--- 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 97dab0dab6f35674a685154933862821e532dd4b..971ac6acb5851817e813c54c1dee36b31a2af5b8 100644 (file)
--- 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 3cffecf4d539c804fcfb4e267b6c652f56f11f15..8a2ee0f47e1744f48895512f8aa5f68805530f7e 100644 (file)
--- 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 9fc5f1e2f3a7f36f53a9cc6d5d677e0e5aca8118..900426df1ea6d8195503d1f033b8d17f35e46683 100644 (file)
--- 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 1b561fc346b0d6527bcf3eb89f6fe4f3206f8765..59eab41ece326706524ac3d6feae4a570a756f54 100644 (file)
--- 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 {