From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 31 Aug 2012 16:57:39 +0000 (+0200)
Subject: Removed inclusion of protos.h from most clients.
X-Git-Tag: sourceformat-review-1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af69c63588bcf64dd3bb9a4b6dde39f5b59f5bc1;p=thirdparty%2Fsquid.git

Removed inclusion of protos.h from most clients.
---

diff --git a/src/AuthReg.cc b/src/AuthReg.cc
index 86d59df5f2..2a382f96aa 100644
--- 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 7f401b01be..bc6517ad00 100644
--- 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 2ba9baaa4d..dc799acc24 100644
--- 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 e6665682db..7cecee29bd 100644
--- 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 fee83035ee..e03af0c787 100644
--- 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 230b52d7f1..fe49b6c979 100644
--- 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 8f9fb580ff..fcc29ff1a8 100644
--- 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 d9329ce615..8bffd4f117 100644
--- 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 95f09845da..96494fae88 100644
--- 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 ba4ce1bc5c..99048a614b 100644
--- 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 d975942c6d..3e4e23bf43 100644
--- 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 173c276a21..4a7db6e4e1 100644
--- 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 03526a9f2d..38de086785 100644
--- 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 277fd52b84..1bbcc6a253 100644
--- 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 fe36ee2322..96efc8627b 100644
--- 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 66dfcb7d02..33098d827e 100644
--- 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 002bdda81e..76d2d86e6d 100644
--- 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 62ab41a978..f9d71a702c 100644
--- 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 c9c01af051..584a2f7a2a 100644
--- 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 b8217ab461..18fed677d5 100644
--- 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 43755ea19b..4826d76767 100644
--- 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 08eafa3ea8..ee10a78034 100644
--- 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 07abdc8930..f623604bcc 100644
--- 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 b3e53cdee9..6fe9f84851 100644
--- 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 1520f419b4..a8aa7f151c 100644
--- 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 be4171e99f..784e5ec784 100644
--- 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 3f2ae5d2cf..a5513a6321 100644
--- 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 1270c325d8..5daf73f3bf 100644
--- 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 13c35772db..e33f8f1d9b 100644
--- 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 61a7a26b77..b083a341fc 100644
--- 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 2f7dd47e7f..92b8a30a20 100644
--- 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 b88f54f83c..1ae675c726 100644
--- 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 081a4d8609..615a2e5b73 100644
--- 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 02d40c0f46..0087bef355 100644
--- 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 e6eed41f39..e0da111b26 100644
--- 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 a04239785a..b1812ba546 100644
--- 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 4704f30190..27295a91b7 100644
--- 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 04a098d8ec..40de18ae14 100644
--- 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 972e953616..838992e1c3 100644
--- 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 7ebc43d3a1..9f8950a106 100644
--- 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 da5ff80ebc..bea56c9424 100644
--- 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 f11d982496..91b9b16356 100644
--- 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 f78e369e8c..922d551325 100644
--- 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 add7286ad3..8f6ec2c0dc 100644
--- 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 072c1f5698..7ba80d9086 100644
--- 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 bfefd41078..fcf9703922 100644
--- 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 a5ecddd2b5..f0dc78fc78 100644
--- 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 e0ff19c0e6..710bb90a4c 100644
--- 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 9f9370471e..817b99578e 100644
--- 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 76282ac9c8..0cc5241555 100644
--- 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 5384cc93d0..9b61dc50d1 100644
--- 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 9205456e24..ca2c25ec99 100644
--- 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 b8bd5a3319..149f9d2cbf 100644
--- 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 82c83710f3..a207d3da97 100644
--- 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 f980d5ccd9..d9f07200fe 100644
--- 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 bdbc5cf3ad..c439c42001 100644
--- 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 a625f06012..4b78fded38 100644
--- 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 7d02415546..caab493b69 100644
--- 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 a775e2ad67..9a066708d7 100644
--- 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 8e44a33c46..4fee139d74 100644
--- 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 be11f3988a..156e63d60a 100644
--- 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 7778abc033..a6d3259d70 100644
--- 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 50baf5c9b1..d4df5d3003 100644
--- 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 8eec381d22..c792735107 100644
--- 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 82087c34ea..40535721ae 100644
--- 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 56a22ac6d9..8d09e82799 100644
--- 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 0fdbacb0fe..ddb6b054a9 100644
--- 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 434d900ab5..57fedc870c 100644
--- 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 bb37ddf749..d53c340029 100644
--- 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 2756b2657b..946fb90bd9 100644
--- 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 37478d0ccf..ac4e71cc59 100644
--- 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 4078bbb728..9aee192360 100644
--- 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 f223aa5d61..f8bda5c2df 100644
--- 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 1c74ca2dbd..42e2fd5bba 100644
--- 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 a53a94e472..1c32dfd1b7 100644
--- 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 3dba7bf50e..9c7bf565cd 100644
--- 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 8efcd692a7..ec8c186e1e 100644
--- 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 fea788d1ae..41ac7ad898 100644
--- 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 12158952a3..3a575757f3 100644
--- 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 18d00aaaff..28ff50b4d4 100644
--- 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 7d708124ff..4c2ea0398f 100644
--- 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 a93f874327..f5b6cf93b5 100644
--- 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 bd4bad91e2..b383a3d5c7 100644
--- 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 a9db6177dd..bc16767a3a 100644
--- 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 632aa75346..21b127de5b 100644
--- 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 bfce017bd1..5ebc3b4472 100644
--- 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 dbaeea9cb9..9d980e2d4d 100644
--- 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 cc008cdf7f..0d8005642f 100644
--- 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 1f567d26d4..bddd9f24a0 100644
--- 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 7ff261b0fb..69ad6ed588 100644
--- 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 e837839285..5ff649b46f 100644
--- 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 f00e375845..64d028885d 100644
--- 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 f877d50307..4661c616bc 100644
--- 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 3c1add0e01..17c730933c 100644
--- 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 55117194a5..aa88160bf2 100644
--- 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 bdff77be73..0e3a2bc63d 100644
--- 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 bb07a3985e..df66cd67fa 100644
--- 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 636b16fc88..8f07ded9d9 100644
--- 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 7c5db08e6f..d9137930db 100644
--- 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 28c388c5e4..f028bf1939 100644
--- 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 fe4c5fdbb1..1089aafb14 100644
--- 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 e64d106fa0..3c2c017c1d 100644
--- 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 9550e7ccc8..29f232bd79 100644
--- 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 50270a96c6..9bd404584a 100644
--- 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 252055b752..85345cbc63 100644
--- 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 7f0412a85b..b59832513b 100644
--- 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 5de0168679..4ac95981b7 100644
--- 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 e819c4dbe8..cbf745e459 100644
--- 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 afe19e6a9c..5cde2d00dc 100644
--- 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 e0aaf923dd..b55f0671d5 100644
--- 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 a054b89c90..39bd2ef1c6 100644
--- 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 efa59dba83..268584c762 100644
--- 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 373e5f4252..5a95b13128 100644
--- 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 26320c620d..509addb466 100644
--- 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 9abaffefbe..a05140ab73 100644
--- 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 5547840c8e..35b1db3c48 100644
--- 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 8a157b89fb..9bf03e888a 100644
--- 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 b8345511fa..c339a31cc2 100644
--- 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 c7ff95eab2..5a162f2dcb 100644
--- 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 e8711ed887..063d00cd8b 100644
--- 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 0d006ff326..8cf3dc432c 100644
--- 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 2b0da11015..57e5f4fd63 100644
--- 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 d39bcaa0a3..fdac505793 100644
--- 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 3574fa8180..c1c5afcb37 100644
--- 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 0eb8dc89d7..567e431d0d 100644
--- 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 1a8c6206cd..d4669f44b3 100644
--- 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 bc52a92c07..db8a9692af 100644
--- 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 9c5daf56ec..c6fd8c92ba 100644
--- 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 e15d9137ae..76f8357f15 100644
--- 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 04252244dc..3ba0193d59 100644
--- 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 ca8287fec1..6c4578d5a5 100644
--- 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 d4b0cab517..9428998549 100644
--- 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 14edd75941..b1f71e3612 100644
--- 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 6acec69f94..3215aad84a 100644
--- 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 6ab1230a4e..931afc6785 100644
--- 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 5a6eb8dfde..562b639e46 100644
--- 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 7246e209eb..28dc0aad82 100644
--- 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 72e2a674f3..968aa4f2f8 100644
--- 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 9a179d3050..bb91db250f 100644
--- 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 4511ba58b1..d55636d94b 100644
--- 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 351910d7af..e8dc8cd2c6 100644
--- 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 a57f6c3ffc..2396fd9ac2 100644
--- 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 a051877efb..e79a47265d 100644
--- 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 ad11bb0600..878ec4bef8 100644
--- 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 eac8fd9607..bf7c670124 100644
--- 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 0ac165f384..02408aebdc 100644
--- 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 476f528fc8..798ddcefe0 100644
--- 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 b219a6bc5f..ef46b9cffc 100644
--- 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 6a6340be1f..7b8f83e96e 100644
--- 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 ad6ababe59..3ae8497998 100644
--- 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 4d9c175e7a..b96cc88ce9 100644
--- 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 7565ab825b..c713515c82 100644
--- 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 1bfbda4e58..e57132bffa 100644
--- 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 321168d2e8..8ea87f5a50 100644
--- 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 2f73f6d873..9eee80e5db 100644
--- 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 c2530a5da7..235bca50b5 100644
--- 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 cfec2acfc7..509472c223 100644
--- 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 02eeb2c28c..0e4ae9560b 100644
--- 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 f82736ee6c..a14d4bbdaf 100644
--- 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 13073125ef..0f76cebf0b 100644
--- 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 bafb75ed70..50f64f3c71 100644
--- 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 2cceb9003a..b82f130730 100644
--- 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 81b214793e..d2f5d87e63 100644
--- 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 5e7fec3fe2..e498918cac 100644
--- 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 8b39baa6cb..6a56d055e7 100644
--- 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 d437eea937..8d8ea62ee8 100644
--- 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 11ba1b8c2e..f4b1370ba4 100644
--- 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 2c61ba7457..a971396645 100644
--- 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 6e7ffbdab7..257393790d 100644
--- 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 df933f501c..f9212222e0 100644
--- 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 f3ca968062..90eb844d2d 100644
--- 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 5fb6b27c59..a5eab4b03f 100644
--- 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 f741956185..deaefb4b28 100644
--- 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 8c5c2f0eed..175926fedd 100644
--- 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 a7a8613084..45e844e857 100644
--- 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 65a9913862..c90f04277c 100644
--- 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 9328898474..5c3f6c03bf 100644
--- 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 1b7b90de5e..f18d7b805f 100644
--- 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 693988f7e8..51c077a17c 100644
--- 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 005cc2e073..3a819adb4f 100644
--- 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 22f1dcbf01..d7e32398f2 100644
--- 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 79d2482e2a..088e347c77 100644
--- 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 4642e32d54..8080bbd531 100644
--- 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 476e8ef9f4..27c56ce294 100644
--- 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 25ffff690f..09a6bb2d35 100644
--- 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 ab1bafd035..64224a83e4 100644
--- 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 607c1af7bb..eefbace4be 100644
--- 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 df92a76af0..456d715f74 100644
--- 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 9a0736614e..881ddac93a 100644
--- 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 d4a0c6d9f8..3fe921ace5 100644
--- 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"