Removed inclusion of protos.h from most clients.

diff --git a/src/AuthReg.cc b/src/AuthReg.cc
index 86d59df5f21b1cd1fd2d2d4b1837115bd2481b12..2a382f96aad98ff039e46e788fc9a4cef8ffb34d 100644 (file)
--- a/src/AuthReg.cc
+++ b/src/AuthReg.cc
@@ -17,7 +17,6 @@
 #endif
 
 #include "Debug.h"
-#include "protos.h"
 
 /**
  * Initialize the authentication modules (if any)

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 7f401b01bed1292d7ace47984f855f6f1fb8c787..bc6517ad00a095e50f505f0d7419ac1bdc058014 100644 (file)
--- a/src/CacheDigest.cc
+++ b/src/CacheDigest.cc
@@ -36,7 +36,6 @@
 #include "squid.h"
 #include "md5.h"
 #include "Mem.h"
-#include "protos.h"
 #include "StatCounters.h"
 #include "Store.h"
 #include "store_key_md5.h"

diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index 2ba9baaa4d21dcf5301194aa94eac9b9ec9c39e7..dc799acc24e8d6acf4657faf46f33cc973b1ac3e 100644 (file)
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -38,7 +38,6 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "globals.h"
-#include "protos.h"
 
 void
 ConfigParser::destruct()

diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc
index e6665682dbea98dba8d3aa2044250f793b40b8fd..7cecee29bd93c169744a96cfcfe58c84f0e28432 100644 (file)
--- a/src/CpuAffinity.cc
+++ b/src/CpuAffinity.cc
@@ -9,7 +9,6 @@
 #include "CpuAffinitySet.h"
 #include "Debug.h"
 #include "globals.h"
-#include "protos.h"
 #include "structs.h"
 #include "tools.h"
 

diff --git a/src/DelaySpec.cc b/src/DelaySpec.cc
index fee83035eedcbb19dc8eef573bd94a5d97075c1c..e03af0c7874f3c0f0b5edf557d1fce4044108cc2 100644 (file)
--- a/src/DelaySpec.cc
+++ b/src/DelaySpec.cc
@@ -43,7 +43,6 @@
 #include "cache_cf.h"
 #include "DelaySpec.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "Store.h"
 
 DelaySpec::DelaySpec() : restore_bps(-1), max_bytes (-1)

diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc
index 230b52d7f167b6f29a9c800bf413c10cc9cdfcad..fe49b6c97901852a684f6871fd6ca7769dd36b6c 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.cc
+++ b/src/DiskIO/AIO/AIODiskFile.cc
@@ -52,7 +52,6 @@
 #include "DiskIO/WriteRequest.h"
 #include "disk.h"
 #include "globals.h"
-#include "protos.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index 8f9fb580ff0a2922dc4102e0a5a2f6b11303f0ce..fcc29ff1a8558ce96f3ac2e8be183e87c0c22754 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -39,7 +39,6 @@
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
 #include "disk.h"
-#include "protos.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.cc b/src/DiskIO/Blocking/BlockingIOStrategy.cc
index d9329ce61556e15bc1d935563b1a5d66570766a6..8bffd4f117bd75f7d7a3b491d4c7a05229059846 100644 (file)
--- a/src/DiskIO/Blocking/BlockingIOStrategy.cc
+++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc
@@ -34,7 +34,6 @@
 #include "squid.h"
 #include "BlockingIOStrategy.h"
 #include "BlockingFile.h"
-#include "protos.h"
 #include "unlinkd.h"
 
 bool

diff --git a/src/DiskIO/DiskDaemon/DiskdAction.cc b/src/DiskIO/DiskDaemon/DiskdAction.cc
index 95f09845da15295ad4f74ac2a993f56aa6670a12..96494fae884cafefa3792032f6e488708a4f7b4e 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdAction.cc
+++ b/src/DiskIO/DiskDaemon/DiskdAction.cc
@@ -13,7 +13,6 @@
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/ActionWriter.h"
 #include "Store.h"
-#include "protos.h"
 #include "tools.h"
 
 DiskdActionData::DiskdActionData()

diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
index ba4ce1bc5c8d41de43db3be93d6516dc2eb796cb..99048a614ba9b807cc2179c7b6a47afb2b0f8385 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
@@ -39,7 +39,6 @@
 #include "DiskdFile.h"
 #include "diomsg.h"
 #include "fd.h"
-#include "protos.h"
 #include "Store.h"
 #include "StatCounters.h"
 #include "SquidIpc.h"

diff --git a/src/DiskIO/DiskThreads/CommIO.cc b/src/DiskIO/DiskThreads/CommIO.cc
index d975942c6dd65c22f96f613b21c72f6012548ed2..3e4e23bf4361fa396737884a53e705b1efd12254 100644 (file)
--- a/src/DiskIO/DiskThreads/CommIO.cc
+++ b/src/DiskIO/DiskThreads/CommIO.cc
@@ -37,7 +37,6 @@
 #include "DiskIO/DiskThreads/CommIO.h"
 #include "fd.h"
 #include "globals.h"
-#include "protos.h"
 
 void
 CommIO::Initialise()

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
index 173c276a21caaf210ad40fb3af1e9e611847b38e..4a7db6e4e1dcc5e5db4aadde0af5636897c61e91 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
@@ -44,7 +44,6 @@
 #include "globals.h"
 #include "StatCounters.h"
 #include "Store.h"
-#include "protos.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc
index 03526a9f2d8148b752979d2da6a57118521fc948..38de08678512427e354f63a0db92ac38b6afc978 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoFile.cc
+++ b/src/DiskIO/IpcIo/IpcIoFile.cc
@@ -20,7 +20,6 @@
 #include "ipc/Queue.h"
 #include "ipc/StrandSearch.h"
 #include "ipc/UdsOp.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 #include "tools.h"

diff --git a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc
index 277fd52b841caddfebeffb9a745175ca1117612a..1bbcc6a25381ff9d19168f095451832b02ef48ff 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc
+++ b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc
@@ -5,7 +5,6 @@
 #include "squid.h"
 #include "IpcIoFile.h"
 #include "IpcIoIOStrategy.h"
-#include "protos.h"
 #include "unlinkd.h"
 
 bool

diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc
index fe36ee2322626695da4d0739c48ed6d7f230a04b..96efc8627bffc7462095e77473fa8e0500d23691 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedFile.cc
+++ b/src/DiskIO/Mmapped/MmappedFile.cc
@@ -12,7 +12,6 @@
 #include "DiskIO/WriteRequest.h"
 #include "disk.h"
 #include "globals.h"
-#include "protos.h"
 
 #if HAVE_SYS_MMAN_H
 #include <sys/mman.h>

diff --git a/src/DiskIO/Mmapped/MmappedIOStrategy.cc b/src/DiskIO/Mmapped/MmappedIOStrategy.cc
index 66dfcb7d0214a1f7ddc20b10ed9949d2a6e2d58f..33098d827e0d9cafec1a8bf3d3cc08e126f36b5e 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedIOStrategy.cc
+++ b/src/DiskIO/Mmapped/MmappedIOStrategy.cc
@@ -5,7 +5,6 @@
 #include "squid.h"
 #include "MmappedFile.h"
 #include "MmappedIOStrategy.h"
-#include "protos.h"
 #include "unlinkd.h"
 
 bool

diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc
index 002bdda81e4d141aab6bb060e6f07f4d96606ee6..76d2d86e6d9c8155dc314d130afbb9d929da4a0b 100644 (file)
--- a/src/HelperChildConfig.cc
+++ b/src/HelperChildConfig.cc
@@ -3,7 +3,6 @@
 #include "Debug.h"
 #include "HelperChildConfig.h"
 #include "globals.h"
-#include "protos.h"
 
 #include <string.h>
 

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index 62ab41a97822332d3bbbf305dfd6dd5036074c8f..f9d71a702c5b28002ba4f5729dba43827d4a29c9 100644 (file)
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -39,7 +39,6 @@
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"
-#include "protos.h"
 
 #if HAVE_MAP
 #include <map>

diff --git a/src/HttpHdrContRange.cc b/src/HttpHdrContRange.cc
index c9c01af051ab995600aedad2f021bd822c454484..584a2f7a2ada6e07daffd5a55b38d49e259d5c76 100644 (file)
--- a/src/HttpHdrContRange.cc
+++ b/src/HttpHdrContRange.cc
@@ -39,7 +39,6 @@
 #include "HttpHdrContRange.h"
 #include "HttpHeaderTools.h"
 #include "Mem.h"
-#include "protos.h"
 
 /*
  *    Currently only byte ranges are supported

diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index b8217ab461866c045b0f8448bf45efbc86b52f92..18fed677d50839095b7d84d010cd9192304e338e 100644 (file)
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -39,7 +39,6 @@
 #include "client_side_request.h"
 #include "HttpReply.h"
 #include "StrList.h"
-#include "protos.h"
 
 /*
  *    Currently only byte ranges are supported

diff --git a/src/HttpHdrSc.cc b/src/HttpHdrSc.cc
index 43755ea19b2df4473787355f29d21bd00c78e89b..4826d767674448ce98798e1b83bdff5172f6a9cd 100644 (file)
--- a/src/HttpHdrSc.cc
+++ b/src/HttpHdrSc.cc
@@ -43,7 +43,6 @@
 #include "HttpHeaderTools.h"
 #include "Store.h"
 #include "StrList.h"
-#include "protos.h"
 
 #if HAVE_MAP
 #include <map>

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 08eafa3ea865f923599d3bd7673bb7a4222305e5..ee10a780345a522fb32658d1d6b372b580ea06fc 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -41,7 +41,6 @@
 #include "MemBuf.h"
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "rfc1123.h"
 #include "StatHist.h"
 #include "Store.h"

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 07abdc89300a867b48ab69dc6c56d5092929e2af..f623604bcc84704e5bd1b0d4e2fddc8edc137532 100644 (file)
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -45,7 +45,6 @@
 #include "HttpHeaderTools.h"
 #include "HttpRequest.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "Store.h"
 #include "StrList.h"
 

diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index b3e53cdee9a8a5a9b32594c27c4828b862174a71..6fe9f84851a160960d35651bffc4ec3b26cc4f09 100644 (file)
--- a/src/HttpMsg.cc
+++ b/src/HttpMsg.cc
@@ -40,7 +40,6 @@
 #include "MemBuf.h"
 #include "mime_header.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 
 HttpMsg::HttpMsg(http_hdr_owner_type owner): header(owner),
         cache_control(NULL), hdr_sz(0), content_length(0), protocol(AnyP::PROTO_NONE),

diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 1520f419b421d81234cbb2c70d32c2238735994c..a8aa7f151ced668fd553023601f6bd61b1b8e96b 100644 (file)
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -43,7 +43,6 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "StrList.h"

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index be4171e99faa2e1761c00b906fa746edc4847382..784e5ec784e954ca230d7a8d34b2499a52486ad4 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -45,7 +45,6 @@
 #include "HttpRequest.h"
 #include "log/Config.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "Store.h"
 #include "URL.h"
 

diff --git a/src/HttpStatusLine.cc b/src/HttpStatusLine.cc
index 3f2ae5d2cf1fa10c857e5b54e04ee316b46ce520..a5513a6321e7d1cd78ce24bae6d5cb21024c301b 100644 (file)
--- a/src/HttpStatusLine.cc
+++ b/src/HttpStatusLine.cc
@@ -36,7 +36,6 @@
 #include "squid.h"
 #include "Debug.h"
 #include "HttpStatusLine.h"
-#include "protos.h"
 #include "Packer.h"
 
 /* local constants */

diff --git a/src/MemBlob.cc b/src/MemBlob.cc
index 1270c325d88557297bbb0cbae91d6a831a3ba93a..5daf73f3bf836cb1822c21f0f12d0a1821027ef6 100644 (file)
--- a/src/MemBlob.cc
+++ b/src/MemBlob.cc
@@ -33,7 +33,6 @@
 #include "Debug.h"
 #include "Mem.h"
 #include "MemBlob.h"
-#include "protos.h"
 
 #if HAVE_IOSTREAM
 #include <iostream>

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index 13c35772dba4d1ef42f64d4c02136cc35b3f0088..e33f8f1d9b3959a44bb0ebd032e8c94ac63b07c5 100644 (file)
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -103,7 +103,6 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 
 #ifdef VA_COPY
 #undef VA_COPY

diff --git a/src/MemObject.cc b/src/MemObject.cc
index 61a7a26b7727f38ca58b13cb4646ec68bb2680c8..b083a341fc1976f2445a0900212767ab3b1122a5 100644 (file)
--- a/src/MemObject.cc
+++ b/src/MemObject.cc
@@ -36,6 +36,7 @@
 #include "squid.h"
 #include "comm/Connection.h"
 #include "Generic.h"
+#include "globals.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "MemBuf.h"
@@ -43,7 +44,6 @@
 #include "profiler/Profiler.h"
 #include "Store.h"
 #include "StoreClient.h"
-#include "protos.h"
 
 #if USE_DELAY_POOLS
 #include "DelayPools.h"

diff --git a/src/MemStore.cc b/src/MemStore.cc
index 2f7dd47e7f62e504dbe699a56edd9e7d4c78a9b8..92b8a30a20fa600a3528a652b44a4dd779e19c2a 100644 (file)
--- a/src/MemStore.cc
+++ b/src/MemStore.cc
@@ -13,7 +13,6 @@
 #include "MemObject.h"
 #include "MemStore.h"
 #include "mime_header.h"
-#include "protos.h"
 #include "StoreStats.h"
 #include "tools.h"
 

diff --git a/src/Parsing.cc b/src/Parsing.cc
index b88f54f83c62978643073a190fa4d76b702f2b10..1ae675c726b0e6b1dc6a6c614e36431d35a912af 100644 (file)
--- a/src/Parsing.cc
+++ b/src/Parsing.cc
@@ -36,7 +36,6 @@
 #include "cache_cf.h"
 #include "compat/strtoll.h"
 #include "Parsing.h"
-#include "protos.h"
 
 /*
  * These functions is the same as atoi/l/f, except that they check for errors

diff --git a/src/Server.cc b/src/Server.cc
index 081a4d8609eae2fe5f30a37c9391d71061e41b87..615a2e5b73e42c62e40b67ebd1bc97fb861ba5f5 100644 (file)
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -43,7 +43,6 @@
 #include "errorpage.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "Server.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/StoreMetaMD5.cc b/src/StoreMetaMD5.cc
index 02d40c0f468435e52aac781671cdd89fc57e8784..0087bef35581357864d3bbb138f129b730532cd8 100644 (file)
--- a/src/StoreMetaMD5.cc
+++ b/src/StoreMetaMD5.cc
@@ -37,7 +37,6 @@
 #include "int.h"
 #include "md5.h"
 #include "MemObject.h"
-#include "protos.h"
 #include "Store.h"
 #include "StoreMetaMD5.h"
 

diff --git a/src/String.cc b/src/String.cc
index e6eed41f39b70c9be3e605cac747b97bb3865154..e0da111b2648e60f6f3cdf6d18b7a62761b73426 100644 (file)
--- a/src/String.cc
+++ b/src/String.cc
@@ -38,7 +38,6 @@
 #include "Mem.h"
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "Store.h"
 
 #if HAVE_LIMITS_H

diff --git a/src/SwapDir.cc b/src/SwapDir.cc
index a04239785ab88e62e12fcbfbd371e5082582a25f..b1812ba546c38ddd06dabbb6886e4b1780e8bb95 100644 (file)
--- a/src/SwapDir.cc
+++ b/src/SwapDir.cc
@@ -34,8 +34,8 @@
 #include "cache_cf.h"
 #include "compat/strtoll.h"
 #include "ConfigOption.h"
+#include "globals.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "StoreFileSystem.h"
 #include "SwapDir.h"
 #include "tools.h"

diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc
index 4704f30190ee05438844ebb44f4a8833eadd8d2d..27295a91b769fc7265e808f727e5031e02a59ae7 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -42,7 +42,6 @@
 #include "Debug.h"
 #include "eui/Eui48.h"
 #include "ip/Address.h"
-#include "protos.h"
 #include "wordlist.h"
 
 static void aclParseArpList(SplayNode<Eui::Eui48 *> **curlist);

diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index 04a098d8ecb3316067fc947a7f25bc0dda77a192..40de18ae143ddde5920b56e0fe4d456c6e850b6a 100644 (file)
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -49,7 +49,6 @@
 #include "HttpReply.h"
 #include "ipcache.h"
 #include "forward.h"
-#include "protos.h"
 #include "StoreClient.h"
 #include "wordlist.h"
 

diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index 972e9536165f059b48646fad9d344fcb8ce9c88f..838992e1c3240b4a8a2152ed106ffeff00fda42d 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -38,7 +38,6 @@
 #include "acl/CertificateData.h"
 #include "acl/Checklist.h"
 #include "cache_cf.h"
-#include "protos.h"
 #include "wordlist.h"
 
 ACLCertificateData::ACLCertificateData(SSLGETATTRIBUTE *sslStrategy) : attribute (NULL), values (), sslAttributeCall (sslStrategy)

diff --git a/src/acl/DestinationDomain.cc b/src/acl/DestinationDomain.cc
index 7ebc43d3a17969493a6a8bbf54536a3c10e0fc08..9f8950a106cd9c6de2084cebea72609f3e31f275 100644 (file)
--- a/src/acl/DestinationDomain.cc
+++ b/src/acl/DestinationDomain.cc
@@ -42,7 +42,6 @@
 #include "fqdncache.h"
 #include "HttpRequest.h"
 #include "ipcache.h"
-#include "protos.h"
 
 DestinationDomainLookup DestinationDomainLookup::instance_;
 

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index da5ff80ebc213c328566f44ba40fe1a7aaefaf50..bea56c942445aa90e884e4c1738e8cdbb585fa55 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -39,7 +39,6 @@
 #include "acl/Checklist.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "protos.h"
 #include "wordlist.h"
 #include "URL.h"
 

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index f11d982496d8fa9dd07b4d138414ca637a74869e..91b9b16356eab9ad82cfae14dc3537ae61667bf9 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -42,7 +42,6 @@
 #include "Debug.h"
 #include "eui/Eui64.h"
 #include "ip/Address.h"
-#include "protos.h"
 #include "wordlist.h"
 
 static void aclParseEuiList(SplayNode<Eui::Eui64 *> **curlist);

diff --git a/src/acl/Gadgets.cc b/src/acl/Gadgets.cc
index f78e369e8c5a458f67e100e4d552b8566db37dc9..922d55132560a746167b1cac83c4a4b73a4552ab 100644 (file)
--- a/src/acl/Gadgets.cc
+++ b/src/acl/Gadgets.cc
@@ -48,7 +48,6 @@
 #include "globals.h"
 #include "HttpRequest.h"
 #include "Mem.h"
-#include "protos.h"
 
 /* does name lookup, returns page_id */
 err_type

diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc
index add7286ad3e3d015bd66c70bfed233ac80ce30ff..8f6ec2c0dc87ff8c08cedc6af4498feed52fa69b 100644 (file)
--- a/src/acl/HierCodeData.cc
+++ b/src/acl/HierCodeData.cc
@@ -3,7 +3,6 @@
 #include "acl/Checklist.h"
 #include "cache_cf.h"
 #include "hier_code.h"
-#include "protos.h"
 #include "wordlist.h"
 
 ACLHierCodeData::ACLHierCodeData()

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index 072c1f5698fba9fcda09523a1a03b1238b465604..7ba80d90866dc6a49c22c0274ae3eb97acbfbe32 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -39,7 +39,6 @@
 #include "acl/RegexData.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "protos.h"
 #include "wordlist.h"
 #include "ConfigParser.h"
 #include "HttpHeaderTools.h"

diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc
index bfefd4107868f2b66c875566b7048c6cdcb86198..fcf97039223e2784187c123024f6d536a700f68d 100644 (file)
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -38,7 +38,6 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "HttpReply.h"
-#include "protos.h"
 #include "wordlist.h"
 
 #if HAVE_LIMITS_H

diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index a5ecddd2b5497eadb9e74ba3745716e46dfcb603..f0dc78fc783c30f1476ba88fe5e700397522eba0 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -38,7 +38,6 @@
 #include "Debug.h"
 #include "wordlist.h"
 #include "Parsing.h"
-#include "protos.h"
 
 /* explicit instantiation required for some systems */
 /** \cond AUTODOCS-IGNORE */

diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc
index e0ff19c0e62a398144b766fcebbd5ff91c841e21..710bb90a4c201db8cfa560699f7d160612af3d79 100644 (file)
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -38,7 +38,6 @@
 #include "Debug.h"
 #include "ip/tools.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "wordlist.h"
 
 void *

diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc
index 9f9370471e1342c76ffdbada83a46a8e4c65a29e..817b99578ed5a1b19f6d411ac5fdadfe53cdc45a 100644 (file)
--- a/src/acl/MaxConnection.cc
+++ b/src/acl/MaxConnection.cc
@@ -38,7 +38,6 @@
 #include "cache_cf.h"
 #include "client_db.h"
 #include "Debug.h"
-#include "protos.h"
 #include "wordlist.h"
 
 ACL *

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 76282ac9c81ca2e04939cf28abedfcfdde8f0912..0cc5241555f6038370095c6133cfdb19af126547 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -37,7 +37,6 @@
 #include "acl/Checklist.h"
 #include "cache_cf.h"
 #include "HttpRequestMethod.h"
-#include "protos.h"
 #include "wordlist.h"
 
 int ACLMethodData::ThePurgeCount = 0;

diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc
index 5384cc93d0176bf889b5be6335ef3a6054344179..9b61dc50d199c4d9140dcebb648da13a415ff9bf 100644 (file)
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -37,7 +37,6 @@
 #include "acl/Checklist.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "protos.h"
 #include "URLScheme.h"
 #include "wordlist.h"
 

diff --git a/src/acl/Random.cc b/src/acl/Random.cc
index 9205456e245903d3cedc510784014454aabd9bc3..ca2c25ec9904408596cecdb60eb581efc5e39755 100644 (file)
--- a/src/acl/Random.cc
+++ b/src/acl/Random.cc
@@ -39,7 +39,6 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "wordlist.h"
 
 ACL *

diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc
index b8bd5a3319344f98c28b852fd6c573e56f7ac8bc..149f9d2cbf1b7b738c3f68e1960f685c86bcda68 100644 (file)
--- a/src/acl/RegexData.cc
+++ b/src/acl/RegexData.cc
@@ -43,7 +43,6 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "Mem.h"
-#include "protos.h"
 #include "wordlist.h"
 
 static void

diff --git a/src/acl/SourceDomain.cc b/src/acl/SourceDomain.cc
index 82c83710f30139171c1e51132f2df0e83c93a421..a207d3da97dfc271b122391ecae419ffd316f1bc 100644 (file)
--- a/src/acl/SourceDomain.cc
+++ b/src/acl/SourceDomain.cc
@@ -41,7 +41,6 @@
 #include "acl/DomainData.h"
 #include "fqdncache.h"
 #include "HttpRequest.h"
-#include "protos.h"
 
 SourceDomainLookup SourceDomainLookup::instance_;
 

diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc
index f980d5ccd9d1135bc510890a83eacb464b1f7ffd..d9f07200feb2060f47dca89c64f82a2a314c2a81 100644 (file)
--- a/src/acl/SslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -35,7 +35,6 @@
 #include "acl/SslErrorData.h"
 #include "acl/Checklist.h"
 #include "cache_cf.h"
-#include "protos.h"
 #include "wordlist.h"
 
 ACLSslErrorData::ACLSslErrorData() : values (NULL)

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index bdbc5cf3adb2ae2884d6e03af8d938fd5908a0e2..c439c42001c75168e44569dfddf9a49fbc17e0ee 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -39,7 +39,6 @@
 #include "acl/Checklist.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "protos.h"
 #include "wordlist.h"
 
 ACLStringData::ACLStringData() : values (NULL)

diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc
index a625f06012147142e97f39231366b35dc83ab434..4b78fded38c8796cb05ac9e3f42ad94ceab287ca 100644 (file)
--- a/src/acl/TimeData.cc
+++ b/src/acl/TimeData.cc
@@ -39,7 +39,6 @@
 #include "acl/Checklist.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "protos.h"
 #include "wordlist.h"
 
 ACLTimeData::ACLTimeData () : weekbits (0), start (0), stop (0), next (NULL) {}

diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index 7d02415546869d90e58ad593bab9ed0d759a1f12..caab493b691626d992fe58412c4001b48628a632 100644 (file)
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -38,7 +38,6 @@
 #include "acl/Url.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "URL.h"
 

diff --git a/src/adaptation/History.cc b/src/adaptation/History.cc
index a775e2ad6720c8dbb086f35dc20dc1813c3444d2..9a066708d74ee71bff04b9e32a7e0fa9c65f6740 100644 (file)
--- a/src/adaptation/History.cc
+++ b/src/adaptation/History.cc
@@ -3,7 +3,6 @@
 #include "adaptation/History.h"
 #include "base/TextException.h"
 #include "globals.h"
-#include "protos.h"
 #include "SquidTime.h"
 
 /// impossible services value to identify unset theNextServices

diff --git a/src/adaptation/ServiceGroups.cc b/src/adaptation/ServiceGroups.cc
index 8e44a33c46476e7543b6ed47a5f4a691161a747f..4fee139d7477f5e0613df0af8cbf46262262f318 100644 (file)
--- a/src/adaptation/ServiceGroups.cc
+++ b/src/adaptation/ServiceGroups.cc
@@ -7,7 +7,6 @@
 #include "adaptation/ServiceGroups.h"
 #include "ConfigParser.h"
 #include "Debug.h"
-#include "protos.h"
 #include "StrList.h"
 #include "wordlist.h"
 

diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index be11f3988afa41ae847cc091adedcc4853a477e8..156e63d60a11e70e9e31c0a59f23f6a8e803a63e 100644 (file)
--- a/src/adaptation/ecap/MessageRep.cc
+++ b/src/adaptation/ecap/MessageRep.cc
@@ -5,7 +5,6 @@
 #include "HttpRequest.h"
 #include "HttpReply.h"
 #include "BodyPipe.h"
-#include "protos.h"
 #include <libecap/common/names.h>
 #include <libecap/common/area.h>
 #include <libecap/common/version.h>

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 7778abc03369fc88c4b466672c3aeaf4c57fcbed..a6d3259d70331f6468638e64d194894e478773e7 100644 (file)
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -24,7 +24,6 @@
 #include "HttpMsg.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "URL.h"
 

diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc
index 50baf5c9b1cc08a969401774764d9944391fc3b8..d4df5d30032726e5cf0a157dfa0d660465044909 100644 (file)
--- a/src/adaptation/icap/OptXact.cc
+++ b/src/adaptation/icap/OptXact.cc
@@ -12,7 +12,6 @@
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "SquidTime.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, OptXact);

diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc
index 8eec381d2282162cfbb9b50ccb3295e13145e898..c79273510745a49e8483c2f4cc47d31fc6df01a1 100644 (file)
--- a/src/adaptation/icap/Options.cc
+++ b/src/adaptation/icap/Options.cc
@@ -3,7 +3,6 @@
 #include "adaptation/icap/Options.h"
 #include "base/TextException.h"
 #include "HttpReply.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "StrList.h"
 #include "wordlist.h"

diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc
index 82087c34eaf6f38669337760682de87638249828..40535721ae48f4829f0142e9b340993d687029f0 100644 (file)
--- a/src/adaptation/icap/ServiceRep.cc
+++ b/src/adaptation/icap/ServiceRep.cc
@@ -14,9 +14,9 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "fde.h"
+#include "globals.h"
 #include "HttpReply.h"
 #include "ip/tools.h"
-#include "protos.h"
 #include "SquidTime.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ServiceRep);

diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc
index 56a22ac6d9e8f0dc0023d7b1a566b5a2be07981a..8d09e827991c4d775633b654841fb896cf1f6da4 100644 (file)
--- a/src/adaptation/icap/Xaction.cc
+++ b/src/adaptation/icap/Xaction.cc
@@ -24,7 +24,6 @@
 #include "ipcache.h"
 #include "Mem.h"
 #include "pconn.h"
-#include "protos.h"
 #include "SquidTime.h"
 
 //CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, Xaction);

diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index 0fdbacb0fee043892bed76a357af084d33cb46c8..ddb6b054a91478b201a843f007dd16919c26c83b 100644 (file)
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -9,7 +9,6 @@
 #include "auth/AclMaxUserIp.h"
 #include "auth/UserRequest.h"
 #include "Debug.h"
-#include "protos.h"
 #include "wordlist.h"
 #include "ConfigParser.h"
 #include "Parsing.h"

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 434d900ab56cb5232600d372d32a8d209ca44409..57fedc870cc4d947f90055350f861409dbd7b254 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -49,7 +49,6 @@
 #include "Store.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "uudecode.h"
 #include "wordlist.h"

diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc
index bb37ddf7498487557f666977adc069f25e18a3fe..d53c3400299be0003d86a0a13a00ec720aee9bbc 100644 (file)
--- a/src/auth/digest/UserRequest.cc
+++ b/src/auth/digest/UserRequest.cc
@@ -7,7 +7,6 @@
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "SquidTime.h"
 
 Auth::Digest::UserRequest::UserRequest() :

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 2756b2657b9fc7681fb7958c52cd57958f8022b3..946fb90bd90ec1357fa59f3f57a0d8d5407469e8 100644 (file)
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -53,7 +53,6 @@
 #include "Store.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"
-#include "protos.h"
 #include "wordlist.h"
 #include "SquidTime.h"
 #include "StrList.h"

diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc
index 37478d0ccfa1a06b1097e8949d712f26a059157d..ac4e71cc593c9d575e1d6824740f108c952d1a6a 100644 (file)
--- a/src/auth/negotiate/UserRequest.cc
+++ b/src/auth/negotiate/UserRequest.cc
@@ -9,7 +9,6 @@
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "SquidTime.h"
 
 Auth::Negotiate::UserRequest::UserRequest()

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index 4078bbb7286984a2cca411358f19ec5113bce991..9aee192360e771f7b55b5fc3e5c1fe98c53eaa41 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -47,7 +47,6 @@
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "auth/negotiate/Scheme.h"
 #include "auth/negotiate/User.h"

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index f223aa5d610cda0888d75e5d319e7923f2ce0e51..f8bda5c2df3d55b8badef05e8ff0e538113ed4b1 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -50,7 +50,6 @@
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "wordlist.h"
 #include "SquidTime.h"
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 1c74ca2dbdb28d1b43b73a1201677ea537de571e..42e2fd5bbace949ccf501b17012c37a94566210e 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -60,7 +60,6 @@
 #include "mgr/Registration.h"
 #include "Parsing.h"
 #include "PeerDigest.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "SquidString.h"
 #include "Store.h"

diff --git a/src/carp.cc b/src/carp.cc
index a53a94e472da36a3f67192f94c28ee26c363c6f4..1c32dfd1b745c6a31c345333e0f7cbdacad56e6c 100644 (file)
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -38,7 +38,6 @@
 #include "HttpRequest.h"
 #include "mgr/Registration.h"
 #include "neighbors.h"
-#include "protos.h"
 #include "Store.h"
 #include "URL.h"
 #include "URLScheme.h"

diff --git a/src/client_db.cc b/src/client_db.cc
index 3dba7bf50e626bed42a3e46c7dfe96ac5ab1117e..9c7bf565cd3f8b8f8258f6836e3bc55af337fb9e 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -42,7 +42,6 @@
 #include "log/access_log.h"
 #include "Mem.h"
 #include "mgr/Registration.h"
-#include "protos.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 8efcd692a7a45495c1ddd6148c1ba711b0ded97f..ec8c186e1ec47276ccf23d2c068ebb1b5728ac71 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -119,7 +119,6 @@
 #include "MemObject.h"
 #include "mime_header.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index fea788d1aee67e90814abeb8753a2b815b4507e9..41ac7ad898346889dd3dc7f101fca610954ca2ee 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -55,7 +55,6 @@
 #include "MemObject.h"
 #include "mime_header.h"
 #include "neighbors.h"
-#include "protos.h"
 #include "refresh.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 12158952a329d6cc021db90eb2231c352d506d75..3a575757f3ee81cbe638c817c57dd4aafabc9646 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -69,7 +69,6 @@
 #include "MemObject.h"
 #include "Parsing.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "StrList.h"

diff --git a/src/comm.cc b/src/comm.cc
index 18d00aaaff52d784130f21fe57fd47ab205b17fe..28ff50b4d42efd4965c0f10516aa31e2a1861293 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -58,7 +58,6 @@
 #include "ip/tools.h"
 #include "MemBuf.h"
 #include "pconn.h"
-#include "protos.h"
 #include "profiler/Profiler.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 7d708124fff0fbb3fd7ab894e54d9680c1f87347..4c2ea0398fcd665be92f1d627f7323e2dfe00b0c 100644 (file)
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -13,7 +13,6 @@
 #include "icmp/net_db.h"
 #include "ipcache.h"
 #include "SquidTime.h"
-#include "protos.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc
index a93f8743275b95ba23c8c6602cd96baf555f6a40..f5b6cf93b58a2e5f988366f67f17d39b09ce10a7 100644 (file)
--- a/src/comm/ModPoll.cc
+++ b/src/comm/ModPoll.cc
@@ -42,7 +42,6 @@
 #include "ICP.h"
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 #include "Store.h"

diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index bd4bad91e2ae58cc3eb70707e7b28dedba0b3a46..b383a3d5c79453c91ff41c2f618b9e0ba3b2af6a 100644 (file)
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -46,7 +46,6 @@
 #include "globals.h"
 #include "ip/Intercept.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 

diff --git a/src/comm/Write.cc b/src/comm/Write.cc
index a9db6177dd92db519708f14aec3c8db91110e48b..bc16767a3a6946db0051cd8558e053440eb6dea0 100644 (file)
--- a/src/comm/Write.cc
+++ b/src/comm/Write.cc
@@ -7,7 +7,6 @@
 #include "globals.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 

diff --git a/src/disk.cc b/src/disk.cc
index 632aa7534616cb6b7849f5e0b2d48f8af0e1c4e4..21b127de5b55cdd1ec55f307f8b5b018cfe70062 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -38,7 +38,6 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "StatCounters.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index bfce017bd1a6fdd3dd45a89ab906e7b5323f4e87..5ebc3b4472dc89f274c2bd24b094fb8296f781fd 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -46,7 +46,6 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "mgr/Registration.h"
-#include "protos.h"
 #include "rfc3596.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/errorpage.cc b/src/errorpage.cc
index dbaeea9cb9965b4bbe2463393d8e6cb7f2088782..9d980e2d4d1687b3f24af0304415ca6d42117e55 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -47,7 +47,6 @@
 #include "MemObject.h"
 #include "fde.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "URL.h"
 #include "URLScheme.h"

diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index cc008cdf7fbf07f7126b3d195d1c33968aa5c513..0d8005642f242681f4e7fa4100d4abc655408c8f 100644 (file)
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -60,7 +60,6 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 
 /* quick reference on behaviour here.
  * The ESI specification 1.0 requires the ESI processor to be able to

diff --git a/src/esi/Include.cc b/src/esi/Include.cc
index 1f567d26d417082ea2b21528c7f9b3312ae455cb..bddd9f24a08b0dc6b4d0a5c156a18b95426635f8 100644 (file)
--- a/src/esi/Include.cc
+++ b/src/esi/Include.cc
@@ -47,7 +47,6 @@
 #include "esi/VarState.h"
 #include "HttpReply.h"
 #include "log/access_log.h"
-#include "protos.h"
 
 CBDATA_CLASS_INIT (ESIStreamContext);
 

diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc
index 7ff261b0fb04876deed6719012dc75eae9e6e688..69ad6ed5882052afaebeeeba50179e15a22e3537 100644 (file)
--- a/src/esi/VarState.cc
+++ b/src/esi/VarState.cc
@@ -38,7 +38,6 @@
 #include "esi/VarState.h"
 #include "HttpReply.h"
 #include "Mem.h"
-#include "protos.h"
 
 CBDATA_TYPE (ESIVarState);
 FREE ESIVarStateFree;

diff --git a/src/event.cc b/src/event.cc
index e83783928543b2a4e1b17cfc65686f1b2b86e1c2..5ff649b46f100fbc12f9b2ffea11813be2d911f7 100644 (file)
--- a/src/event.cc
+++ b/src/event.cc
@@ -39,7 +39,6 @@
 #include "Store.h"
 #include "SquidTime.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "tools.h"
 
 /* The list of event processes */

diff --git a/src/external_acl.cc b/src/external_acl.cc
index f00e3758456400f37b7bba2a8e572173c5203487..64d028885def67cc0c0523b9d9e73cb2f6384a62 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -56,7 +56,6 @@
 #include "ip/tools.h"
 #include "MemBuf.h"
 #include "mgr/Registration.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "SquidString.h"
 #include "SquidTime.h"

diff --git a/src/fde.cc b/src/fde.cc
index f877d503077f8b413e0175ee1e65f07f07bed9b7..4661c616bc38b55cd02e8fee11dab752c9797603 100644 (file)
--- a/src/fde.cc
+++ b/src/fde.cc
@@ -37,7 +37,6 @@
 #include "comm.h"
 #include "fde.h"
 #include "globals.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 

diff --git a/src/format/Config.cc b/src/format/Config.cc
index 3c1add0e01b09ec2b1e38c1a2b00da09efc5b38b..17c730933c36a5d99613d1868dfc90d729214d29 100644 (file)
--- a/src/format/Config.cc
+++ b/src/format/Config.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "cache_cf.h"
+#include "Debug.h"
 #include "format/Config.h"
-#include "protos.h"
 #include <list>
 
 Format::FmtConfig Format::TheConfig;

diff --git a/src/format/Format.cc b/src/format/Format.cc
index 55117194a5f80a78234feac7d7b0a417d11cd8ce..aa88160bf238952e9ef817a46b14cceafdf9a3fc 100644 (file)
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -11,7 +11,6 @@
 #include "fqdncache.h"
 #include "HttpRequest.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/forward.cc b/src/forward.cc
index bdff77be7341a557010372ce83ee894d99cd7127..0e3a2bc63d508493e6a8736cd199cffda61e14a9 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -63,7 +63,6 @@
 #include "neighbors.h"
 #include "pconn.h"
 #include "PeerSelectState.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "StoreClient.h"

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index bb07a3985e740df5a1ef2c8da4494b91cfbfceec..df66cd67fa4de41d3e3f246650b6746e78c65fdc 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -38,7 +38,6 @@
 #include "event.h"
 #include "Mem.h"
 #include "mgr/Registration.h"
-#include "protos.h"
 #include "SquidDns.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc
index 636b16fc88c4df2e47cad93d6fe3a3207b8fde53..8f07ded9d9faa8633720a6825baf969c428db3c7 100644 (file)
--- a/src/fs/rock/RockRebuild.cc
+++ b/src/fs/rock/RockRebuild.cc
@@ -9,7 +9,6 @@
 #include "fs/rock/RockDbCell.h"
 #include "globals.h"
 #include "md5.h"
-#include "protos.h"
 #include "tools.h"
 #include "typedefs.h"
 #include "SquidTime.h"

diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index 7c5db08e6f7a39dde7d5f1ddc58e6585c467fb62..d9137930dbe5a6f3b26ef7b36b5a46cf62294366 100644 (file)
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -19,7 +19,6 @@
 #include "ipc/mem/Pages.h"
 #include "MemObject.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "SquidMath.h"
 #include "tools.h"
 

diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc
index 28c388c5e43cea4d592820925f13de91a79c11f6..f028bf19390f192e78015a917b9f7b95e94d19e9 100644 (file)
--- a/src/fs/ufs/RebuildState.cc
+++ b/src/fs/ufs/RebuildState.cc
@@ -33,7 +33,6 @@
 #include "squid.h"
 #include "disk.h"
 #include "globals.h"
-#include "protos.h"
 #include "RebuildState.h"
 #include "SquidTime.h"
 #include "store_key_md5.h"

diff --git a/src/fs/ufs/UFSStoreState.cc b/src/fs/ufs/UFSStoreState.cc
index fe4c5fdbb1575de02de5c0bb940a4c8f65330fce..1089aafb144ddd22e2968a591ad0355abc0f3885 100644 (file)
--- a/src/fs/ufs/UFSStoreState.cc
+++ b/src/fs/ufs/UFSStoreState.cc
@@ -40,7 +40,6 @@
 #include "DiskIO/DiskIOStrategy.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "protos.h"
 #include "SquidList.h"
 #include "SwapDir.h"
 #include "UFSStrategy.h"

diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc
index e64d106fa043200a5a2b854d21f45f7740ec2c11..3c2c017c1d1c01183cac86dc585cdf7e9317fd1d 100644 (file)
--- a/src/fs/ufs/UFSSwapDir.cc
+++ b/src/fs/ufs/UFSSwapDir.cc
@@ -40,7 +40,6 @@
 #include "fde.h"
 #include "globals.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "RebuildState.h"
 #include "SquidMath.h"
 #include "DiskIO/DiskIOStrategy.h"

diff --git a/src/ftp.cc b/src/ftp.cc
index 9550e7ccc849d02add2f374e01fd849b003bdb74..29f232bd79bc4a096625bb4758b016f9be9ead50 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -53,7 +53,6 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "mime.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "Server.h"
 #include "SquidString.h"

diff --git a/src/gopher.cc b/src/gopher.cc
index 50270a96c60e85aad2638f6c9fb53a5f9637ba8e..9bd404584a479656e730ff3894501b9d8ee77dd3 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -42,7 +42,6 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "mime.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/helper.cc b/src/helper.cc
index 252055b752e5c3a5dfe32cd53ec11ab9834e8d9e..85345cbc630529403b8970e06dc215ab5001f6eb 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -42,7 +42,6 @@
 #include "helper.h"
 #include "Mem.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "SquidIpc.h"
 #include "SquidMath.h"
 #include "SquidTime.h"

diff --git a/src/htcp.cc b/src/htcp.cc
index 7f0412a85bbb8d08ae91b17ced22cc9fd7efde3e..b59832513bb93ce08c5eaee6918193958732cbc4 100644 (file)
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -50,7 +50,6 @@
 #include "ip/tools.h"
 #include "md5.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "refresh.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/http.cc b/src/http.cc
index 5de0168679445315928d749353e6ffc9e3eef0a0..4ac95981b783df427ccbdd51a1c777fe04729656 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -63,7 +63,6 @@
 #include "neighbors.h"
 #include "peer_proxy_negotiate_auth.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "refresh.h"
 #include "rfc1738.h"
 #include "SquidTime.h"

diff --git a/src/icmp/IcmpSquid.cc b/src/icmp/IcmpSquid.cc
index e819c4dbe8f0ba62b3bd9fdc54424d7f8a0030fd..cbf745e459226f788c059ae547308c3041542ada 100644 (file)
--- a/src/icmp/IcmpSquid.cc
+++ b/src/icmp/IcmpSquid.cc
@@ -39,7 +39,6 @@
 #include "icmp/IcmpSquid.h"
 #include "icmp/net_db.h"
 #include "ip/tools.h"
-#include "protos.h"
 #include "SquidIpc.h"
 #include "SquidTime.h"
 

diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index afe19e6a9c008b04b741927b7dbab8dbe784adac..5cde2d00dc08615b66017f1dfbe4f72b1eb3c4b2 100644 (file)
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -55,7 +55,6 @@
 #include "mgr/Registration.h"
 #include "mime_header.h"
 #include "neighbors.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "StoreClient.h"

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index e0aaf923ddcbf2205971228a1fef24814e239934..b55f0671d597e668fe11b85a89c11b568b11bfd2 100644 (file)
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -54,7 +54,6 @@
 #include "md5.h"
 #include "multicast.h"
 #include "neighbors.h"
-#include "protos.h"
 #include "refresh.h"
 #include "rfc1738.h"
 #include "SquidTime.h"

diff --git a/src/internal.cc b/src/internal.cc
index a054b89c90020c75e037240864acfe64bb92b2b8..39bd2ef1c6b41ebcb34575af01b2068b6dd9d828 100644 (file)
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -42,7 +42,6 @@
 #include "HttpRequest.h"
 #include "HttpReply.h"
 #include "MemBuf.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "tools.h"
 #include "URL.h"

diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc
index efa59dba83080876884a77bf4e298c3395723dd1..268584c7620c0f834613e6124a2294f76e3917f9 100644 (file)
--- a/src/ip/QosConfig.cc
+++ b/src/ip/QosConfig.cc
@@ -10,7 +10,6 @@
 #include "ip/tools.h"
 #include "ip/QosConfig.h"
 #include "Parsing.h"
-#include "protos.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/ipc.cc b/src/ipc.cc
index 373e5f4252ab2d85b4e0eb50fbb5d0ec9ccf3fae..5a95b131284a90509b7d1564f5ad40dbaa350e2f 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -36,7 +36,6 @@
 #include "fde.h"
 #include "globals.h"
 #include "ip/Address.h"
-#include "protos.h"
 #include "SquidIpc.h"
 #include "tools.h"
 #include "rfc1738.h"

diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc
index 26320c620da48b8bd1b2d2216657d7738443ffff..509addb466d828615b652fc59cbce72fd07672ba 100644 (file)
--- a/src/ipc/Coordinator.cc
+++ b/src/ipc/Coordinator.cc
@@ -16,7 +16,6 @@
 #include "mgr/Inquirer.h"
 #include "mgr/Request.h"
 #include "mgr/Response.h"
-#include "protos.h"
 #include "tools.h"
 #if SQUID_SNMP
 #include "snmp/Inquirer.h"

diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc
index 9abaffefbeb450318310765da33d2efeb1574fb3..a05140ab73be4b257134a338a5bd4e0bcb68cc3b 100644 (file)
--- a/src/ipc/Kids.cc
+++ b/src/ipc/Kids.cc
@@ -6,7 +6,6 @@
 #include "base/TextException.h"
 #include "globals.h"
 #include "ipc/Kids.h"
-#include "protos.h"
 #include "tools.h"
 #include "structs.h"
 

diff --git a/src/ipc/SharedListen.cc b/src/ipc/SharedListen.cc
index 5547840c8eb9773063b4af44743bf1f5055e4b1a..35b1db3c48f8eaa1e6a15deb3f9f8fed2a84326d 100644 (file)
--- a/src/ipc/SharedListen.cc
+++ b/src/ipc/SharedListen.cc
@@ -13,7 +13,6 @@
 #include "ipc/TypedMsgHdr.h"
 #include "ipc/StartListening.h"
 #include "ipc/SharedListen.h"
-#include "protos.h"
 #include "tools.h"
 
 #include <map>

diff --git a/src/ipc/StartListening.cc b/src/ipc/StartListening.cc
index 8a157b89fb014575a8364e555a2fa780761b99c6..9bf03e888a3fe9d3b946a1095789bfe4784dcc16 100644 (file)
--- a/src/ipc/StartListening.cc
+++ b/src/ipc/StartListening.cc
@@ -11,7 +11,6 @@
 #include "comm/Connection.h"
 #include "ipc/SharedListen.h"
 #include "ipc/StartListening.h"
-#include "protos.h"
 #include "tools.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc
index b8345511fa873a76809f7e015257f45da814df99..c339a31cc26def8490e4388e720ebb8681dd763d 100644 (file)
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -4,7 +4,6 @@
 
 #include "squid.h"
 #include "ipc/StoreMap.h"
-#include "protos.h"
 #include "store_key_md5.h"
 #include "Store.h"
 #include "tools.h"

diff --git a/src/ipc/TypedMsgHdr.cc b/src/ipc/TypedMsgHdr.cc
index c7ff95eab279ac29aef11707057a3edcba12aa28..5a162f2dcb83b77b3be6b758ea75e460e69428e4 100644 (file)
--- a/src/ipc/TypedMsgHdr.cc
+++ b/src/ipc/TypedMsgHdr.cc
@@ -6,7 +6,6 @@
  */
 
 #include "squid.h"
-#include "protos.h"
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
 #include "tools.h"

diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc
index e8711ed88747452def4b18479aa11e35451f755a..063d00cd8bc365b1a516d6b83aa83bf0a1011d02 100644 (file)
--- a/src/ipc/mem/Pages.cc
+++ b/src/ipc/mem/Pages.cc
@@ -10,7 +10,6 @@
 #include "base/RunnersRegistry.h"
 #include "ipc/mem/PagePool.h"
 #include "ipc/mem/Pages.h"
-#include "protos.h"
 #include "structs.h"
 #include "SwapDir.h"
 #include "tools.h"

diff --git a/src/ipc/mem/Segment.cc b/src/ipc/mem/Segment.cc
index 0d006ff3266c0f2e5049e534eddb36a03157a574..8cf3dc432ca505427aac6123c4b36215ff1ad1ac 100644 (file)
--- a/src/ipc/mem/Segment.cc
+++ b/src/ipc/mem/Segment.cc
@@ -8,8 +8,9 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "compat/shm.h"
+#include "Debug.h"
+#include "fatal.h"
 #include "ipc/mem/Segment.h"
-#include "protos.h"
 #include "tools.h"
 
 #include <fcntl.h>

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 2b0da1101562ea53c4569016fda7b9ef655055a0..57e5f4fd632fef095d8122ee87baa16db3090b6b 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -40,7 +40,6 @@
 #include "ipcache.h"
 #include "Mem.h"
 #include "mgr/Registration.h"
-#include "protos.h"
 #include "rfc3596.h"
 #include "SquidDns.h"
 #include "SquidTime.h"

diff --git a/src/log/Config.cc b/src/log/Config.cc
index d39bcaa0a3ba6c5c242c61a9ab4c01096803f9ff..fdac505793e93025e2ea4d78f26b3b9190347401 100644 (file)
--- a/src/log/Config.cc
+++ b/src/log/Config.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "cache_cf.h"
+#include "Debug.h"
 #include "log/Config.h"
-#include "protos.h"
 
 Log::LogConfig Log::TheConfig;
 

diff --git a/src/log/FormatSquidIcap.cc b/src/log/FormatSquidIcap.cc
index 3574fa8180d7ce628cee99744209420fef2de599..c1c5afcb378c5b112a95456866c71028ff87191a 100644 (file)
--- a/src/log/FormatSquidIcap.cc
+++ b/src/log/FormatSquidIcap.cc
@@ -42,7 +42,6 @@
 #include "HttpRequest.h"
 #include "log/File.h"
 #include "log/Formats.h"
-#include "protos.h"
 #include "SquidTime.h"
 
 void

diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc
index 0eb8dc89d72f04afd012ede3de1e3c68d924e099..567e431d0d284a6a006bb1a5ede5256d6c9f9bf1 100644 (file)
--- a/src/log/ModDaemon.cc
+++ b/src/log/ModDaemon.cc
@@ -38,7 +38,6 @@
 #include "log/Config.h"
 #include "log/File.h"
 #include "log/ModDaemon.h"
-#include "protos.h"
 #include "SquidIpc.h"
 #include "SquidTime.h"
 

diff --git a/src/log/ModStdio.cc b/src/log/ModStdio.cc
index 1a8c6206cd59e3d86c055fd950ff4741a80bc45a..d4669f44b3de5b7948159645eb2ab5adff8a309d 100644 (file)
--- a/src/log/ModStdio.cc
+++ b/src/log/ModStdio.cc
@@ -37,7 +37,6 @@
 #include "globals.h"
 #include "log/File.h"
 #include "log/ModStdio.h"
-#include "protos.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/log/ModTcp.cc b/src/log/ModTcp.cc
index bc52a92c078c6ac4fa7d3e0232fff788b020510f..db8a9692afc8a275e035e853aaeb3a953c5da254 100644 (file)
--- a/src/log/ModTcp.cc
+++ b/src/log/ModTcp.cc
@@ -39,7 +39,6 @@
 #include "log/File.h"
 #include "log/ModTcp.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "structs.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc
index 9c5daf56ecb66a3bdc95ccffe28bf90f96a08e7d..c6fd8c92ba92379de3168192cd32727f225ab4c7 100644 (file)
--- a/src/log/ModUdp.cc
+++ b/src/log/ModUdp.cc
@@ -38,7 +38,6 @@
 #include "log/File.h"
 #include "log/ModUdp.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "structs.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/main.cc b/src/main.cc
index e15d9137ae6f1ad113520b0fb0b3af61f5fa931a..76f8357f157ad4dc9f2c9c5818712caa8730ec96 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -56,6 +56,7 @@
 #include "forward.h"
 #include "fs/Module.h"
 #include "fqdncache.h"
+#include "globals.h"
 #include "htcp.h"
 #include "HttpHeader.h"
 #include "HttpReply.h"
@@ -77,7 +78,6 @@
 #include "peer_sourcehash.h"
 #include "peer_userhash.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "redirect.h"
 #include "refresh.h"
 #include "send-announce.h"

diff --git a/src/mem.cc b/src/mem.cc
index 04252244dccd9925e6da0cfc5e1eac1b6b48be04..3ba0193d593da13c6d5ab6d79a3483ae4efd0727 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -40,7 +40,6 @@
 #include "MemBuf.h"
 #include "memMeter.h"
 #include "mgr/Registration.h"
-#include "protos.h"
 #include "SquidList.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/mem_node.cc b/src/mem_node.cc
index ca8287fec1024710043bf195f21dc991aee30730..6c4578d5a5ef7a8e637088532dc61abc835f9d66 100644 (file)
--- a/src/mem_node.cc
+++ b/src/mem_node.cc
@@ -35,7 +35,6 @@
 
 #include "squid.h"
 #include "mem_node.h"
-#include "protos.h"
 
 static ptrdiff_t makeMemNodeDataOffset();
 

diff --git a/src/mgr/CountersAction.cc b/src/mgr/CountersAction.cc
index d4b0cab517aae5e10a4035c1083be28304c94eab..9428998549a20eb641c265ec6bf83d68d4568e1b 100644 (file)
--- a/src/mgr/CountersAction.cc
+++ b/src/mgr/CountersAction.cc
@@ -10,7 +10,6 @@
 #include "ipc/Messages.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/CountersAction.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "tools.h"

diff --git a/src/mgr/FunAction.cc b/src/mgr/FunAction.cc
index 14edd75941afcd927d35782c2d0e299649e38b00..b1f71e3612b0219cfbe7f809697e0b0ee3668c14 100644 (file)
--- a/src/mgr/FunAction.cc
+++ b/src/mgr/FunAction.cc
@@ -14,7 +14,6 @@
 #include "mgr/Filler.h"
 #include "mgr/FunAction.h"
 #include "mgr/Request.h"
-#include "protos.h"
 #include "Store.h"
 #include "tools.h"
 

diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc
index 6acec69f947950d17f4e6aef4c3ebf69e4675e1b..3215aad84ae195cb85c13e4c1661f9277af52038 100644 (file)
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -17,7 +17,6 @@
 #include "mgr/InfoAction.h"
 #include "mgr/Request.h"
 #include "mgr/Response.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "tools.h"

diff --git a/src/mgr/IntervalAction.cc b/src/mgr/IntervalAction.cc
index 6ab1230a4e64b7022d025a783f597228180f485f..931afc67859f48dc47e1aa15dfb29a1b7f82ee6f 100644 (file)
--- a/src/mgr/IntervalAction.cc
+++ b/src/mgr/IntervalAction.cc
@@ -10,7 +10,6 @@
 #include "ipc/Messages.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/IntervalAction.h"
-#include "protos.h"
 #include "SquidMath.h"
 #include "Store.h"
 #include "tools.h"

diff --git a/src/mgr/IoAction.cc b/src/mgr/IoAction.cc
index 5a6eb8dfde69499b779470117a1941af0af5b4d1..562b639e46dcab23f5f10a09a43ace9066e6c9d9 100644 (file)
--- a/src/mgr/IoAction.cc
+++ b/src/mgr/IoAction.cc
@@ -10,7 +10,6 @@
 #include "ipc/Messages.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/IoAction.h"
-#include "protos.h"
 #include "SquidMath.h"
 #include "Store.h"
 #include "tools.h"

diff --git a/src/mgr/ServiceTimesAction.cc b/src/mgr/ServiceTimesAction.cc
index 7246e209eb02fd74db9a829161fe9ec6a37a1a28..28dc0aad82bb5ae640887b9daecd0cc2b348c9fa 100644 (file)
--- a/src/mgr/ServiceTimesAction.cc
+++ b/src/mgr/ServiceTimesAction.cc
@@ -10,7 +10,6 @@
 #include "ipc/Messages.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/ServiceTimesAction.h"
-#include "protos.h"
 #include "Store.h"
 #include "tools.h"
 

diff --git a/src/mgr/StoreIoAction.cc b/src/mgr/StoreIoAction.cc
index 72e2a674f3a29df95257c60cc72f2204f0608cbc..968aa4f2f845afb5dac3b0cef3cbe6dadef2bf8e 100644 (file)
--- a/src/mgr/StoreIoAction.cc
+++ b/src/mgr/StoreIoAction.cc
@@ -10,7 +10,6 @@
 #include "ipc/Messages.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/StoreIoAction.h"
-#include "protos.h"
 #include "Store.h"
 #include "tools.h"
 

diff --git a/src/mgr/StoreToCommWriter.cc b/src/mgr/StoreToCommWriter.cc
index 9a179d305052de306dae18b11f113ac32d655df3..bb91db250fc968eb3bcc229b554d9848f902af07 100644 (file)
--- a/src/mgr/StoreToCommWriter.cc
+++ b/src/mgr/StoreToCommWriter.cc
@@ -12,7 +12,6 @@
 #include "comm/Write.h"
 #include "ipc/FdNotes.h"
 #include "mgr/StoreToCommWriter.h"
-#include "protos.h"
 #include "StoreClient.h"
 #include "Store.h"
 

diff --git a/src/mime.cc b/src/mime.cc
index 4511ba58b1a2114ce99311404be0f07e59de0611..d55636d94b11358b07aa1f2246568a9659c05303 100644 (file)
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -45,7 +45,6 @@
 #include "MemBuf.h"
 #include "mime.h"
 #include "MemObject.h"
-#include "protos.h"
 #include "Store.h"
 #include "StoreClient.h"
 

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 351910d7af7e073345029837ae85d671e749d038..e8dc8cd2c638051bf9606cf043c5ae335ebf723e 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -53,7 +53,6 @@
 #include "neighbors.h"
 #include "PeerDigest.h"
 #include "PeerSelectState.h"
-#include "protos.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "stat.h"

diff --git a/src/pconn.cc b/src/pconn.cc
index a57f6c3ffce6483db6cf0a350c929272dbe23e7f..2396fd9ac23679ae178371923e0afc0a249ae90e 100644 (file)
--- a/src/pconn.cc
+++ b/src/pconn.cc
@@ -40,7 +40,6 @@
 #include "globals.h"
 #include "mgr/Registration.h"
 #include "pconn.h"
-#include "protos.h"
 #include "Store.h"
 
 #define PCONN_FDS_SZ   8       /* pconn set size, increase for better memcache hit rate */

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index a051877efb75621a37fcb6099f41842025c35fd1..e79a47265d4e21e35cba5d96459d13692802f005 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -38,6 +38,7 @@
 #include "CacheDigest.h"
 #include "event.h"
 #include "forward.h"
+#include "globals.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "internal.h"
@@ -45,7 +46,6 @@
 #include "neighbors.h"
 #include "mime_header.h"
 #include "PeerDigest.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "store_key_md5.h"

diff --git a/src/peer_select.cc b/src/peer_select.cc
index ad11bb0600b74f63c4bb3a20ba3ee7013553ac2e..878ec4bef89f9fc1ba7e41cb192afc8e1898d76e 100644 (file)
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -40,6 +40,7 @@
 #include "errorpage.h"
 #include "event.h"
 #include "forward.h"
+#include "globals.h"
 #include "hier_code.h"
 #include "htcp.h"
 #include "HttpRequest.h"
@@ -51,7 +52,6 @@
 #include "peer_sourcehash.h"
 #include "peer_userhash.h"
 #include "PeerSelectState.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 

diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc
index eac8fd96079571d5d819ffceb8f9c200890187a1..bf7c6701248325748689ea957924c28493aecf5b 100644 (file)
--- a/src/peer_sourcehash.cc
+++ b/src/peer_sourcehash.cc
@@ -38,7 +38,6 @@
 #include "HttpRequest.h"
 #include "mgr/Registration.h"
 #include "neighbors.h"
-#include "protos.h"
 #include "Store.h"
 
 #if HAVE_MATH_H

diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc
index 0ac165f384a95b96f44b1a1c47d0b87f140bafd6..02408aebdcb52a664a3dd3f3e4cd9c0ed8b0017c 100644 (file)
--- a/src/peer_userhash.cc
+++ b/src/peer_userhash.cc
@@ -43,7 +43,6 @@
 #include "HttpRequest.h"
 #include "mgr/Registration.h"
 #include "neighbors.h"
-#include "protos.h"
 #include "Store.h"
 
 #if HAVE_MATH_H

diff --git a/src/protos.h b/src/protos.h
index 476f528fc816dde67309f5a5dabb963b86641534..798ddcefe02376d11ac6979dbe7e4a4bce97fdef 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -43,9 +43,6 @@ extern void shut_down(int);
 extern void rotate_logs(int);
 extern void reconfigure(int);
 
-#include "fatal.h"
-
-
         /* CygWin & Windows NT Port */
         /* win32.c */
 #if _SQUID_WINDOWS_

diff --git a/src/redirect.cc b/src/redirect.cc
index b219a6bc5fc252b89d85bd7c2e15188ec0fb3898..ef46b9cffcaec0b07de647e9a714945594ee50fd 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -42,7 +42,6 @@
 #include "HttpRequest.h"
 #include "helper.h"
 #include "mgr/Registration.h"
-#include "protos.h"
 #include "redirect.h"
 #include "rfc1738.h"
 #include "Store.h"

diff --git a/src/refresh.cc b/src/refresh.cc
index 6a6340be1f3e7a3d8da6cee1c722caea8bbf1597..7b8f83e96e43adba61d47d626a8ebffcca02d44e 100644 (file)
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -43,7 +43,6 @@
 #include "HttpRequest.h"
 #include "HttpReply.h"
 #include "MemObject.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "URL.h"

diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc
index ad6ababe5906994a7ca5618c79b51e7d8948872e..3ae8497998a9f22d99930205e3d08e14d9d2626b 100644 (file)
--- a/src/repl/heap/store_repl_heap.cc
+++ b/src/repl/heap/store_repl_heap.cc
@@ -43,7 +43,6 @@
 
 #include "squid.h"
 #include "heap.h"
-#include "protos.h"
 #include "store_heap_replacement.h"
 #include "SquidList.h"
 #include "Store.h"

diff --git a/src/send-announce.cc b/src/send-announce.cc
index 4d9c175e7aeae8db870389e39fd9629725d4b6cd..b96cc88ce9941a833a28d33048a20e09280708f5 100644 (file)
--- a/src/send-announce.cc
+++ b/src/send-announce.cc
@@ -39,7 +39,6 @@
 #include "globals.h"
 #include "ICP.h"
 #include "ipcache.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "tools.h"
 

diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc
index 7565ab825bce1823628137ea3e4f28786494aef5..c713515c8250a54eef679f04fa210aaf7698f1ca 100644 (file)
--- a/src/snmp/Pdu.cc
+++ b/src/snmp/Pdu.cc
@@ -8,7 +8,6 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
-#include "protos.h"
 #include "snmp_core.h"
 #include "snmp/Pdu.h"
 #include "snmp/Var.h"

diff --git a/src/snmp/Session.cc b/src/snmp/Session.cc
index 1bfbda4e58ae273aedbfb737f3f87c6d17b83760..e57132bffa0d7ce5104a960083804bcf3badd1e0 100644 (file)
--- a/src/snmp/Session.cc
+++ b/src/snmp/Session.cc
@@ -8,7 +8,6 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
-#include "protos.h"
 #include "snmp/Session.h"
 #include "tools.h"
 

diff --git a/src/snmp/Var.cc b/src/snmp/Var.cc
index 321168d2e8131843811bfe8ebdf137f246998f94..8ea87f5a50dbc8ba26f2a195616fe898f44c3352 100644 (file)
--- a/src/snmp/Var.cc
+++ b/src/snmp/Var.cc
@@ -8,7 +8,6 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
-#include "protos.h"
 #include "snmp/Var.h"
 #include "tools.h"
 #if HAVE_ALGORITHM

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 2f73f6d873775092fcfa6db9f158c613f07b4949..9eee80e5dbf741540b9b24694de47b02aaa86609 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -37,7 +37,6 @@
 #include "globals.h"
 #include "mem_node.h"
 #include "neighbors.h"
-#include "protos.h"
 #include "snmp_agent.h"
 #include "snmp_core.h"
 #include "StatCounters.h"

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index c2530a5da75640afbb51f1fa6b24fbc71b3505fb..235bca50b584abd1655a2e5ecb0a7fe0d9fd608e 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -39,7 +39,6 @@
 #include "comm/UdpOpenDialer.h"
 #include "ip/Address.h"
 #include "ip/tools.h"
-#include "protos.h"
 #include "snmp_agent.h"
 #include "snmp_core.h"
 #include "snmp/Forwarder.h"

diff --git a/src/snmp_core.h b/src/snmp_core.h
index cfec2acfc78950bcf4e5aa8eede82c0e3ef4c34b..509472c223a5b627903315c383e5927f7e77c3e2 100644 (file)
--- a/src/snmp_core.h
+++ b/src/snmp_core.h
@@ -8,6 +8,12 @@
 
 #include "cache_snmp.h"
 #include "comm/forward.h"
+#include "typedefs.h"
+
+namespace Ip {
+  class Address;
+}
+class MemBuf;
 
 #define SNMP_REQUEST_SIZE 4096
 #define MAX_PROTOSTAT 5
@@ -33,6 +39,7 @@ extern struct snmp_pdu* snmpAgentResponse(struct snmp_pdu* PDU);
 extern AggrType snmpAggrType(oid* Current, snint CurrentLen);
 
 extern Comm::ConnectionPointer snmpOutgoingConn;
+
 extern PF snmpHandleUdp;
 extern void snmpInit(void);
 extern void snmpOpenPorts(void);

diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc
index 02eeb2c28c7082f2c0223d88840975d96a74c40b..0e4ae9560bc021f7bfc628eff744bbdac1a4a903 100644 (file)
--- a/src/ssl/ErrorDetailManager.cc
+++ b/src/ssl/ErrorDetailManager.cc
@@ -3,7 +3,6 @@
 #include "errorpage.h"
 #include "ErrorDetailManager.h"
 #include "mime_header.h"
-#include "protos.h"
 
 void Ssl::errorDetailInitialize()
 {

diff --git a/src/ssl/ServerBump.cc b/src/ssl/ServerBump.cc
index f82736ee6c15496582ddffd1c7b381e0fa15de8a..a14d4bbdaf62aa680ad19271df79d82ecef14287 100644 (file)
--- a/src/ssl/ServerBump.cc
+++ b/src/ssl/ServerBump.cc
@@ -9,7 +9,6 @@
 
 #include "client_side.h"
 #include "forward.h"
-#include "protos.h"
 #include "ssl/ServerBump.h"
 #include "Store.h"
 #include "StoreClient.h"

diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index 13073125ef5404e1dd54d95b172b0eb504294423..0f76cebf0bb1613124950ff16d5f4ab57efdd16d 100644 (file)
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -4,14 +4,12 @@
 
 #include "squid.h"
 #include "anyp/PortCfg.h"
-#include "protos.h"
 #include "ssl/Config.h"
 #include "ssl/helper.h"
 #include "SquidString.h"
 #include "SquidTime.h"
 #include "SwapDir.h"
 #include "wordlist.h"
-#include "protos.h"
 
 Ssl::Helper * Ssl::Helper::GetInstance()
 {

diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index bafb75ed709ed9a96d1100ae02a987886cf8cd5d..50f64f3c71d8b4a10496c78b8da2edfd2b9d58a4 100644 (file)
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -43,7 +43,6 @@
 #include "acl/FilledChecklist.h"
 #include "fde.h"
 #include "globals.h"
-#include "protos.h"
 #include "ssl/ErrorDetail.h"
 #include "ssl/support.h"
 #include "ssl/gadgets.h"

diff --git a/src/stat.cc b/src/stat.cc
index 2cceb9003ab5ee1db46cfa1a87d65c1c10a1749d..b82f13073066d81ca5b597e26910acf02e84367d 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -55,7 +55,6 @@
 #include "mgr/ServiceTimesAction.h"
 #include "neighbors.h"
 #include "PeerDigest.h"
-#include "protos.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/store.cc b/src/store.cc
index 81b214793ebc5b606ececd12f71f7f192a8ca691..d2f5d87e631174237985bebda3684c10e31d0aff 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -40,6 +40,7 @@
 #include "ETag.h"
 #include "event.h"
 #include "fde.h"
+#include "globals.h"
 #include "http.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
@@ -48,7 +49,6 @@
 #include "mgr/Registration.h"
 #include "mgr/StoreIoAction.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "repl_modules.h"
 #include "SquidTime.h"
 #include "Stack.h"

diff --git a/src/store_client.cc b/src/store_client.cc
index 5e7fec3fe2cc7a195f85cf7e6674396f1f360085..e498918cace698deef78da456fd28130139e9391 100644 (file)
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -42,7 +42,6 @@
 #include "MemObject.h"
 #include "mime_header.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "StatCounters.h"
 #include "StoreClient.h"
 #include "Store.h"

diff --git a/src/store_digest.cc b/src/store_digest.cc
index 8b39baa6cb16e8d6dd8a2ddcb6afdc9e1618d920..6a56d055e7bd93015a4f8d09a4bbcfa8024d98d6 100644 (file)
--- a/src/store_digest.cc
+++ b/src/store_digest.cc
@@ -42,7 +42,6 @@
 #include "globals.h"
 #include "mgr/Registration.h"
 #include "store_digest.h"
-#include "protos.h"
 
 #if USE_CACHE_DIGESTS
 #include "CacheDigest.h"

diff --git a/src/store_dir.cc b/src/store_dir.cc
index d437eea93718b86d05bd91148e3bbb062f9139dd..8d8ea62ee8f98f154fbfa6e25454cd34f3548e6a 100644 (file)
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -39,7 +39,6 @@
 #include "MemObject.h"
 #include "MemStore.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc
index 11ba1b8c2e7ad4ff8591388aafcf0a0b95716a0d..f4b1370ba43b1fad52946e7e6411139e10538a83 100644 (file)
--- a/src/store_rebuild.cc
+++ b/src/store_rebuild.cc
@@ -34,7 +34,6 @@
 #include "event.h"
 #include "globals.h"
 #include "md5.h"
-#include "protos.h"
 #include "StatCounters.h"
 #include "Store.h"
 #include "store_key_md5.h"

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 2c61ba74570135797270998f40e99f65a7c81338..a971396645091cc1229a5ab9c2d49b03fcd2c612 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -36,11 +36,11 @@
 #include "squid.h"
 #include "cbdata.h"
 #include "StoreClient.h"
+#include "globals.h"
 #include "Store.h"
 /* FIXME: Abstract the use of this more */
 #include "mem_node.h"
 #include "MemObject.h"
-#include "protos.h"
 #include "SwapDir.h"
 #include "StatCounters.h"
 #include "store_log.h"

diff --git a/src/tests/stub_cache_cf.cc b/src/tests/stub_cache_cf.cc
index 6e7ffbdab7c4006e98ab7a9cd519bdf05e5f87a6..257393790d800f61edd81352b77a19060a9d8bd9 100644 (file)
--- a/src/tests/stub_cache_cf.cc
+++ b/src/tests/stub_cache_cf.cc
@@ -34,7 +34,6 @@
 
 #include "squid.h"
 #include "ConfigParser.h"
-#include "protos.h"
 #include "wordlist.h"
 
 #define STUB_API "cache_cf.cc"

diff --git a/src/tests/stub_client_db.cc b/src/tests/stub_client_db.cc
index df933f501cc9cb7c3b360778f4c9019e877f85fd..f9212222e0d89d63d6c867ee8ce4c96b8ff62cad 100644 (file)
--- a/src/tests/stub_client_db.cc
+++ b/src/tests/stub_client_db.cc
@@ -1,6 +1,5 @@
 #include "squid.h"
-/* because the clientdb API is defined in protos.h still */
-#include "protos.h"
+#include "client_db.h"
 
 #define STUB_API "client_db.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_errorpage.cc b/src/tests/stub_errorpage.cc
index f3ca968062d62bcfdff5e9c8eb4a0c2cbd56cf43..90eb844d2d653964cc2b5ba3c19c29248f48b877 100644 (file)
--- a/src/tests/stub_errorpage.cc
+++ b/src/tests/stub_errorpage.cc
@@ -1,6 +1,5 @@
 #include "squid.h"
 #include "errorpage.h"
-#include "protos.h"
 
 #define STUB_API "errorpage.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_fd.cc b/src/tests/stub_fd.cc
index 5fb6b27c59153d19dbc1c10b534343bda2714513..a5eab4b03f3440867df6bc6ba0cb6b97e7c1d53d 100644 (file)
--- a/src/tests/stub_fd.cc
+++ b/src/tests/stub_fd.cc
@@ -1,6 +1,5 @@
 #include "squid.h"
 #include "fde.h"
-#include "protos.h"
 
 #define STUB_API "fd.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_internal.cc b/src/tests/stub_internal.cc
index f7419561858f8a78112d5eef759ef2cde46d34f1..deaefb4b282caba9949549202ca016289d2040c3 100644 (file)
--- a/src/tests/stub_internal.cc
+++ b/src/tests/stub_internal.cc
@@ -1,5 +1,4 @@
 #include "squid.h"
-#include "protos.h"
 
 #define STUB_API "internal.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_ipc.cc b/src/tests/stub_ipc.cc
index 8c5c2f0eed7e3cd8fef37e7212b93bf0fb7b16e2..175926fedda4fb0708c855d9503cb608f0e208e3 100644 (file)
--- a/src/tests/stub_ipc.cc
+++ b/src/tests/stub_ipc.cc
@@ -1,8 +1,8 @@
 #include "squid.h"
-// because ipcCreate is defined in protos.h still
-#include "protos.h"
+#include "SquidIpc.h"
 
 #define STUB_API "ipc.cc"
 #include "tests/STUB.h"
 
+
 pid_t ipcCreate(int, const char *, const char *const [], const char *, Ip::Address &, int *, int *, void **) STUB_RETVAL(-1)

diff --git a/src/tests/stub_mime.cc b/src/tests/stub_mime.cc
index a7a8613084a08460be61cabe620a1877f41306b2..45e844e857c6aadfae05ee54abebdf4b909b1273 100644 (file)
--- a/src/tests/stub_mime.cc
+++ b/src/tests/stub_mime.cc
@@ -1,5 +1,4 @@
 #include "squid.h"
-#include "protos.h"
 
 #define STUB_API "mime.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_store_client.cc b/src/tests/stub_store_client.cc
index 65a9913862a2b2a4e3530f622c3df524f993951e..c90f04277ca261969f0d9b509c32b5bca6affa7c 100644 (file)
--- a/src/tests/stub_store_client.cc
+++ b/src/tests/stub_store_client.cc
@@ -1,7 +1,6 @@
 #include "squid.h"
 #include "StoreClient.h"
 #include "Store.h"
-#include "protos.h"
 
 #define STUB_API "store_client.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_store_rebuild.cc b/src/tests/stub_store_rebuild.cc
index 9328898474e461473b840031d70f76f91a9077f8..5c3f6c03bf5e3614d3d851dd0722aa718698da27 100644 (file)
--- a/src/tests/stub_store_rebuild.cc
+++ b/src/tests/stub_store_rebuild.cc
@@ -34,7 +34,6 @@
 
 #include "squid.h"
 #include "MemBuf.h"
-#include "protos.h"
 
 #define STUB_API "stub_store_rebuild.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc
index 1b7b90de5ee6aed9f9654e2b254652506f44ea7b..f18d7b805f92943855fd3828d31b8e6e11fad4a5 100644 (file)
--- a/src/tests/testEvent.cc
+++ b/src/tests/testEvent.cc
@@ -7,7 +7,6 @@
 #include "CapturingStoreEntry.h"
 #include "event.h"
 #include "Mem.h"
-#include "protos.h"
 #include "stat.h"
 #include "testEvent.h"
 

diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 693988f7e8f691ac50244b084ccbbd94a757ee69..51c077a17c6da4b1aa180fa478e6529ea3990571 100644 (file)
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -6,7 +6,6 @@
 #include "testEventLoop.h"
 #include "EventLoop.h"
 #include "Mem.h"
-#include "protos.h"
 #include "stat.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop );

diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index 005cc2e0733fea6cd8b664a2f948d2b4ec37c7b1..3a819adb4f498ab95d6a368fe29a1d2bbade7f66 100644 (file)
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -7,7 +7,6 @@
 #include "HttpReply.h"
 #include "Mem.h"
 #include "mime_header.h"
-#include "protos.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply );
 

diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 22f1dcbf01084b438b0b6fc5e3767d5977e9e7fa..d7e32398f20eb2d5c80237e1255e4b245e9aa184 100644 (file)
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -8,7 +8,6 @@
 #include "HttpRequest.h"
 #include "Mem.h"
 #include "mime_header.h"
-#include "protos.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
 

diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc
index 79d2482e2a1865b7e9f08317e66bbfde41ee10bd..088e347c77735cfe9d57845e2d1a034f15016c1c 100644 (file)
--- a/src/tests/testRock.cc
+++ b/src/tests/testRock.cc
@@ -8,7 +8,6 @@
 #include "HttpReply.h"
 #include "Mem.h"
 #include "MemObject.h"
-#include "protos.h"
 #include "Store.h"
 #include "StoreFileSystem.h"
 #include "StoreSearch.h"

diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc
index 4642e32d5493864272802bb914404a1916e5b699..8080bbd53110a5773ff1fc5413eac27c4098e1a0 100644 (file)
--- a/src/tests/testUfs.cc
+++ b/src/tests/testUfs.cc
@@ -8,7 +8,6 @@
 #include "HttpReply.h"
 #include "Mem.h"
 #include "MemObject.h"
-#include "protos.h"
 #include "Store.h"
 #include "SwapDir.h"
 #include "testStoreSupport.h"

diff --git a/src/tools.cc b/src/tools.cc
index 476e8ef9f4b279dcd8dacdeee2e62e4bc19c1669..27c56ce294867d58445cf8eb760c62feeb4c661c 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -49,7 +49,6 @@
 #include "ipc/Kids.h"
 #include "ipc/Coordinator.h"
 #include "ipcache.h"
-#include "protos.h"
 #include "tools.h"
 #include "SwapDir.h"
 #include "wordlist.h"

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 25ffff690f8bacce9681cff87cd325b5a1c8cc11..09a6bb2d359c491d19e5a5473673715548ace18f 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -48,7 +48,6 @@
 #include "MemBuf.h"
 #include "http.h"
 #include "PeerSelectState.h"
-#include "protos.h"
 #include "StatCounters.h"
 #include "tools.h"
 

diff --git a/src/unlinkd.cc b/src/unlinkd.cc
index ab1bafd03521fd79fd0b826dc9af540982f429d2..64224a83e4cc533abc8eff9a0c5161134fb6a8dd 100644 (file)
--- a/src/unlinkd.cc
+++ b/src/unlinkd.cc
@@ -38,7 +38,6 @@
 #include "fde.h"
 #include "globals.h"
 #include "xusleep.h"
-#include "protos.h"
 #include "SquidIpc.h"
 #include "SquidTime.h"
 #include "StatCounters.h"

diff --git a/src/url.cc b/src/url.cc
index 607c1af7bbcebf3312b3489efeab872537e40f4e..eefbace4be983a93d4330524f587ab9c9e62cb70 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -36,7 +36,6 @@
 #include "squid.h"
 #include "globals.h"
 #include "HttpRequest.h"
-#include "protos.h"
 #include "rfc1738.h"
 #include "SquidString.h"
 #include "URL.h"

diff --git a/src/urn.cc b/src/urn.cc
index df92a76af0b6cca33eed92fc171ae055785092a3..456d715f74665fcda0756d86f3b1f4d96bb24d13 100644 (file)
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -42,7 +42,6 @@
 #include "icmp/net_db.h"
 #include "MemBuf.h"
 #include "mime_header.h"
-#include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "StoreClient.h"

diff --git a/src/wccp2.cc b/src/wccp2.cc
index 9a0736614eb172e8a9beb4b19d093e86d320cf69..881ddac93a27e571494516d44cc602166af1e0f3 100644 (file)
--- a/src/wccp2.cc
+++ b/src/wccp2.cc
@@ -43,7 +43,6 @@
 #include "ip/Address.h"
 #include "md5.h"
 #include "Parsing.h"
-#include "protos.h"
 #include "Store.h"
 #include "SwapDir.h"
 

diff --git a/src/whois.cc b/src/whois.cc
index d4a0c6d9f8ec2774c0c5bb18425622efd8574659..3fe921ace5b1bf5e74d336c8e32aa94095b9c064 100644 (file)
--- a/src/whois.cc
+++ b/src/whois.cc
@@ -41,7 +41,6 @@
 #include "HttpRequest.h"
 #include "HttpRequest.h"
 #include "forward.h"
-#include "protos.h"
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"