Remved cruft from structs.h

diff --git a/src/ExternalACLEntry.h b/src/ExternalACLEntry.h
index 5c3cd2420845f96baccf0f4e803da38e07d52703..b26d094fa423a171985050715116bc13b2c624fc 100644 (file)
--- a/src/ExternalACLEntry.h
+++ b/src/ExternalACLEntry.h
@@ -44,6 +44,8 @@
 
 #include "acl/Acl.h"
 #include "cbdata.h"
+#include "hash.h"
+#include "SquidString.h"
 
 class external_acl;
 /******************************************************************

diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index e514a082c6fb7837652ca31b3305fd40f3f28c7f..f556d805a5136e03f3022b27a3fc28727e960e91 100644 (file)
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -36,6 +36,7 @@
 #include "HttpHeaderRange.h"
 #include "client_side_request.h"
 #include "HttpReply.h"
+#include "HttpHeaderTools.h"
 #include "StrList.h"
 
 /*

diff --git a/src/MemObject.h b/src/MemObject.h
index d09f14571097f102cf11b99b8941b62a1849284d..a4548b0fb4ae302d482f20f83d38eeedc87cd53a 100644 (file)
--- a/src/MemObject.h
+++ b/src/MemObject.h
@@ -31,12 +31,13 @@
 #ifndef SQUID_MEMOBJECT_H
 #define SQUID_MEMOBJECT_H
 
-#include "StoreIOBuffer.h"
-#include "StoreIOState.h"
-#include "stmem.h"
 #include "CommRead.h"
-#include "RemovalPolicy.h"
+#include "dlink.h"
 #include "HttpRequestMethod.h"
+#include "RemovalPolicy.h"
+#include "stmem.h"
+#include "StoreIOBuffer.h"
+#include "StoreIOState.h"
 
 #if USE_DELAY_POOLS
 #include "DelayId.h"

diff --git a/src/PeerDigest.h b/src/PeerDigest.h
index 9d05d3144681a65a6af18f071cc9583c13dbb4de..f261d4e9b58e341416bce14855d58d301c7eafc7 100644 (file)
--- a/src/PeerDigest.h
+++ b/src/PeerDigest.h
@@ -61,6 +61,7 @@ public:
     int reserved[32 - 6];
 };
 
+class PeerDigest;
 class DigestFetchState
 {
 public:

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 88d6405a9def7531805737279d8d696cbcfde883..eaa3b94aee324255012a067a718dd8b0201c3d41 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -32,6 +32,7 @@
 #include "acl/AclAddress.h"
 #include "ClientDelayConfig.h"
 #include "DelayConfig.h"
+#include "HelperChildConfig.h"
 #include "HttpHeaderTools.h"
 #include "icmp/IcmpConfig.h"
 #include "ip/Address.h"
@@ -50,6 +51,7 @@ namespace Mgr {
 class ActionPasswordList;
 } // namespace Mgr
 class CustomLog;
+class CpuAffinityMap;
 class external_acl;
 class HeaderManglers;
 class RefreshPattern;

diff --git a/src/Store.h b/src/Store.h
index 6e6df12595395812cf528eb967c823aafc44788d..648b730094fe7f6135f95b13f31781e5ffacca9a 100644 (file)
--- a/src/Store.h
+++ b/src/Store.h
@@ -37,12 +37,12 @@
 
 #include "comm/forward.h"
 #include "CommRead.h"
+#include "hash.h"
 #include "HttpReply.h"
 #include "HttpRequestMethod.h"
 #include "Range.h"
 #include "RefCount.h"
 #include "RemovalPolicy.h"
-//#include "RequestFlags.h"
 #include "StoreIOBuffer.h"
 #include "StoreStats.h"
 

diff --git a/src/client_side_request.h b/src/client_side_request.h
index 47d72b0605ed95b7c2303afa162488e8aff11998..3dbe32969991c6c273840baa467beefa1cf84c9b 100644 (file)
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -41,18 +41,18 @@
 #if USE_ADAPTATION
 #include "adaptation/forward.h"
 #include "adaptation/Initiator.h"
-
 class HttpMsg;
 #endif
 
-/* client_side_request.c - client side request related routines (pure logic) */
-int clientBeginRequest(const HttpRequestMethod&, char const *, CSCB *, CSD *, ClientStreamData, HttpHeader const *, char *, size_t);
-
+class acl_access;
+class ACLFilledChecklist;
+class ClientRequestContext;
+class ConnStateData;
 class MemObject;
 
-class ConnStateData;
+/* client_side_request.c - client side request related routines (pure logic) */
+int clientBeginRequest(const HttpRequestMethod&, char const *, CSCB *, CSD *, ClientStreamData, HttpHeader const *, char *, size_t);
 
-class ClientRequestContext;
 
 class ClientHttpRequest
 #if USE_ADAPTATION
@@ -202,7 +202,6 @@ private:
 /* client http based routines */
 char *clientConstructTraceEcho(ClientHttpRequest *);
 
-class ACLFilledChecklist;
 ACLFilledChecklist *clientAclChecklistCreate(const acl_access * acl,ClientHttpRequest * http);
 int clientHttpRequestStatus(int fd, ClientHttpRequest const *http);
 void clientAccessCheck(ClientHttpRequest *);

diff --git a/src/http.h b/src/http.h
index bcc1bc23bb2d6c200a0afb8059dfdebcad8a2a59..c49398bb2c98d23314695dc4fe4b5017b336322b 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -38,6 +38,7 @@
 
 class ChunkedCodingParser;
 class FwdState;
+class HttpHeader;
 
 class HttpStateData : public ServerStateData
 {

diff --git a/src/ipc/Forwarder.h b/src/ipc/Forwarder.h
index f4a5f11d100d270e4a3e8d13bcc022704d9d49d5..d73ea0e667d9dfaa21d67e6c5293232cb0c5eeb8 100644 (file)
--- a/src/ipc/Forwarder.h
+++ b/src/ipc/Forwarder.h
@@ -7,8 +7,10 @@
 #define SQUID_IPC_FORWARDER_H
 
 #include "base/AsyncJob.h"
-#include "mgr/ActionParams.h"
+#include "cbdata.h"
 #include "ipc/Request.h"
+#include "mgr/ActionParams.h"
+
 #include <map>
 
 namespace Ipc

diff --git a/src/log/FormatSquidCustom.cc b/src/log/FormatSquidCustom.cc
index 1f6eb83703c984ed4a82ef4eabb60500b57f0da3..73e1d5496395d9804984f0aded69e312fb7af4df 100644 (file)
--- a/src/log/FormatSquidCustom.cc
+++ b/src/log/FormatSquidCustom.cc
@@ -32,6 +32,7 @@
 
 #include "squid.h"
 #include "AccessLogEntry.h"
+#include "format/Format.h"
 #include "log/CustomLog.h"
 #include "log/File.h"
 #include "log/Formats.h"

diff --git a/src/ssl/context_storage.h b/src/ssl/context_storage.h
index 7f200af3acf9237d007d48cc03bf91b8e7244ce1..0c5b83d1987366f0b196de41b277886f3a709009 100644 (file)
--- a/src/ssl/context_storage.h
+++ b/src/ssl/context_storage.h
@@ -9,6 +9,7 @@
 
 #include "SquidTime.h"
 #include "CacheManager.h"
+#include "ip/Address.h"
 #include "mgr/Action.h"
 #include "mgr/Command.h"
 #if HAVE_MAP

diff --git a/src/structs.h b/src/structs.h
index f3d31064691bb5a34cf5e66b72487a195cac88d8..93c4a74afc6bff4b43822a4f138bcaadbe5044ff 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -31,17 +31,11 @@
 
 #define PEER_MULTICAST_SIBLINGS 1
 
-#include "cbdata.h"
+//#include "cbdata.h"
 #include "defines.h"
-#include "dlink.h"
-#include "hash.h"
-#include "HttpHeader.h"
-#include "HttpHeaderTools.h"
-#include "ip/Address.h"
+#include "typedefs.h"
 
-class ACLChecklist;
 class ACLList;
-class PeerDigest;
 
 struct acl_tos {
     acl_tos *next;
@@ -61,19 +55,6 @@ struct acl_size_t {
     int64_t size;
 };
 
-#if USE_DELAY_POOLS
-#include "DelayConfig.h"
-#include "ClientDelayConfig.h"
-#endif
-
-#if USE_ICMP
-#include "icmp/IcmpConfig.h"
-#endif
-
-#include "HelperChildConfig.h"
-
-class CpuAffinityMap;
-
 // POD
 class close_handler
 {