From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 4 Oct 2012 09:14:06 +0000 (+0200)
Subject: Removed unnecessary extern declarations.
X-Git-Tag: SQUID_3_3_0_1~31^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82afb1254b4126bf16706b9215a80bf43266c723;p=thirdparty%2Fsquid.git

Removed unnecessary extern declarations.
Changed mismatching class/struct declaration in fde.h
Created default constructor for _fde_disk and moved there proper initialization
Removed some dead function declarations
---

diff --git a/src/AuthReg.h b/src/AuthReg.h
index 08c5738045..a101d42870 100644
--- a/src/AuthReg.h
+++ b/src/AuthReg.h
@@ -36,7 +36,7 @@ namespace Auth
 
 #if USE_AUTH
 /// Initialize Auth subsystem
-extern void Init(void);
+void Init(void);
 #else /* USE_AUTH */
 inline void Init(void) {} /* NOP if not USE_AUTH */
 #endif /* USE_AUTH */
diff --git a/src/HttpHdrScTarget.cc b/src/HttpHdrScTarget.cc
index 41465be3a0..bf7a26288d 100644
--- a/src/HttpHdrScTarget.cc
+++ b/src/HttpHdrScTarget.cc
@@ -37,7 +37,7 @@
 #include "HttpHdrSc.h"
 #include "StatHist.h"
 
-extern http_hdr_sc_type &operator++ (http_hdr_sc_type &aHeader);
+http_hdr_sc_type &operator++ (http_hdr_sc_type &aHeader);
 /* copies non-extant fields from new_sc to this sc */
 void
 HttpHdrScTarget::mergeWith(const HttpHdrScTarget * new_sc)
diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 9c760f1ae7..2f8ef03ba3 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -56,7 +56,6 @@
 class ConnStateData;
 
 /*  Http Request */
-//DEAD?: extern int httpRequestHdrAllowedByName(http_hdr_type id);
 void httpRequestPack(void *obj, Packer *p);
 
 class HttpHdrRange;
diff --git a/src/Server.cc b/src/Server.cc
index a51b129697..619b9f3b32 100644
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -57,7 +57,7 @@
 #endif
 
 // implemented in client_side_reply.cc until sides have a common parent
-extern void purgeEntriesByUrl(HttpRequest * req, const char *url);
+void purgeEntriesByUrl(HttpRequest * req, const char *url);
 
 ServerStateData::ServerStateData(FwdState *theFwdState): AsyncJob("ServerStateData"),
         requestSender(NULL),
diff --git a/src/String.cc b/src/String.cc
index 842a07c7d6..e5ff7a2f5d 100644
--- a/src/String.cc
+++ b/src/String.cc
@@ -303,7 +303,7 @@ StringRegistry::remove(String const *entry)
 
 StringRegistry StringRegistry::Instance_;
 
-extern String::size_type memStringCount();
+String::size_type memStringCount();
 
 void
 StringRegistry::Stat(StoreEntry *entry)
diff --git a/src/adaptation/Elements.h b/src/adaptation/Elements.h
index 8bd39549bc..60a16738c7 100644
--- a/src/adaptation/Elements.h
+++ b/src/adaptation/Elements.h
@@ -11,8 +11,8 @@ typedef enum { pointNone, pointPreCache, pointPostCache } VectPoint;
 typedef enum { srvBlock, srvBypass, srvWait, srvForce} SrvBehaviour;
 
 extern const char *crlf;
-extern const char *methodStr(Method); // TODO: make into a stream operator?
-extern const char *vectPointStr(VectPoint); // TODO: make into a stream op?
+const char *methodStr(Method); // TODO: make into a stream operator?
+const char *vectPointStr(VectPoint); // TODO: make into a stream op?
 
 } // namespace Adaptation
 
diff --git a/src/adaptation/Service.h b/src/adaptation/Service.h
index 6679a7f8a4..87c31f57d7 100644
--- a/src/adaptation/Service.h
+++ b/src/adaptation/Service.h
@@ -61,11 +61,11 @@ private:
 typedef Service::Pointer ServicePointer;
 
 typedef Vector<Adaptation::ServicePointer> Services;
-extern Services &AllServices();
-extern ServicePointer FindService(const Service::Id &key);
+Services &AllServices();
+ServicePointer FindService(const Service::Id &key);
 
 /// detach all adaptation services from current configuration
-extern void DetachServices();
+void DetachServices();
 
 } // namespace Adaptation
 
diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h
index d53fb79dbf..b21a417401 100644
--- a/src/adaptation/ServiceGroups.h
+++ b/src/adaptation/ServiceGroups.h
@@ -142,8 +142,8 @@ std::ostream &operator <<(std::ostream &os, const ServicePlan &p)
 }
 
 typedef Vector<ServiceGroupPointer> Groups;
-extern Groups &AllGroups();
-extern ServiceGroupPointer FindGroup(const ServiceGroup::Id &id);
+Groups &AllGroups();
+ServiceGroupPointer FindGroup(const ServiceGroup::Id &id);
 
 } // namespace Adaptation
 
diff --git a/src/adaptation/ecap/ServiceRep.h b/src/adaptation/ecap/ServiceRep.h
index b21179b97b..8f1001331e 100644
--- a/src/adaptation/ecap/ServiceRep.h
+++ b/src/adaptation/ecap/ServiceRep.h
@@ -49,15 +49,15 @@ private:
 };
 
 /// register loaded eCAP module service
-extern void RegisterAdapterService(const ServiceRep::AdapterService& adapterService);
+void RegisterAdapterService(const ServiceRep::AdapterService& adapterService);
 /// unregister loaded eCAP module service by service uri
-extern void UnregisterAdapterService(const String& serviceUri);
+void UnregisterAdapterService(const String& serviceUri);
 
 /// returns loaded eCAP module service by service uri
-extern ServiceRep::AdapterService FindAdapterService(const String& serviceUri);
+ServiceRep::AdapterService FindAdapterService(const String& serviceUri);
 
 /// check for loaded eCAP services without matching ecap_service in squid.conf
-extern void CheckUnusedAdapterServices(const Services& services);
+void CheckUnusedAdapterServices(const Services& services);
 } // namespace Ecap
 } // namespace Adaptation
 
diff --git a/src/client_side.cc b/src/client_side.cc
index af885f556b..42cd35f48f 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1896,9 +1896,9 @@ ClientSocketContext::writeComplete(const Comm::ConnectionPointer &conn, char *bu
     }
 }
 
-extern "C" CSR clientGetMoreData;
-extern "C" CSS clientReplyStatus;
-extern "C" CSD clientReplyDetach;
+SQUIDCEXTERN CSR clientGetMoreData;
+SQUIDCEXTERN CSS clientReplyStatus;
+SQUIDCEXTERN CSD clientReplyDetach;
 
 static ClientSocketContext *
 parseHttpRequestAbort(ConnStateData * csd, const char *uri)
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 4080026a75..befef0d35e 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -76,7 +76,7 @@ CBDATA_CLASS_INIT(clientReplyContext);
 
 /* Local functions */
 extern "C" CSS clientReplyStatus;
-extern ErrorState *clientBuildError(err_type, http_status, char const *, Ip::Address &, HttpRequest *);
+ErrorState *clientBuildError(err_type, http_status, char const *, Ip::Address &, HttpRequest *);
 
 /* privates */
 
@@ -433,8 +433,8 @@ clientReplyContext::handleIMSReply(StoreIOBuffer result)
     }
 }
 
-extern "C" CSR clientGetMoreData;
-extern "C" CSD clientReplyDetach;
+SQUIDCEXTERN CSR clientGetMoreData;
+SQUIDCEXTERN CSD clientReplyDetach;
 
 /**
  * clientReplyContext::cacheHit Should only be called until the HTTP reply headers
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 593e4114fa..a4df356dd6 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -101,7 +101,7 @@ static const char *const crlf = "\r\n";
 static void clientFollowXForwardedForCheck(allow_t answer, void *data);
 #endif /* FOLLOW_X_FORWARDED_FOR */
 
-extern ErrorState *clientBuildError(err_type, http_status, char const *url, Ip::Address &, HttpRequest *);
+ErrorState *clientBuildError(err_type, http_status, char const *url, Ip::Address &, HttpRequest *);
 
 CBDATA_CLASS_INIT(ClientRequestContext);
 
@@ -131,9 +131,9 @@ static int clientHierarchical(ClientHttpRequest * http);
 static void clientInterpretRequestHeaders(ClientHttpRequest * http);
 static RH clientRedirectDoneWrapper;
 static void checkNoCacheDoneWrapper(allow_t, void *);
-extern "C" CSR clientGetMoreData;
-extern "C" CSS clientReplyStatus;
-extern "C" CSD clientReplyDetach;
+SQUIDCEXTERN CSR clientGetMoreData;
+SQUIDCEXTERN CSS clientReplyStatus;
+SQUIDCEXTERN CSD clientReplyDetach;
 static void checkFailureRatio(err_type, hier_code);
 
 ClientRequestContext::~ClientRequestContext()
@@ -1533,8 +1533,8 @@ ClientHttpRequest::loggingEntry(StoreEntry *newEntry)
  * the callout.  This is strictly for convenience.
  */
 
-extern tos_t aclMapTOS (acl_tos * head, ACLChecklist * ch);
-extern nfmark_t aclMapNfmark (acl_nfmark * head, ACLChecklist * ch);
+tos_t aclMapTOS (acl_tos * head, ACLChecklist * ch);
+nfmark_t aclMapNfmark (acl_nfmark * head, ACLChecklist * ch);
 
 void
 ClientHttpRequest::doCallouts()
diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index 050a46e032..a863a4f1ea 100644
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -1448,7 +1448,7 @@ ESIContext::freeResources ()
     /* don't touch incoming, it's a pointer into buffered anyway */
 }
 
-extern ErrorState *clientBuildError (err_type, http_status, char const *, Ip::Address &, HttpRequest *);
+ErrorState *clientBuildError (err_type, http_status, char const *, Ip::Address &, HttpRequest *);
 
 /* This can ONLY be used before we have sent *any* data to the client */
 void
diff --git a/src/fde.h b/src/fde.h
index e166675c1b..32123e7aaf 100644
--- a/src/fde.h
+++ b/src/fde.h
@@ -51,6 +51,7 @@ public:
     dwrite_q *write_q;
     dwrite_q *write_q_tail;
     off_t offset;
+    _fde_disk() { memset(this, 0, sizeof(_fde_disk)); }
 };
 
 class fde
@@ -112,7 +113,7 @@ public:
 #endif
     unsigned epoll_state;
 
-    struct _fde_disk disk;
+    _fde_disk disk;
     PF *read_handler;
     void *read_data;
     PF *write_handler;
@@ -166,7 +167,6 @@ private:
         clientInfo = NULL;
 #endif
         epoll_state = 0;
-        memset(&disk, 0, sizeof(_fde_disk));
         read_handler = NULL;
         read_data = NULL;
         write_handler = NULL;
diff --git a/src/fqdncache.h b/src/fqdncache.h
index 0592a89f87..ef64557a79 100644
--- a/src/fqdncache.h
+++ b/src/fqdncache.h
@@ -41,15 +41,12 @@ class wordlist;
 
 void fqdncache_init(void);
 void fqdnStats(StoreEntry *);
-//extern void fqdncacheReleaseInvalid(const char *);
-//extern int fqdncacheQueueDrain(void);
 void fqdncacheFreeMemory(void);
 void fqdncache_restart(void);
 void fqdncache_purgelru(void *);
 void fqdncacheAddEntryFromHosts(char *addr, wordlist * hostnames);
 
 const char *fqdncache_gethostbyaddr(const Ip::Address &, int flags);
-//extern const char *fqdnFromAddr(const Ip::Address &);
 void fqdncache_nbgethostbyaddr(const Ip::Address &, FQDNH *, void *);
 
 #endif /* SQUID_FQDNCACHE_H_ */
diff --git a/src/ip/Address.h b/src/ip/Address.h
index ae0fc37369..9ec57cba0f 100644
--- a/src/ip/Address.h
+++ b/src/ip/Address.h
@@ -402,6 +402,6 @@ public:
 
 } // namespace Ip
 
-extern void parse_IpAddress_list_token(Ip::Address_list **, char *);
+void parse_IpAddress_list_token(Ip::Address_list **, char *);
 
 #endif /* _SQUID_IP_IPADDRESS_H */
diff --git a/src/ip/tools.h b/src/ip/tools.h
index 5555879e0a..cde6aa9ecd 100644
--- a/src/ip/tools.h
+++ b/src/ip/tools.h
@@ -5,7 +5,7 @@ namespace Ip
 {
 
 /// Probe to discover IPv6 capabilities
-extern void ProbeTransport(void);
+void ProbeTransport(void);
 
 /* Squids notion of IPv6 stack types and state */
 #define IPV6_OFF  0
diff --git a/src/ipc/FdNotes.h b/src/ipc/FdNotes.h
index e6bd01258a..1e5730c3c0 100644
--- a/src/ipc/FdNotes.h
+++ b/src/ipc/FdNotes.h
@@ -19,7 +19,7 @@ typedef enum { fdnNone, fdnHttpSocket, fdnHttpsSocket,
                fdnInIcpSocket, fdnInHtcpSocket, fdnEnd
              } FdNoteId;
 
-extern const char *FdNote(int fdNodeId); ///< converts FdNoteId into a string
+const char *FdNote(int fdNodeId); ///< converts FdNoteId into a string
 
 } // namespace Ipc;
 
diff --git a/src/ipc/SharedListen.h b/src/ipc/SharedListen.h
index da58422981..bf7176896e 100644
--- a/src/ipc/SharedListen.h
+++ b/src/ipc/SharedListen.h
@@ -69,10 +69,10 @@ public:
 };
 
 /// prepare and send SharedListenRequest to Coordinator
-extern void JoinSharedListen(const OpenListenerParams &, AsyncCall::Pointer &);
+void JoinSharedListen(const OpenListenerParams &, AsyncCall::Pointer &);
 
 /// process Coordinator response to SharedListenRequest
-extern void SharedListenJoined(const SharedListenResponse &response);
+void SharedListenJoined(const SharedListenResponse &response);
 
 } // namespace Ipc;
 
diff --git a/src/ipc/StartListening.h b/src/ipc/StartListening.h
index 89aa61f8df..58794c640d 100644
--- a/src/ipc/StartListening.h
+++ b/src/ipc/StartListening.h
@@ -37,7 +37,7 @@ public:
 
 /// Depending on whether SMP is on, either ask Coordinator to send us
 /// the listening FD or open a listening socket directly.
-extern void StartListening(int sock_type, int proto, const Comm::ConnectionPointer &listenConn,
+void StartListening(int sock_type, int proto, const Comm::ConnectionPointer &listenConn,
                            FdNoteId fdNote, AsyncCall::Pointer &callback);
 
 } // namespace Ipc;
diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h
index 94164c0d62..9c3b1eed13 100644
--- a/src/ipc/UdsOp.h
+++ b/src/ipc/UdsOp.h
@@ -55,7 +55,7 @@ private:
 };
 
 /// converts human-readable filename path into UDS address
-extern struct sockaddr_un PathToAddress(const String &pathAddr);
+struct sockaddr_un PathToAddress(const String &pathAddr);
 
 // XXX: move UdsSender code to UdsSender.{cc,h}
 /// attempts to send an IPC message a few times, with a timeout
diff --git a/src/log/File.h b/src/log/File.h
index 8ceb238eb9..97cf417e94 100644
--- a/src/log/File.h
+++ b/src/log/File.h
@@ -50,13 +50,13 @@ public:
 };
 
 /* Legacy API */
-extern Logfile *logfileOpen(const char *path, size_t bufsz, int);
-extern void logfileClose(Logfile * lf);
-extern void logfileRotate(Logfile * lf);
-extern void logfileWrite(Logfile * lf, char *buf, size_t len);
-extern void logfileFlush(Logfile * lf);
-extern void logfilePrintf(Logfile * lf, const char *fmt,...) PRINTF_FORMAT_ARG2;
-extern void logfileLineStart(Logfile * lf);
-extern void logfileLineEnd(Logfile * lf);
+Logfile *logfileOpen(const char *path, size_t bufsz, int);
+void logfileClose(Logfile * lf);
+void logfileRotate(Logfile * lf);
+void logfileWrite(Logfile * lf, char *buf, size_t len);
+void logfileFlush(Logfile * lf);
+void logfilePrintf(Logfile * lf, const char *fmt,...) PRINTF_FORMAT_ARG2;
+void logfileLineStart(Logfile * lf);
+void logfileLineEnd(Logfile * lf);
 
 #endif /* SQUID_SRC_LOG_FILE_H */
diff --git a/src/log/ModDaemon.h b/src/log/ModDaemon.h
index 02971ec8de..e7cd10ebcd 100644
--- a/src/log/ModDaemon.h
+++ b/src/log/ModDaemon.h
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_daemon_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_daemon_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODDAEMON_H */
diff --git a/src/log/ModStdio.h b/src/log/ModStdio.h
index 7036878641..75c4e556b7 100644
--- a/src/log/ModStdio.h
+++ b/src/log/ModStdio.h
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_stdio_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_stdio_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODSTDIO_H */
diff --git a/src/log/ModSyslog.h b/src/log/ModSyslog.h
index f877a5b30e..ce5be486c8 100644
--- a/src/log/ModSyslog.h
+++ b/src/log/ModSyslog.h
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_syslog_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_syslog_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODSYSLOG_H */
diff --git a/src/log/ModTcp.h b/src/log/ModTcp.h
index 1d30e937dd..be577ded52 100644
--- a/src/log/ModTcp.h
+++ b/src/log/ModTcp.h
@@ -35,6 +35,6 @@
 
 class Logfile;
 
-extern int logfile_mod_tcp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_tcp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODTCP_H */
diff --git a/src/log/ModUdp.h b/src/log/ModUdp.h
index 5d35416849..faa3e9f739 100644
--- a/src/log/ModUdp.h
+++ b/src/log/ModUdp.h
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODUDP_H */
diff --git a/src/log/access_log.h b/src/log/access_log.h
index f64b665e0b..6a9a305742 100644
--- a/src/log/access_log.h
+++ b/src/log/access_log.h
@@ -33,13 +33,13 @@
 #ifndef SQUID_LOG_ACCESS_LOG_H_
 #define SQUID_LOG_ACCESS_LOG_H_
 
-extern int logTypeIsATcpHit(log_type);
-extern void fvdbCountVia(const char *key);
-extern void fvdbCountForw(const char *key);
+int logTypeIsATcpHit(log_type);
+void fvdbCountVia(const char *key);
+void fvdbCountForw(const char *key);
 
 #if HEADERS_LOG
 class HttpRequestMethod;
-extern void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data);
+void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data);
 #endif
 
 #endif /* SQUID_LOG_ACCESS_LOG_H_ */
diff --git a/src/main.cc b/src/main.cc
index c529051a84..a0e91a12b6 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -160,7 +160,7 @@ static int opt_install_service = FALSE;
 static int opt_remove_service = FALSE;
 static int opt_signal_service = FALSE;
 static int opt_command_line = FALSE;
-extern void WIN32_svcstatusupdate(DWORD, DWORD);
+void WIN32_svcstatusupdate(DWORD, DWORD);
 void WINAPI WIN32_svcHandler(DWORD);
 
 #endif
@@ -196,8 +196,8 @@ static void serverConnectionsClose(void);
 static void watch_child(char **);
 static void setEffectiveUser(void);
 #if MEM_GEN_TRACE
-extern void log_trace_done();
-extern void log_trace_init(char *);
+void log_trace_done();
+void log_trace_init(char *);
 #endif
 static void SquidShutdown(void);
 static void mainSetCwd(void);
diff --git a/src/mem.cc b/src/mem.cc
index 4a947661ff..678a49f327 100644
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -257,7 +257,6 @@ memAllocString(size_t net_size, size_t * gross_size)
     return pool ? pool->alloc() : xcalloc(1, net_size);
 }
 
-extern size_t memStringCount();
 size_t
 memStringCount()
 {
diff --git a/src/mgr/CountersAction.cc b/src/mgr/CountersAction.cc
index 1727cb3e8a..ef2aa6205c 100644
--- a/src/mgr/CountersAction.cc
+++ b/src/mgr/CountersAction.cc
@@ -12,8 +12,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetCountersStats(Mgr::CountersActionData& stats);
-extern void DumpCountersStats(Mgr::CountersActionData& stats, StoreEntry* sentry);
+void GetCountersStats(Mgr::CountersActionData& stats);
+void DumpCountersStats(Mgr::CountersActionData& stats, StoreEntry* sentry);
 
 Mgr::CountersActionData::CountersActionData()
 {
diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc
index 4c8f2441f7..9f5aaa9fe8 100644
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -19,9 +19,9 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetInfo(Mgr::InfoActionData& stats);
-extern void DumpInfo(Mgr::InfoActionData& stats, StoreEntry* sentry);
-extern void DumpMallocStatistics(StoreEntry* sentry);
+void GetInfo(Mgr::InfoActionData& stats);
+void DumpInfo(Mgr::InfoActionData& stats, StoreEntry* sentry);
+void DumpMallocStatistics(StoreEntry* sentry);
 
 Mgr::InfoActionData::InfoActionData()
 {
diff --git a/src/mgr/IntervalAction.cc b/src/mgr/IntervalAction.cc
index c52c6dad2c..364dbe1eb3 100644
--- a/src/mgr/IntervalAction.cc
+++ b/src/mgr/IntervalAction.cc
@@ -12,8 +12,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours);
-extern void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry);
+void GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours);
+void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry);
 
 Mgr::IntervalActionData::IntervalActionData()
 {
diff --git a/src/mgr/IoAction.cc b/src/mgr/IoAction.cc
index 06cfbbd2e3..0c0b9d2253 100644
--- a/src/mgr/IoAction.cc
+++ b/src/mgr/IoAction.cc
@@ -13,8 +13,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetIoStats(Mgr::IoActionData& stats);
-extern void DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry);
+void GetIoStats(Mgr::IoActionData& stats);
+void DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry);
 
 Mgr::IoActionData::IoActionData()
 {
diff --git a/src/mgr/ServiceTimesAction.cc b/src/mgr/ServiceTimesAction.cc
index 8ae260c145..de630cc538 100644
--- a/src/mgr/ServiceTimesAction.cc
+++ b/src/mgr/ServiceTimesAction.cc
@@ -11,8 +11,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetServiceTimesStats(Mgr::ServiceTimesActionData& stats);
-extern void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry* sentry);
+void GetServiceTimesStats(Mgr::ServiceTimesActionData& stats);
+void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry* sentry);
 
 Mgr::ServiceTimesActionData::ServiceTimesActionData()
 {
diff --git a/src/repl/heap/store_heap_replacement.h b/src/repl/heap/store_heap_replacement.h
index 9208cee7e9..44d98b1a36 100644
--- a/src/repl/heap/store_heap_replacement.h
+++ b/src/repl/heap/store_heap_replacement.h
@@ -1,13 +1,10 @@
-/*
- * $Id$
- */
 #ifndef _SQUIDINC_STORE_HEAP_REPLACEMENT_H
 #define _SQUIDINC_STORE_HEAP_REPLACEMENT_H
 
 #include "heap.h"
 
-extern heap_key HeapKeyGen_StoreEntry_LFUDA(void *entry, double age);
-extern heap_key HeapKeyGen_StoreEntry_GDSF(void *entry, double age);
-extern heap_key HeapKeyGen_StoreEntry_LRU(void *entry, double age);
+heap_key HeapKeyGen_StoreEntry_LFUDA(void *entry, double age);
+heap_key HeapKeyGen_StoreEntry_GDSF(void *entry, double age);
+heap_key HeapKeyGen_StoreEntry_LRU(void *entry, double age);
 
 #endif /* _SQUIDINC_STORE_HEAP_REPLACEMENT_H */
diff --git a/src/snmp/Forwarder.h b/src/snmp/Forwarder.h
index fe7ec6e46d..bdb9421d70 100644
--- a/src/snmp/Forwarder.h
+++ b/src/snmp/Forwarder.h
@@ -42,7 +42,7 @@ private:
     CBDATA_CLASS2(Forwarder);
 };
 
-extern void SendResponse(unsigned int requestId, const Pdu& pdu);
+void SendResponse(unsigned int requestId, const Pdu& pdu);
 
 } // namespace Snmp
 
diff --git a/src/snmp/Response.h b/src/snmp/Response.h
index e6a2dc26b9..67941f7d85 100644
--- a/src/snmp/Response.h
+++ b/src/snmp/Response.h
@@ -31,7 +31,7 @@ public:
     Pdu pdu; ///< SNMP protocol data unit
 };
 
-extern std::ostream& operator << (std::ostream& os, const Response& response);
+std::ostream& operator << (std::ostream& os, const Response& response);
 
 } // namespace Snmp
 
diff --git a/src/stat.cc b/src/stat.cc
index d65681eeee..585688e117 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1936,7 +1936,7 @@ statCPUUsage(int minutes)
                                tvSubDsec(CountHist[minutes].timestamp, CountHist[0].timestamp));
 }
 
-extern double
+double
 statRequestHitRatio(int minutes)
 {
     assert(minutes < N_COUNT_HIST);
@@ -1946,7 +1946,7 @@ statRequestHitRatio(int minutes)
                                CountHist[minutes].client_http.requests);
 }
 
-extern double
+double
 statRequestHitMemoryRatio(int minutes)
 {
     assert(minutes < N_COUNT_HIST);
@@ -1956,7 +1956,7 @@ statRequestHitMemoryRatio(int minutes)
                                CountHist[minutes].client_http.hits);
 }
 
-extern double
+double
 statRequestHitDiskRatio(int minutes)
 {
     assert(minutes < N_COUNT_HIST);
@@ -1966,7 +1966,7 @@ statRequestHitDiskRatio(int minutes)
                                CountHist[minutes].client_http.hits);
 }
 
-extern double
+double
 statByteHitRatio(int minutes)
 {
     size_t s;
diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc
index 067ffc029c..50ee2f7b9c 100644
--- a/src/tests/stub_store.cc
+++ b/src/tests/stub_store.cc
@@ -116,7 +116,7 @@ void storeEntryReplaceObject(StoreEntry *, HttpReply *) STUB
 StoreEntry *storeGetPublic(const char *uri, const HttpRequestMethod& method) STUB_RETVAL(NULL)
 StoreEntry *storeGetPublicByRequest(HttpRequest * request) STUB_RETVAL(NULL)
 StoreEntry *storeGetPublicByRequestMethod(HttpRequest * request, const HttpRequestMethod& method) STUB_RETVAL(NULL)
-extern StoreEntry *storeCreateEntry(const char *, const char *, const RequestFlags &, const HttpRequestMethod&) STUB_RETVAL(NULL)
+StoreEntry *storeCreateEntry(const char *, const char *, const RequestFlags &, const HttpRequestMethod&) STUB_RETVAL(NULL)
 void storeInit(void) STUB
 void storeConfigure(void) STUB
 void storeFreeMemory(void) STUB
diff --git a/src/tools.cc b/src/tools.cc
index 3676d0ad7e..9b0a5d577d 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -82,8 +82,8 @@ static void fatal_common(const char *);
 static void fatalvf(const char *fmt, va_list args);
 static void mail_warranty(void);
 #if MEM_GEN_TRACE
-extern void log_trace_done();
-extern void log_trace_init(char *);
+void log_trace_done();
+void log_trace_init(char *);
 #endif
 static void restoreCapabilities(int keep);
 int DebugSignal = -1;
diff --git a/src/tunnel.cc b/src/tunnel.cc
index c5099fa4d5..e1fb9a96e4 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -623,8 +623,8 @@ tunnelConnectDone(const Comm::ConnectionPointer &conn, comm_err_t status, int xe
     commSetConnTimeout(conn, Config.Timeout.read, timeoutCall);
 }
 
-extern tos_t GetTosToServer(HttpRequest * request);
-extern nfmark_t GetNfmarkToServer(HttpRequest * request);
+tos_t GetTosToServer(HttpRequest * request);
+nfmark_t GetNfmarkToServer(HttpRequest * request);
 
 void
 tunnelStart(ClientHttpRequest * http, int64_t * size_ptr, int *status_ptr)