Removed/reworked some header inclusions.

diff --git a/src/ConfigOption.h b/src/ConfigOption.h
index 532ac02153d7ba420a1f6473ad05c6051b18eb25..f881ce00ef26243b47d855c11610fcfd80aafa5e 100644 (file)
--- a/src/ConfigOption.h
+++ b/src/ConfigOption.h
@@ -30,11 +30,11 @@
 #ifndef SQUID_CONFIGOPTION_H
 #define SQUID_CONFIGOPTION_H
 
-class StoreEntry;
-
 /* for Vector<> */
 #include "Array.h"
 
+class StoreEntry;
+
 /* cache option parsers */
 
 class ConfigOption

diff --git a/src/DnsLookupDetails.h b/src/DnsLookupDetails.h
index 29c13bfbb826ffa1b68090651384e63813754a2b..09924a27e63168ebe0fa3482ffdefce5c688b0cf 100644 (file)
--- a/src/DnsLookupDetails.h
+++ b/src/DnsLookupDetails.h
@@ -5,7 +5,6 @@
 #ifndef SQUID_DNS_LOOKUP_DETAILS_H
 #define SQUID_DNS_LOOKUP_DETAILS_H
 
-#include "typedefs.h"
 #include "SquidString.h"
 
 /// encapsulates DNS lookup results

diff --git a/src/ETag.h b/src/ETag.h
index 0c3f1ae945787d97a1f58d61eef79cb7b3fe4b85..9f37a819f5072b3ce4ea7afa15a228fcd950b03c 100644 (file)
--- a/src/ETag.h
+++ b/src/ETag.h
@@ -14,10 +14,10 @@ public:
 };
 
 /* ETag */
-SQUIDCEXTERN int etagParseInit(ETag * etag, const char *str);
+int etagParseInit(ETag * etag, const char *str);
 /// whether etags are strong-equal
-SQUIDCEXTERN bool etagIsStrongEqual(const ETag &tag1, const ETag &tag2);
+bool etagIsStrongEqual(const ETag &tag1, const ETag &tag2);
 /// whether etags are weak-equal
-SQUIDCEXTERN bool etagIsWeakEqual(const ETag &tag1, const ETag &tag2);
+bool etagIsWeakEqual(const ETag &tag1, const ETag &tag2);
 
 #endif /* _SQUIDETAG_H */

diff --git a/src/HierarchyLogEntry.h b/src/HierarchyLogEntry.h
index 2de3bacfa02c8fc731fba9a81ec1e584a7c92502..e4fd9f8dd0db663bc2b14e024fd21e35b0c325fe 100644 (file)
--- a/src/HierarchyLogEntry.h
+++ b/src/HierarchyLogEntry.h
@@ -34,6 +34,7 @@
 
 #include "comm/Connection.h"
 #include "hier_code.h"
+#include "HttpStatusCode.h"
 #include "lookup_t.h"
 #include "rfc2181.h"
 #include "PingData.h"

diff --git a/src/client_db.h b/src/client_db.h
index 7b0f03f5d3ca87a553e7cc3eedda3fef1e484c82..f0411d7c08f591c25dc48509568de986ea158c41 100644 (file)
--- a/src/client_db.h
+++ b/src/client_db.h
@@ -36,6 +36,9 @@
 #include "anyp/ProtocolType.h"
 #include "enums.h"
 #include "ip/Address.h"
+namespace Ip {
+class Address;
+}
 
 class StoreEntry;
 class ClientInfo;

diff --git a/src/comm.h b/src/comm.h
index 32dab7a09fabba2d1aec4673ff157135a141448f..a6597a1011ce2f93c496a8a1254ee97a577cece4 100644 (file)
--- a/src/comm.h
+++ b/src/comm.h
@@ -6,9 +6,13 @@
 #include "CommCalls.h"
 #include "comm_err_t.h"
 #include "comm/IoCallback.h"
-#include "ip/Address.h"
+//#include "ip/Address.h"
 #include "StoreIOBuffer.h"
 
+namespace Ip {
+class Address;
+}
+
 /* comm.c */
 extern bool comm_iocallbackpending(void); /* inline candidate */
 

diff --git a/src/enums.h b/src/enums.h
index d255d0eb74df343e832c01fe07c194cbc2b889ed..90ab3df1eca032f7fb50847b0010aedf18b19aec 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -32,8 +32,6 @@
 #ifndef SQUID_ENUMS_H
 #define SQUID_ENUMS_H
 
-#include "HttpStatusCode.h"
-
 typedef enum {
     LOG_TAG_NONE,
     LOG_TCP_HIT,
@@ -192,8 +190,7 @@ enum {
     SNMP_C_USER,
     SNMP_C_COMMUNITY
 };
-
-#endif
+#endif /* SQUID_SNMP */
 
 typedef enum {
     MEM_NONE,
@@ -318,7 +315,7 @@ enum {
     _WIN_OS_WINLON,
     _WIN_OS_WIN7
 };
-#endif
+#endif /* _SQUID_WINDOWS_ */
 
 enum {
     DISABLE_PMTU_OFF,
@@ -334,6 +331,6 @@ typedef enum {
     HTCP_CLR_PURGE,
     HTCP_CLR_INVALIDATION
 } htcp_clr_reason;
-#endif
+#endif /* USE_HTCP */
 
 #endif /* SQUID_ENUMS_H */

diff --git a/src/errorpage.h b/src/errorpage.h
index 8e739eb194bc3d2668516c5fce03610641251dcf..c2d49dcab9b0d9da640ecaa75eec512e066b0aa9 100644 (file)
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@ -39,11 +39,9 @@
 #include "err_detail_type.h"
 #include "err_type.h"
 #include "ip/Address.h"
-#include "MemBuf.h"
 #include "SquidString.h"
-#if USE_AUTH
+/* auth/UserRequest.h is empty unless USE_AUTH is defined */
 #include "auth/UserRequest.h"
-#endif
 #if USE_SSL
 #include "ssl/ErrorDetail.h"
 #endif

diff --git a/src/esi/Context.h b/src/esi/Context.h
index 7b9955724a07b8b7f45f09047e32e9b05c67f31a..7995c4a7d90e9c910e4577e630a188a455e8d7ed 100644 (file)
--- a/src/esi/Context.h
+++ b/src/esi/Context.h
@@ -36,6 +36,7 @@
 #include "esi/Element.h"
 #include "clientStream.h"
 #include "err_type.h"
+#include "HttpStatusCode.h"
 
 class ESIVarState;
 class ClientHttpRequest;

diff --git a/src/forward.h b/src/forward.h
index ee9afe9b38b1f82c77788f0cd9fb38ba909a8187..d1f652a9d5c14dc762db19ad8b1c8b863fbd6bb8 100644 (file)
--- a/src/forward.h
+++ b/src/forward.h
@@ -6,6 +6,7 @@
 #include "comm/Connection.h"
 #include "err_type.h"
 #include "fde.h"
+#include "HttpStatusCode.h"
 #include "ip/Address.h"
 #include "RefCount.h"