Make use of sbuf/forward.h

diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index 87cd4a733c0712dc7bc4769a48eaf5f469f84d85..c913f4e22beaf131481b243a29c83c3e50362d7e 100644 (file)
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -14,6 +14,7 @@
 /* because we pass a spec by value */
 #include "HttpHeaderMask.h"
 #include "mem/forward.h"
+#include "sbuf/forward.h"
 #include "SquidString.h"
 
 #include <vector>
@@ -24,7 +25,6 @@ class HttpHdrContRange;
 class HttpHdrRange;
 class HttpHdrSc;
 class Packable;
-class SBuf;
 
 /** Possible owners of http header */
 typedef enum {

diff --git a/src/clients/forward.h b/src/clients/forward.h
index dbf1f01df2ae241d611e77d31bb41d34bd91482f..b464d0fbdc6e25033f3c6df35bf49c65f941becf 100644 (file)
--- a/src/clients/forward.h
+++ b/src/clients/forward.h
@@ -9,9 +9,10 @@
 #ifndef SQUID_CLIENTS_FORWARD_H
 #define SQUID_CLIENTS_FORWARD_H
 
+#include "sbuf/forward.h"
+
 class FwdState;
 class HttpRequest;
-class SBuf;
 
 class AsyncJob;
 template <class Cbc> class CbcPointer;

diff --git a/src/comm/IoCallback.h b/src/comm/IoCallback.h
index 0a396b24009973d422454ef020c3eb9686993538..b8e60c8b2a63e4148b2c8e05d20621538359edeb 100644 (file)
--- a/src/comm/IoCallback.h
+++ b/src/comm/IoCallback.h
@@ -13,8 +13,7 @@
 #include "comm/Flag.h"
 #include "comm/forward.h"
 #include "mem/forward.h"
-
-class SBuf;
+#include "sbuf/forward.h"
 
 namespace Comm
 {

diff --git a/src/comm/Read.h b/src/comm/Read.h
index 486f0a9e78f35f59f3b5ce4e153c9aa5ba4c52f9..5fc203f5032b1c41de7714607ee0b7081aef70b2 100644 (file)
--- a/src/comm/Read.h
+++ b/src/comm/Read.h
@@ -12,8 +12,7 @@
 #include "base/AsyncCall.h"
 #include "comm/forward.h"
 #include "CommCalls.h"
-
-class SBuf;
+#include "sbuf/forward.h"
 
 namespace Comm
 {

diff --git a/src/ftp/Elements.h b/src/ftp/Elements.h
index 6a78a54098b57eb7971e5a8df338b5c421b28dbd..912f09325f2bcc592aac865d0bf35d8552d1b356 100644 (file)
--- a/src/ftp/Elements.h
+++ b/src/ftp/Elements.h
@@ -10,8 +10,8 @@
 #define SQUID_FTP_ELEMENTS_H
 
 #include "http/StatusCode.h"
+#include "sbuf/forward.h"
 
-class SBuf;
 class HttpReply;
 
 namespace AnyP

diff --git a/src/internal.h b/src/internal.h
index 53ab529c4395edaad09aebe3771eea70244dc4a0..9af14a7e7f7dd3b934e5358416a0302bd30688b6 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -15,9 +15,9 @@
 #define SQUID_INTERNAL_H_
 
 #include "comm/forward.h"
+#include "sbuf/forward.h"
 
 class HttpRequest;
-class SBuf;
 class StoreEntry;
 
 void internalStart(const Comm::ConnectionPointer &clientConn, HttpRequest *, StoreEntry *);

diff --git a/src/ipc/mem/Segment.h b/src/ipc/mem/Segment.h
index e62171ca33c83e6c32ce9ff82a8b11ede6bff6a8..57b86aaf37378fe283e57263900037fb95b9471c 100644 (file)
--- a/src/ipc/mem/Segment.h
+++ b/src/ipc/mem/Segment.h
@@ -10,10 +10,9 @@
 #define SQUID_IPC_MEM_SEGMENT_H
 
 #include "base/RunnersRegistry.h"
+#include "sbuf/forward.h"
 #include "SquidString.h"
 
-class SBuf;
-
 namespace Ipc
 {