Audit round

diff --cc src/CacheDigest.h
index 3885ef91ea8949af74cf65af9247582276d802e3,3885ef91ea8949af74cf65af9247582276d802e3..14f928f2a8ed0ab0064ea6419a8d22d314e3b83f
--- 1/src/CacheDigest.h
--- 2/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@@ -11,7 -11,7 +11,6 @@@
  #ifndef SQUID_CACHEDIGEST_H_
  #define SQUID_CACHEDIGEST_H_
  
--/* for cache_key */
  #include "store_key_md5.h"
  
  class CacheDigestGuessStats;

diff --cc src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
index fc11fee11616818f27f01740a5d2e9a95afb7144,fc11fee11616818f27f01740a5d2e9a95afb7144..ffa35b90f8b89653314f36a53fbf619e9b444579
--- 1/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
--- 2/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
@@@ -10,6 -10,6 +10,7 @@@
  
  #ifndef SQUID_DISKTHREADSDISKFILE_H
  #define SQUID_DISKTHREADSDISKFILE_H
++
  #include "cbdata.h"
  #include "DiskIO/DiskFile.h"
  #include "DiskThreads.h"

diff --cc src/SquidTime.h
index dc5653351e5fb480190c61a649679bc02435f221,dc5653351e5fb480190c61a649679bc02435f221..2f720dc2e010f949c7a62f65b8c88912d3103d5a
--- 1/src/SquidTime.h
--- 2/src/SquidTime.h
+++ b/src/SquidTime.h
@@@ -16,7 -16,7 +16,7 @@@
  #include <ctime>
  /* NP: sys/time.h is provided by libcompat */
  
--/*Use uint64_t to store miliseconds*/
++/* Use uint64_t to store milliseconds*/
  typedef uint64_t time_msec_t;
  
  /* globals for accessing time */

diff --cc src/comm/Connection.h
index 2743bc595a3cf6b002964749e9315cd033688fce,2743bc595a3cf6b002964749e9315cd033688fce..6a29e100be319fef34f986e9c9d5139d698ea252
--- 1/src/comm/Connection.h
--- 2/src/comm/Connection.h
+++ b/src/comm/Connection.h
@@@ -13,14 -13,14 +13,14 @@@
  
  #include "comm/forward.h"
  #include "defines.h"
--#include "hier_code.h"
--#include "ip/Address.h"
--#include "mem/forward.h"
--#include "ip/forward.h"
  #if USE_SQUID_EUI
  #include "eui/Eui48.h"
  #include "eui/Eui64.h"
  #endif
++#include "hier_code.h"
++#include "ip/Address.h"
++#include "ip/forward.h"
++#include "mem/forward.h"
  #include "SquidTime.h"
  
  #include <iosfwd>

diff --cc src/comm/forward.h
index 571bc8bfe696f18ccc62c2f9d8d5e4bc558bcf0a,571bc8bfe696f18ccc62c2f9d8d5e4bc558bcf0a..7eef538dd88fe5b84243658458a04593391a66da
--- 1/src/comm/forward.h
--- 2/src/comm/forward.h
+++ b/src/comm/forward.h
@@@ -28,6 -28,6 +28,8 @@@ bool IsConnOpen(const Comm::ConnectionP
  
  }; // namespace Comm
  
++/// legacy CBDATA callback functions ABI definition for read or write I/O events
++/// \deprecated use CommCalls API instead where possible
  typedef void PF(int, void *);
  
  #endif /* _SQUID_COMM_FORWARD_H */

diff --cc src/fs/forward.h
index e8a14d5865e728b3ef4a99972a8562401a0d1693,e8a14d5865e728b3ef4a99972a8562401a0d1693..a99349fa6bcca81231894e325987660762579bb3
--- 1/src/fs/forward.h
--- 2/src/fs/forward.h
+++ b/src/fs/forward.h
@@@ -5,11 -5,11 +5,11 @@@
   * contributions from numerous individuals and organizations.
   * Please see the COPYING and CONTRIBUTORS files for details.
   */
++
  #ifndef SQUID_FORWARD_H_
  #define SQUID_FORWARD_H_
  
  typedef int32_t sfileno;
  typedef signed int sdirno;
  
--
  #endif /* SQUID_FORWARD_H_ */

diff --cc src/ipc/MemMap.h
index 2f8e1ee722e5d3da2a6d9f570344b13e77607789,2f8e1ee722e5d3da2a6d9f570344b13e77607789..f1f7c40fae7f3491ba562e0e55cb15e7f372e4ae
--- 1/src/ipc/MemMap.h
--- 2/src/ipc/MemMap.h
+++ b/src/ipc/MemMap.h
@@@ -10,13 -10,13 +10,13 @@@
  #define SQUID_IPC_STORE_MAP_H
  
  #include "Debug.h"
++#include "fs/forward.h"
  #include "ipc/mem/FlexibleArray.h"
  #include "ipc/mem/Pointer.h"
  #include "ipc/ReadWriteLock.h"
  #include "SBuf.h"
  #include "store_key_md5.h"
  #include "tools.h"
--#include "fs/forward.h"
  
  #include <atomic>
  

diff --cc src/ipc/StoreMap.h
index 051f2af999f44b6b11f6f54eb8fd363486892412,051f2af999f44b6b11f6f54eb8fd363486892412..9e9bf791b72afc69326eb176940f98e72cdfd945
--- 1/src/ipc/StoreMap.h
--- 2/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@@ -9,11 -9,11 +9,11 @@@
  #ifndef SQUID_IPC_STORE_MAP_H
  #define SQUID_IPC_STORE_MAP_H
  
++#include "fs/forward.h"
  #include "ipc/mem/FlexibleArray.h"
  #include "ipc/mem/Pointer.h"
  #include "ipc/ReadWriteLock.h"
  #include "SBuf.h"
--#include "fs/forward.h"
  #include "store_key_md5.h"
  
  namespace Ipc

diff --cc src/tests/stub_CacheDigest.cc
index b8125e117d9eaa7c1c0b3b40152a56af8e4c3506,b8125e117d9eaa7c1c0b3b40152a56af8e4c3506..d808a2c81be024bc73d077476867fb3fe68dd128
--- 1/src/tests/stub_CacheDigest.cc
--- 2/src/tests/stub_CacheDigest.cc
+++ b/src/tests/stub_CacheDigest.cc
@@@ -7,7 -7,7 +7,7 @@@
   */
  
  #include "squid.h"
--#include "store_key_md5.h" /* for cache_key */
++#include "store_key_md5.h"
  
  #define STUB_API "CacheDigest.cc"
  #include "tests/STUB.h"

diff --cc src/typedefs.h
index 7c0a193c980db4c6db9a36e48d317e18a1ef934d,7c0a193c980db4c6db9a36e48d317e18a1ef934d..16d5efd312a8bb85bb84a0c0c7ed1eab081c0a11
--- 1/src/typedefs.h
--- 2/src/typedefs.h
+++ b/src/typedefs.h
@@@ -9,6 -9,6 +9,7 @@@
  #ifndef SQUID_TYPEDEFS_H
  #define SQUID_TYPEDEFS_H
  
++#include "anyp/ProtocolType.h"
  #include "enums.h"
  
  /* disk.c / diskd.c callback typedefs */