From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 7 Jan 2009 11:24:40 +0000 (+1300)
Subject: convert IpAddress.h to ip/IpAddress.h includes
X-Git-Tag: SQUID_3_2_0_1~1269^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9837e5f08220e69822c2411528704c5968039f79;p=thirdparty%2Fsquid.git

convert IpAddress.h to ip/IpAddress.h includes
---

diff --git a/include/CbDataList.h b/include/CbDataList.h
index 79dcfef618..f11105b80c 100644
--- a/include/CbDataList.h
+++ b/include/CbDataList.h
@@ -1,7 +1,4 @@
 /*
- * $Id: List.h,v 1.8 2008/02/26 21:49:33 amosjeffries Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
diff --git a/src/ACLARP.cc b/src/ACLARP.cc
index b2cc1a1a1b..54ab4032f8 100644
--- a/src/ACLARP.cc
+++ b/src/ACLARP.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: ACLARP.cc,v 1.29 2008/02/05 22:38:24 amosjeffries Exp $
- *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
  *
@@ -40,7 +37,7 @@
 #include <squid_windows.h>
 #endif
 #include "squid.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #ifdef _SQUID_WIN32_
 
diff --git a/src/ACLASN.h b/src/ACLASN.h
index 79e28968c4..1879be32ae 100644
--- a/src/ACLASN.h
+++ b/src/ACLASN.h
@@ -1,7 +1,4 @@
 /*
- * $Id: ACLASN.h,v 1.10 2008/02/26 21:49:34 amosjeffries Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -39,7 +36,7 @@
 #include "CbDataList.h"
 #include "ACLStrategised.h"
 #include "ACLChecklist.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 SQUIDCEXTERN int asnMatchIp(CbDataList<int> *, IpAddress &);
 
diff --git a/src/ACLDestinationASN.h b/src/ACLDestinationASN.h
index 22589d9cba..7586d4c8ad 100644
--- a/src/ACLDestinationASN.h
+++ b/src/ACLDestinationASN.h
@@ -1,7 +1,4 @@
 /*
- * $Id: ACLDestinationASN.h,v 1.4 2008/02/26 21:49:34 amosjeffries Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -37,7 +34,7 @@
 
 #include "ACLASN.h"
 #include "ACLStrategy.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 /// \ingroup ACLAPI
 class ACLDestinationASNStrategy : public ACLStrategy<IpAddress>
diff --git a/src/ACLIP.h b/src/ACLIP.h
index 8e53f4c0ba..a0fc76260f 100644
--- a/src/ACLIP.h
+++ b/src/ACLIP.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -37,7 +34,7 @@
 
 #include "ACL.h"
 #include "splay.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 /// \ingroup ACLAPI
 class acl_ip_data
diff --git a/src/ACLSourceASN.h b/src/ACLSourceASN.h
index 820ad14ec5..486f56b41d 100644
--- a/src/ACLSourceASN.h
+++ b/src/ACLSourceASN.h
@@ -1,8 +1,4 @@
-
 /*
- * $Id: ACLSourceASN.h,v 1.3 2007/12/14 23:11:45 amosjeffries Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -42,7 +38,7 @@
 class ACLChecklist;
 
 #include "ACLStrategy.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 class ACLSourceASNStrategy : public ACLStrategy<IpAddress>
 {
diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index bb022ad9b4..3719223fe0 100644
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -1,7 +1,4 @@
 /*
- * $Id: AccessLogEntry.h,v 1.9 2008/02/26 00:15:48 rousskov Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -36,7 +33,7 @@
 #include "HttpVersion.h"
 #include "HttpRequestMethod.h"
 #include "HierarchyLogEntry.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 #include "HttpRequestMethod.h"
 
 /* forward decls */
diff --git a/src/AuthUser.h b/src/AuthUser.h
index ec063b8ad2..c2ca4fea8b 100644
--- a/src/AuthUser.h
+++ b/src/AuthUser.h
@@ -41,7 +41,7 @@ class AuthUserHashPointer;
 /* for auth_type_t */
 #include "enums.h"
 
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 #include "dlink.h"
 
 /**
diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h
index e4e0eb3fb4..ccecf4a671 100644
--- a/src/CompositePoolNode.h
+++ b/src/CompositePoolNode.h
@@ -1,6 +1,4 @@
 /*
- * $Id: CompositePoolNode.h,v 1.10 2008/02/26 21:49:34 amosjeffries Exp $
- *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
  * Based upon original delay pools code by
@@ -46,7 +44,7 @@
 #include "DelayPools.h"
 #include "DelayIdComposite.h"
 #include "CommRead.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 class StoreEntry;
 
@@ -88,5 +86,5 @@ protected:
     DeferredReadManager deferredReads;
 };
 
-#endif
+#endif /* DELAY_POOLS */
 #endif /* COMPOSITEPOOLNODE_H */
diff --git a/src/ConnectionDetail.h b/src/ConnectionDetail.h
index 853a21b7d0..5a69bcd78e 100644
--- a/src/ConnectionDetail.h
+++ b/src/ConnectionDetail.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ConnectionDetail.h,v 1.4 2007/12/14 23:11:45 amosjeffries Exp $
- *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Robert Collins
  *
@@ -37,7 +35,7 @@
 #ifndef _SQUIDCONNECTIONDETAIL_H_
 #define _SQUIDCONNECTIONDETAIL_H_
 
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 class ConnectionDetail
 {
diff --git a/src/ESI.cc b/src/ESI.cc
index 19f6b92a52..38a9fb58f7 100644
--- a/src/ESI.cc
+++ b/src/ESI.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: ESI.cc,v 1.30 2008/02/26 21:49:34 amosjeffries Exp $
- *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
  *
@@ -59,7 +56,7 @@
 #include "ESIExpression.h"
 #include "HttpRequest.h"
 #include "MemBuf.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 /* quick reference on behaviour here.
  * The ESI specification 1.0 requires the ESI processor to be able to
diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h
index 18af8cf0ed..b56e9db50b 100644
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@ -1,7 +1,4 @@
-
 /*
- * $Id: PeerSelectState.h,v 1.3 2007/12/14 23:11:45 amosjeffries Exp $
- *
  * AUTHOR: Robert Collins
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -38,7 +35,7 @@
 
 #include "cbdata.h"
 #include "PingData.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 class ps_state
 {
diff --git a/src/client_side_reply.h b/src/client_side_reply.h
index 740d97e13a..71d51199d1 100644
--- a/src/client_side_reply.h
+++ b/src/client_side_reply.h
@@ -1,8 +1,4 @@
-
 /*
- * $Id: client_side_reply.h,v 1.21 2008/02/08 18:31:02 rousskov Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -40,9 +36,9 @@
 #include "clientStream.h"
 #include "StoreClient.h"
 #include "client_side_request.h"
-#include "IpAddress.h"
 
 class ErrorState;
+class IpAddress;
 
 /* XXX make static method */
 
diff --git a/src/comm.cc b/src/comm.cc
index 913088fbdf..e4a079243f 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: comm.cc,v 1.447 2008/02/26 21:49:34 amosjeffries Exp $
- *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
  *
@@ -47,9 +44,9 @@
 #include "pconn.h"
 #include "SquidTime.h"
 #include "CommCalls.h"
-#include "IpAddress.h"
 #include "DescriptorSet.h"
 #include "icmp/net_db.h"
+#include "ip/IpAddress.h"
 #include "ip/IpIntercept.h"
 
 #if defined(_SQUID_CYGWIN_)
diff --git a/src/comm.h b/src/comm.h
index 7faf775262..006a820b60 100644
--- a/src/comm.h
+++ b/src/comm.h
@@ -6,7 +6,7 @@
 #include "AsyncCall.h"
 #include "StoreIOBuffer.h"
 #include "Array.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #define COMMIO_FD_READCB(fd)    (&commfd_table[(fd)].readcb)
 #define COMMIO_FD_WRITECB(fd)   (&commfd_table[(fd)].writecb)
diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index deaf5fb65e..befd7bb928 100644
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -1,6 +1,4 @@
 /*
- * $Id: delay_pools.cc,v 1.51 2008/02/26 21:49:34 amosjeffries Exp $
- *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
  * Based upon original delay pools code by
@@ -66,7 +64,7 @@
 #include "DelayBucket.h"
 #include "DelayUser.h"
 #include "DelayTagged.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 /// \ingroup DelayPoolsInternal
 long DelayPools::MemoryUsed = 0;
diff --git a/src/dnsserver.cc b/src/dnsserver.cc
index acb2651c50..39c7b8c546 100644
--- a/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: dnsserver.cc,v 1.74 2008/02/26 21:49:34 amosjeffries Exp $
- *
  * DEBUG: section 0     DNS Resolver
  * AUTHOR: Harvest Derived
  *
@@ -166,7 +163,7 @@ usage: dnsserver -Dhv -s nameserver
  \endverbatim
  */
 
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #if LIBRESOLV_DNS_TTL_HACK
 /// \ingroup dnsserver
diff --git a/src/errorpage.h b/src/errorpage.h
index 930e601410..b73564124f 100644
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@ -1,6 +1,4 @@
 /*
- * $Id: errorpage.h,v 1.6 2008/02/26 21:49:34 amosjeffries Exp $
- *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
  *
@@ -38,7 +36,7 @@
 
 #include "squid.h"
 #include "cbdata.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 /**
  \defgroup ErrorPageAPI Error Pages API
diff --git a/src/fde.h b/src/fde.h
index 37fbbe555c..3b503d2b51 100644
--- a/src/fde.h
+++ b/src/fde.h
@@ -1,8 +1,4 @@
-
 /*
- * $Id: fde.h,v 1.15 2008/02/12 23:22:13 rousskov Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -35,7 +31,7 @@
 #define SQUID_FDE_H
 
 #include "comm.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 class PconnPool;
 
diff --git a/src/forward.h b/src/forward.h
index 2a3341a23a..e77c1ce68b 100644
--- a/src/forward.h
+++ b/src/forward.h
@@ -6,7 +6,7 @@
 class ErrorState;
 
 #include "comm.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 class FwdServer
 {
diff --git a/src/helper.h b/src/helper.h
index b206d4003f..6369927494 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -1,7 +1,4 @@
-
 /*
- * $Id: helper.h,v 1.12 2008/02/26 21:49:34 amosjeffries Exp $
- *
  * DEBUG: section 84    Helper process maintenance
  * AUTHOR: Harvest Derived?
  *
@@ -38,7 +35,7 @@
 
 #include "squid.h"
 #include "cbdata.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 class helper_request;
 
diff --git a/src/htcp.h b/src/htcp.h
index 530044d131..1e8479b1f2 100644
--- a/src/htcp.h
+++ b/src/htcp.h
@@ -1,7 +1,4 @@
 /*
- * $Id: htcp.h,v 1.7 2008/02/26 21:49:35 amosjeffries Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -34,8 +31,10 @@
 #define SQUID_HTCP_H
 
 #if USE_HTCP
+
 #include "HttpHeader.h"
-#include "IpAddress.h"
+
+class IpAddress;
 
 /// \ingroup ServerProtocolHTCP
 class HtcpReplyData
diff --git a/src/icmp/Icmp.h b/src/icmp/Icmp.h
index f775d9335b..d9b9715c04 100644
--- a/src/icmp/Icmp.h
+++ b/src/icmp/Icmp.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ICMP.h,v 1.1 2007/12/14 23:11:45 amosjeffries Exp $
- *
  * DEBUG: section 37    ICMP Routines
  * AUTHOR: Duane Wessels, Amos Jeffries
  *
@@ -35,7 +33,7 @@
 #define _INCLUDE_ICMP_H
 
 #include "config.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #define PINGER_PAYLOAD_SZ	8192
 
diff --git a/src/icmp/Icmp4.h b/src/icmp/Icmp4.h
index 8083862bf2..6b19db03d9 100644
--- a/src/icmp/Icmp4.h
+++ b/src/icmp/Icmp4.h
@@ -36,7 +36,6 @@
 
 #include "config.h"
 #include "Icmp.h"
-#include "IpAddress.h"
 
 #if HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
diff --git a/src/icmp/Icmp6.h b/src/icmp/Icmp6.h
index 4c35f28bfb..edcc5ddea3 100644
--- a/src/icmp/Icmp6.h
+++ b/src/icmp/Icmp6.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ICMPv6.h,v 1.1 2007/12/14 23:11:45 amosjeffries Exp $
- *
  * DEBUG: section 37    ICMP Routines
  * AUTHOR: Duane Wessels, Amos Jeffries
  *
@@ -39,7 +37,6 @@
 #if USE_IPV6
 
 #include "Icmp.h"
-#include "IpAddress.h"
 
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff --git a/src/icmp/IcmpSquid.h b/src/icmp/IcmpSquid.h
index 1359bc7a70..108e081087 100644
--- a/src/icmp/IcmpSquid.h
+++ b/src/icmp/IcmpSquid.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ICMPSquid.h,v 1.1 2007/12/14 23:11:45 amosjeffries Exp $
- *
  * DEBUG: section 37    ICMP Routines
  * AUTHOR: Duane Wessels, Amos Jeffries
  *
@@ -36,7 +34,6 @@
 
 #include "config.h"
 #include "Icmp.h"
-#include "IpAddress.h"
 
 /**
  * Implements a non-blocking pseudo-ICMP engine for squid internally.
diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index ada63ca311..b9a6d3b7e9 100644
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -1,6 +1,4 @@
 /*
- * $Id: net_db.cc,v 1.202 2008/01/07 17:12:28 hno Exp $
- *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
  *
@@ -54,7 +52,7 @@
 #include "forward.h"
 #include "SquidTime.h"
 #include "wordlist.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #if USE_ICMP
 #include "icmp/IcmpSquid.h"
diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 5c162907f3..6b3f1a519c 100644
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -1,6 +1,4 @@
 /*
- * $Id: icp_v2.cc,v 1.103 2008/02/26 21:49:35 amosjeffries Exp $
- *
  * DEBUG: section 12    Internet Cache Protocol (ICP)
  * AUTHOR: Duane Wessels
  *
@@ -48,8 +46,8 @@
 #include "wordlist.h"
 #include "SquidTime.h"
 #include "SwapDir.h"
-#include "IpAddress.h"
 #include "icmp/net_db.h"
+#include "ip/IpAddress.h"
 
 /// \ingroup ServerProtocolICPInternal2
 static void icpLogIcp(const IpAddress &, log_type, int, const char *, int);
diff --git a/src/ip/IpAddress.cc b/src/ip/IpAddress.cc
index b5539ad10c..5477e6a58d 100644
--- a/src/ip/IpAddress.cc
+++ b/src/ip/IpAddress.cc
@@ -35,7 +35,7 @@
  */
 
 #include "config.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 #include "util.h"
 
 
diff --git a/src/ip/testIpAddress.cc b/src/ip/testIpAddress.cc
index 0a71117315..50a58ddaf0 100644
--- a/src/ip/testIpAddress.cc
+++ b/src/ip/testIpAddress.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "testIpAddress.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testIpAddress );
 
diff --git a/src/ipc.cc b/src/ipc.cc
index 4db52fb1e4..a6248a5290 100644
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: ipc.cc,v 1.48 2008/02/13 00:01:47 rousskov Exp $
- *
  * DEBUG: section 54    Interprocess Communication
  * AUTHOR: Duane Wessels
  *
@@ -36,7 +33,7 @@
 #include "squid.h"
 #include "comm.h"
 #include "fde.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 static const char *hello_string = "hi there\n";
 #define HELLO_BUF_SZ 32
diff --git a/src/ipcache.cc b/src/ipcache.cc
index eb47c967d7..3f9c3a7531 100644
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: ipcache.cc,v 1.269 2008/02/26 21:49:35 amosjeffries Exp $
- *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
  *
@@ -40,7 +37,7 @@
 #include "SquidTime.h"
 #include "Store.h"
 #include "wordlist.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 /**
  \defgroup IPCacheAPI IP Cache API
diff --git a/src/neighbors.cc b/src/neighbors.cc
index f1f3fa6b0b..b984761fad 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: neighbors.cc,v 1.353 2008/02/11 22:44:50 rousskov Exp $
- *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
  *
@@ -46,8 +43,8 @@
 #include "PeerSelectState.h"
 #include "SquidTime.h"
 #include "Store.h"
-#include "IpAddress.h"
 #include "icmp/net_db.h"
+#include "ip/IpAddress.h"
 
 /* count mcast group peers every 15 minutes */
 #define MCAST_COUNT_RATE 900
diff --git a/src/protos.h b/src/protos.h
index f5dec38608..57677f267b 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,7 +1,4 @@
 /*
- * $Id: protos.h,v 1.557 2008/02/26 21:49:35 amosjeffries Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
@@ -37,7 +34,7 @@
  */
 #include "Packer.h"
 /* for routines still in this file that take CacheManager parameters */
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 /* for parameters that still need these */
 #include "enums.h"
 /* some parameters stil need this */
diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index ebf788bfd6..71cd059529 100644
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,6 +1,4 @@
 /*
- * $Id: snmp_core.cc,v 1.82 2008/01/22 21:07:19 rousskov Exp $
- *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
  *
@@ -35,7 +33,7 @@
 #include "comm.h"
 #include "cache_snmp.h"
 #include "ACLChecklist.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #define SNMP_REQUEST_SIZE 4096
 #define MAX_PROTOSTAT 5
diff --git a/src/squid.h b/src/squid.h
index b15538dd77..ea015a7839 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,7 +1,4 @@
-
 /*
- * $Id: squid.h,v 1.272 2008/02/26 21:49:35 amosjeffries Exp $
- *
  * AUTHOR: Duane Wessels
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -377,7 +374,7 @@ extern "C"
 #include "profiling.h"
 #include "MemPool.h"
 
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #if !HAVE_TEMPNAM
 #include "tempnam.h"
diff --git a/src/structs.h b/src/structs.h
index 92ec0fd0c9..d64ba223fb 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,7 +1,4 @@
 /*
- * $Id: structs.h,v 1.575 2008/02/11 22:28:47 rousskov Exp $
- *
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *
diff --git a/src/wccp2.cc b/src/wccp2.cc
index 076eb7eead..eee03a35b7 100644
--- a/src/wccp2.cc
+++ b/src/wccp2.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: wccp2.cc,v 1.23 2008/02/09 03:48:05 swilton Exp $
- *
  * DEBUG: section 80    WCCP Support
  * AUTHOR: Steven Wilton
  *
@@ -39,7 +36,7 @@
 #include "Parsing.h"
 #include "Store.h"
 #include "SwapDir.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #if USE_WCCPv2
 #if HAVE_NETDB_H
diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc
index 7efc903dc1..53a4333f51 100644
--- a/tools/cachemgr.cc
+++ b/tools/cachemgr.cc
@@ -1,6 +1,4 @@
 /*
- * $Id: cachemgr.cc,v 1.6 2007/12/14 23:11:53 amosjeffries Exp $
- *
  * DEBUG: section 0     CGI Cache Manager
  * AUTHOR: Duane Wessels
  *
@@ -133,7 +131,7 @@ extern "C"
 
 #include "assert.h"
 #include "util.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 #include "getfullhostname.h"
 
 #ifndef DEFAULT_CACHEMGR_CONFIG
diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index 074f823f95..b2331aeed6 100644
--- a/tools/squidclient.cc
+++ b/tools/squidclient.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id: squidclient.cc,v 1.11 2008/02/26 21:49:46 amosjeffries Exp $
- *
  * DEBUG: section 0     WWW Client
  * AUTHOR: Harvest Derived
  *
@@ -86,7 +83,7 @@ using namespace Squid;
 #endif
 
 #include "util.h"
-#include "IpAddress.h"
+#include "ip/IpAddress.h"
 
 #ifndef BUFSIZ
 #define BUFSIZ		8192