From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Fri, 25 Oct 2013 00:13:46 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_5_0_1~585
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=602d961295e5c9934af33258ef941f0f21bd052b;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/compat/compat.h b/compat/compat.h
index f9d20a8622..54720192bf 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -76,9 +76,9 @@
 /* components as found to be needed                  */
 /*****************************************************/
 
+#include "compat/assert.h"
 #include "compat/compat_shared.h"
 #include "compat/stdvarargs.h"
-#include "compat/assert.h"
 
 /* cstdio has a bunch of problems with 64-bit definitions */
 #include "compat/stdio.h"
diff --git a/compat/compat_shared.h b/compat/compat_shared.h
index db7439a2db..a24043b310 100644
--- a/compat/compat_shared.h
+++ b/compat/compat_shared.h
@@ -208,10 +208,10 @@ extern "C" {
  * Several function definitions which we provide for security and code safety.
  */
 #include "compat/xalloc.h"
+#include "compat/xis.h"
 #include "compat/xstrerror.h"
 #include "compat/xstring.h"
 #include "compat/xstrto.h"
-#include "compat/xis.h"
 
 /*
  * strtoll() is needed. Squid provides a portable definition.
diff --git a/compat/getnameinfo.c b/compat/getnameinfo.c
index aa8716c607..cfa5433f63 100644
--- a/compat/getnameinfo.c
+++ b/compat/getnameinfo.c
@@ -75,8 +75,8 @@
 
 #if !HAVE_GETNAMEINFO
 
-#include "compat/inet_ntop.h"
 #include "compat/getaddrinfo.h"
+#include "compat/inet_ntop.h"
 
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/helpers/basic_auth/MSNT/allowusers.cc b/helpers/basic_auth/MSNT/allowusers.cc
index ff417e8839..32f09a4ca8 100644
--- a/helpers/basic_auth/MSNT/allowusers.cc
+++ b/helpers/basic_auth/MSNT/allowusers.cc
@@ -15,8 +15,8 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <string.h>
-#include "usersfile.h"
 #include "msntauth.h"
+#include "usersfile.h"
 
 static usersfile AllowUsers;
 static int init = 0;
diff --git a/helpers/basic_auth/MSNT/denyusers.cc b/helpers/basic_auth/MSNT/denyusers.cc
index ddc995b442..c1d7cc00a7 100644
--- a/helpers/basic_auth/MSNT/denyusers.cc
+++ b/helpers/basic_auth/MSNT/denyusers.cc
@@ -16,8 +16,8 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <string.h>
-#include "usersfile.h"
 #include "msntauth.h"
+#include "usersfile.h"
 
 static usersfile DenyUsers;
 static int init = 0;
diff --git a/helpers/basic_auth/NCSA/crypt_md5.cc b/helpers/basic_auth/NCSA/crypt_md5.cc
index 1890d4eda5..5390d746f4 100644
--- a/helpers/basic_auth/NCSA/crypt_md5.cc
+++ b/helpers/basic_auth/NCSA/crypt_md5.cc
@@ -23,8 +23,8 @@
 #include <stdio.h>
 #endif
 
-#include "md5.h"
 #include "crypt_md5.h"
+#include "md5.h"
 
 static unsigned char itoa64[] =	/* 0 ... 63 => ascii - 64 */
     "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.cc b/helpers/basic_auth/RADIUS/basic_radius_auth.cc
index 0672a1e644..4b8f7dac4e 100644
--- a/helpers/basic_auth/RADIUS/basic_radius_auth.cc
+++ b/helpers/basic_auth/RADIUS/basic_radius_auth.cc
@@ -48,8 +48,8 @@
 #include "squid.h"
 #include "helpers/defines.h"
 #include "md5.h"
-#include "radius.h"
 #include "radius-util.h"
+#include "radius.h"
 
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/helpers/digest_auth/LDAP/digest_common.h b/helpers/digest_auth/LDAP/digest_common.h
index 039108e76c..8834eabd70 100644
--- a/helpers/digest_auth/LDAP/digest_common.h
+++ b/helpers/digest_auth/LDAP/digest_common.h
@@ -36,9 +36,9 @@
 #include <crypt.h>
 #endif
 
-#include "util.h"
 #include "hash.h"
 #include "rfc2617.h"
+#include "util.h"
 
 typedef struct _request_data {
     char *user;
diff --git a/helpers/digest_auth/eDirectory/digest_common.h b/helpers/digest_auth/eDirectory/digest_common.h
index 6f1bb672e1..02ac4225c5 100644
--- a/helpers/digest_auth/eDirectory/digest_common.h
+++ b/helpers/digest_auth/eDirectory/digest_common.h
@@ -39,9 +39,9 @@
 #include <crypt.h>
 #endif
 
-#include "util.h"
 #include "hash.h"
 #include "rfc2617.h"
+#include "util.h"
 
 typedef struct _request_data {
     char *user;
diff --git a/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc b/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
index 8867366de4..08bdb97d44 100644
--- a/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
+++ b/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
@@ -31,8 +31,8 @@
  */
 #include "squid.h"
 #include "helpers/defines.h"
-#include "util.h"
 #include "rfc1738.h"
+#include "util.h"
 
 #ifdef HAVE_LDAP
 
diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos.h b/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
index 49ead4ed4c..0743d81ece 100644
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
@@ -43,8 +43,8 @@
 #include <time.h>
 #endif
 
-#include "util.h"
 #include "base64.h"
+#include "util.h"
 
 #if HAVE_KRB5_H
 #if HAVE_BROKEN_SOLARIS_KRB5_H
diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
index 7668ac0aba..511e862458 100644
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
@@ -30,9 +30,9 @@
  * Hosted at http://sourceforge.net/projects/squidkerbauth
  */
 #include "squid.h"
-#include "rfc1738.h"
 #include "compat/getaddrinfo.h"
 #include "compat/getnameinfo.h"
+#include "rfc1738.h"
 
 #if HAVE_GSSAPI
 
diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc
index 27901ef5fc..29382a9cd5 100644
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc
@@ -28,9 +28,9 @@
  */
 
 #include "squid.h"
-#include "rfc1738.h"
 #include "compat/getaddrinfo.h"
 #include "compat/getnameinfo.h"
+#include "rfc1738.h"
 
 #include "negotiate_kerberos.h"
 
diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index c1544cf016..ffdea6759d 100644
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -10,8 +10,8 @@ typedef int64_t snint;
 #endif
 
 #include "snmp.h"
-#include "snmp_impl.h"
 #include "snmp_api.h"
+#include "snmp_impl.h"
 
 /* MIB definitions
  * SQUID-MIB
diff --git a/include/snmp.h b/include/snmp.h
index d79738bbfd..e042315618 100644
--- a/include/snmp.h
+++ b/include/snmp.h
@@ -43,20 +43,20 @@
 #include "snmp_session.h"
 
 /* The various modules */
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
 #include "snmp_msg.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 /* Other functions */
+#include "snmp_api_error.h"
 #include "snmp_coexist.h"
-#include "version.h"
 #include "snmp_error.h"
-#include "snmp_api_error.h"
+#include "version.h"
 /* Other stuff I didn't touch */
-#include "snmp_impl.h"
-#include "snmp_api.h"
-#include "snmp-internal.h"
 #include "parse.h"
+#include "snmp-internal.h"
+#include "snmp_api.h"
 #include "snmp_debug.h"
+#include "snmp_impl.h"
 
 #endif /* SQUID_SNMP_H */
diff --git a/lib/libTrie/Trie.cc b/lib/libTrie/Trie.cc
index f5e3f399d5..32e39afa6c 100644
--- a/lib/libTrie/Trie.cc
+++ b/lib/libTrie/Trie.cc
@@ -22,8 +22,8 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "TrieNode.h"
 #include "TrieCharTransform.h"
+#include "TrieNode.h"
 
 #if !_USE_INLINE_
 #include "Trie.cci"
diff --git a/lib/libTrie/TrieNode.cc b/lib/libTrie/TrieNode.cc
index 60fbf54cf7..a641444697 100644
--- a/lib/libTrie/TrieNode.cc
+++ b/lib/libTrie/TrieNode.cc
@@ -18,8 +18,8 @@
  */
 
 #include "squid.h"
-#include "TrieNode.h"
 #include "TrieCharTransform.h"
+#include "TrieNode.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/libTrie/TrieNode.cci b/lib/libTrie/TrieNode.cci
index c5f36e46bb..882914eab3 100644
--- a/lib/libTrie/TrieNode.cci
+++ b/lib/libTrie/TrieNode.cci
@@ -18,8 +18,8 @@
  */
 
 #ifdef __cplusplus
-#include "TrieNode.h"
 #include "TrieCharTransform.h"
+#include "TrieNode.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/rfc2617.c b/lib/rfc2617.c
index 06108bd9e4..c586c23430 100644
--- a/lib/rfc2617.c
+++ b/lib/rfc2617.c
@@ -45,8 +45,8 @@
 
 #include "squid.h"
 #include <string.h>
-#include "rfc2617.h"
 #include "md5.h"
+#include "rfc2617.h"
 
 void
 CvtHex(const HASH Bin, HASHHEX Hex)
diff --git a/lib/rfc2671.c b/lib/rfc2671.c
index b53a238e3a..06af87b4b7 100644
--- a/lib/rfc2671.c
+++ b/lib/rfc2671.c
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "rfc2671.h"
 #include "rfc1035.h"
+#include "rfc2671.h"
 
 int
 rfc2671RROptPack(char *buf, size_t sz, ssize_t edns_sz)
diff --git a/lib/rfc3596.c b/lib/rfc3596.c
index b3d39e028d..7d4a2a2226 100644
--- a/lib/rfc3596.c
+++ b/lib/rfc3596.c
@@ -76,8 +76,8 @@
 #include <strings.h>
 #endif
 
-#include "rfc3596.h"
 #include "rfc2671.h"
+#include "rfc3596.h"
 
 #ifndef SQUID_RFC1035_H
 #error RFC3596 Library depends on RFC1035
diff --git a/lib/smblib/bad-chain.c b/lib/smblib/bad-chain.c
index 4b7b237a2a..096db45381 100644
--- a/lib/smblib/bad-chain.c
+++ b/lib/smblib/bad-chain.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #include <signal.h>
 #if HAVE_STRING_H
diff --git a/lib/smblib/exper.c b/lib/smblib/exper.c
index a67de30a28..0ce10b67d1 100644
--- a/lib/smblib/exper.c
+++ b/lib/smblib/exper.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #include <signal.h>
 #if HAVE_STRING_H
diff --git a/lib/smblib/file.c b/lib/smblib/file.c
index 47abdca383..afd7cf3401 100644
--- a/lib/smblib/file.c
+++ b/lib/smblib/file.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #if HAVE_STRING_H
 #include <string.h>
diff --git a/lib/smblib/smblib-api.c b/lib/smblib/smblib-api.c
index 2496d867b4..ea628ab749 100644
--- a/lib/smblib/smblib-api.c
+++ b/lib/smblib/smblib-api.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #if HAVE_STRING_H
 #include <string.h>
diff --git a/lib/smblib/smblib-priv.h b/lib/smblib/smblib-priv.h
index 5640da5efb..ebb261fa13 100644
--- a/lib/smblib/smblib-priv.h
+++ b/lib/smblib/smblib-priv.h
@@ -26,8 +26,8 @@
 #ifndef _SMBLIB_PRIV_H_
 #define _SMBLIB_PRIV_H_
 
-#include "smblib/std-defines.h"
 #include "smblib/smblib-common.h"
+#include "smblib/std-defines.h"
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/lib/smblib/smblib-util.c b/lib/smblib/smblib-util.c
index 893ab7d77c..ee05a00671 100644
--- a/lib/smblib/smblib-util.c
+++ b/lib/smblib/smblib-util.c
@@ -25,9 +25,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib.h"
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
+#include "smblib/smblib.h"
 
 #if HAVE_STRING_H
 #include <string.h>
diff --git a/lib/smblib/smblib.c b/lib/smblib/smblib.c
index 7eade4fc6c..3a2fd54158 100644
--- a/lib/smblib/smblib.c
+++ b/lib/smblib/smblib.c
@@ -29,9 +29,9 @@ int SMBlib_errno;
 int SMBlib_SMB_Error;
 #define SMBLIB_ERRNO
 
-#include "smblib/smblib.h"
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
+#include "smblib/smblib.h"
 
 #include <signal.h>
 #if HAVE_STRING_H
diff --git a/lib/smblib/smblib.h b/lib/smblib/smblib.h
index aa501f4230..4e6ae00300 100644
--- a/lib/smblib/smblib.h
+++ b/lib/smblib/smblib.h
@@ -26,9 +26,9 @@
 #ifndef _SMBLIB_SMBLIB_H
 #define _SMBLIB_SMBLIB_H
 
-#include "std-defines.h"
 #include "smblib-common.h"
 #include "smblib/smbencrypt.h"
+#include "std-defines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/snmplib/coexistance.c b/snmplib/coexistance.c
index dc97168b51..dd8e209b60 100644
--- a/snmplib/coexistance.c
+++ b/snmplib/coexistance.c
@@ -76,12 +76,12 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
-#include "snmp_error.h"
+#include "snmp.h"
 #include "snmp_api_error.h"
+#include "snmp_error.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 #include "util.h"
 
diff --git a/snmplib/mib.c b/snmplib/mib.c
index 22dbe1da4f..707f307f7a 100644
--- a/snmplib/mib.c
+++ b/snmplib/mib.c
@@ -74,12 +74,12 @@ SOFTWARE.
 #include "asn1.h"
 #include "snmp.h"
 
+#include "parse.h"
+#include "snmp_api.h"
+#include "snmp_impl.h"
 #include "snmp_pdu.h"
-#include "snmp_vars.h"
 #include "snmp_session.h"
-#include "snmp_impl.h"
-#include "snmp_api.h"
-#include "parse.h"
+#include "snmp_vars.h"
 
 #include "util.h"
 
diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
index e587a51614..ba6703d0f7 100644
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
@@ -76,12 +76,12 @@
 #include "snmp.h"
 
 #include "snmp-internal.h"
+#include "snmp_error.h"
 #include "snmp_impl.h"
+#include "snmp_msg.h"
+#include "snmp_pdu.h"
 #include "snmp_session.h"
-#include "snmp_error.h"
 #include "snmp_vars.h"
-#include "snmp_pdu.h"
-#include "snmp_msg.h"
 
 #include "snmp_api.h"
 #include "snmp_api_error.h"
diff --git a/snmplib/snmp_msg.c b/snmplib/snmp_msg.c
index 623c81090f..985ad43b01 100644
--- a/snmplib/snmp_msg.c
+++ b/snmplib/snmp_msg.c
@@ -82,11 +82,11 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
+#include "snmp.h"
 #include "snmp_msg.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 /*
  * RFC 1901: Introduction to Community-based SNMPv2
diff --git a/snmplib/snmp_pdu.c b/snmplib/snmp_pdu.c
index d5b4d4fdff..44a4d25715 100644
--- a/snmplib/snmp_pdu.c
+++ b/snmplib/snmp_pdu.c
@@ -82,13 +82,13 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
+#include "snmp.h"
+#include "snmp_api_error.h"
 #include "snmp_error.h"
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
 #include "snmp_msg.h"
-#include "snmp_api_error.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 #include "util.h"
 
diff --git a/snmplib/snmp_vars.c b/snmplib/snmp_vars.c
index 0ace96c1ed..a05f14d373 100644
--- a/snmplib/snmp_vars.c
+++ b/snmplib/snmp_vars.c
@@ -81,15 +81,15 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
+#include "snmp.h"
 #include "snmp_vars.h"
 #if 0
 #include "mibii.h"
 #endif
 #include "snmp_api_error.h"
-#include "snmp_pdu.h"
 #include "snmp_msg.h"
+#include "snmp_pdu.h"
 
 #include "util.h"
 
diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 698a41c5b0..b3c4908ae3 100644
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -33,10 +33,10 @@
 #include "anyp/PortCfg.h"
 #include "base/RefCount.h"
 #include "comm/Connection.h"
-#include "HttpHeader.h"
+#include "HierarchyLogEntry.h"
 #include "http/ProtocolVersion.h"
+#include "HttpHeader.h"
 #include "HttpRequestMethod.h"
-#include "HierarchyLogEntry.h"
 #include "icp_opcode.h"
 #include "ip/Address.h"
 #include "LogTags.h"
diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index cd7387497c..e44bdc6cd0 100644
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -24,8 +24,8 @@
 #endif
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
-#include "acl/HierCodeData.h"
 #include "acl/HierCode.h"
+#include "acl/HierCodeData.h"
 #include "acl/HttpHeaderData.h"
 #include "acl/HttpRepHeader.h"
 #include "acl/HttpReqHeader.h"
@@ -35,14 +35,14 @@
 #include "acl/LocalIp.h"
 #include "acl/LocalPort.h"
 #include "acl/MaxConnection.h"
-#include "acl/MethodData.h"
 #include "acl/Method.h"
+#include "acl/MethodData.h"
 #include "acl/MyPortName.h"
 #include "acl/Note.h"
 #include "acl/NoteData.h"
 #include "acl/PeerName.h"
-#include "acl/ProtocolData.h"
 #include "acl/Protocol.h"
+#include "acl/ProtocolData.h"
 #include "acl/Random.h"
 #include "acl/Referer.h"
 #include "acl/RegexData.h"
@@ -54,10 +54,10 @@
 #include "acl/SourceDomain.h"
 #include "acl/SourceIp.h"
 #if USE_SSL
-#include "acl/SslErrorData.h"
-#include "acl/SslError.h"
-#include "acl/CertificateData.h"
 #include "acl/Certificate.h"
+#include "acl/CertificateData.h"
+#include "acl/SslError.h"
+#include "acl/SslErrorData.h"
 #endif
 #include "acl/Strategised.h"
 #include "acl/Strategy.h"
@@ -66,16 +66,16 @@
 #include "acl/ServerCertificate.h"
 #endif
 #include "acl/Tag.h"
-#include "acl/TimeData.h"
 #include "acl/Time.h"
+#include "acl/TimeData.h"
 #include "acl/Url.h"
 #include "acl/UrlLogin.h"
 #include "acl/UrlPath.h"
 #include "acl/UrlPort.h"
 #include "acl/UserData.h"
 #if USE_AUTH
-#include "auth/AclProxyAuth.h"
 #include "auth/AclMaxUserIp.h"
+#include "auth/AclProxyAuth.h"
 #endif
 #if USE_IDENT
 #include "ident/AclIdent.h"
diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index 2894c0643f..4018205432 100644
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_BODY_PIPE_H
 #define SQUID_BODY_PIPE_H
 
-#include "MemBuf.h"
 #include "base/AsyncJob.h"
 #include "base/CbcPointer.h"
+#include "MemBuf.h"
 
 class BodyPipe;
 
diff --git a/src/ChunkedCodingParser.cc b/src/ChunkedCodingParser.cc
index db8c5f375c..f9ab4ab92d 100644
--- a/src/ChunkedCodingParser.cc
+++ b/src/ChunkedCodingParser.cc
@@ -1,9 +1,9 @@
 #include "squid.h"
 #include "base/TextException.h"
-#include "Debug.h"
-#include "Parsing.h"
 #include "ChunkedCodingParser.h"
+#include "Debug.h"
 #include "MemBuf.h"
+#include "Parsing.h"
 
 ChunkedCodingParser::Step ChunkedCodingParser::psChunkSize = &ChunkedCodingParser::parseChunkSize;
 ChunkedCodingParser::Step ChunkedCodingParser::psUnusedChunkExtension = &ChunkedCodingParser::parseUnusedChunkExtension;
diff --git a/src/ClientInfo.h b/src/ClientInfo.h
index 3108e2cf76..07f7e90220 100644
--- a/src/ClientInfo.h
+++ b/src/ClientInfo.h
@@ -1,12 +1,12 @@
 #ifndef SQUID__SRC_CLIENTINFO_H
 #define SQUID__SRC_CLIENTINFO_H
 
-#include "ip/Address.h"
+#include "cbdata.h"
+#include "enums.h"
 #include "hash.h"
+#include "ip/Address.h"
 #include "LogTags.h"
-#include "enums.h"
 #include "typedefs.h"
-#include "cbdata.h"
 #include <deque>
 
 #if USE_DELAY_POOLS
diff --git a/src/CommCalls.h b/src/CommCalls.h
index 5003e78faa..9ec9f4ff66 100644
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -3,8 +3,8 @@
 
 #include "base/AsyncCall.h"
 #include "base/AsyncJobCalls.h"
-#include "comm_err_t.h"
 #include "comm/forward.h"
+#include "comm_err_t.h"
 #include "MasterXaction.h"
 
 /* CommCalls implement AsyncCall interface for comm_* callbacks.
diff --git a/src/CommRead.h b/src/CommRead.h
index 7a6cd8701d..210d739197 100644
--- a/src/CommRead.h
+++ b/src/CommRead.h
@@ -34,10 +34,10 @@
 #ifndef COMMREAD_H
 #define COMMREAD_H
 
+#include "CbDataList.h"
 #include "comm.h"
-#include "CommCalls.h"
 #include "comm/forward.h"
-#include "CbDataList.h"
+#include "CommCalls.h"
 
 class CommRead
 {
diff --git a/src/CommonPool.h b/src/CommonPool.h
index af04d37012..19ff567823 100644
--- a/src/CommonPool.h
+++ b/src/CommonPool.h
@@ -37,8 +37,8 @@
 #define COMMONPOOL_H
 
 #if USE_DELAY_POOLS
-#include "SquidString.h"
 #include "CompositePoolNode.h"
+#include "SquidString.h"
 
 /*
  \ingroup DelayPoolsAPI
diff --git a/src/DelayPool.cc b/src/DelayPool.cc
index e064b960bb..af6fafcc93 100644
--- a/src/DelayPool.cc
+++ b/src/DelayPool.cc
@@ -37,10 +37,10 @@
 #include "squid.h"
 
 #if USE_DELAY_POOLS
-#include "DelayPool.h"
-#include "CommonPool.h"
 #include "acl/Acl.h"
 #include "acl/Gadgets.h"
+#include "CommonPool.h"
+#include "DelayPool.h"
 #include "Store.h"
 
 DelayPool::DelayPool() : pool (NULL), access (NULL)
diff --git a/src/DelayPool.h b/src/DelayPool.h
index 36e1fc04bb..8b95b0d194 100644
--- a/src/DelayPool.h
+++ b/src/DelayPool.h
@@ -38,8 +38,8 @@
 #define DELAYPOOL_H
 
 #if USE_DELAY_POOLS
-#include "CompositePoolNode.h"
 #include "acl/forward.h"
+#include "CompositePoolNode.h"
 
 class StoreEntry;
 
diff --git a/src/DelayTagged.h b/src/DelayTagged.h
index 342506c289..61b6e4c620 100644
--- a/src/DelayTagged.h
+++ b/src/DelayTagged.h
@@ -37,11 +37,11 @@
 #if USE_DELAY_POOLS
 
 #include "auth/Gadgets.h"
+#include "base/Vector.h"
 #include "CompositePoolNode.h"
-#include "DelayIdComposite.h"
 #include "DelayBucket.h"
+#include "DelayIdComposite.h"
 #include "DelaySpec.h"
-#include "base/Vector.h"
 #include "splay.h"
 
 /// \ingroup DelayPoolsAPI
diff --git a/src/DelayUser.h b/src/DelayUser.h
index 885cbbd198..6ac274791c 100644
--- a/src/DelayUser.h
+++ b/src/DelayUser.h
@@ -38,11 +38,11 @@
 
 #include "auth/Gadgets.h"
 #include "auth/User.h"
+#include "base/Vector.h"
 #include "CompositePoolNode.h"
-#include "DelayIdComposite.h"
 #include "DelayBucket.h"
+#include "DelayIdComposite.h"
 #include "DelaySpec.h"
-#include "base/Vector.h"
 #include "splay.h"
 
 /// \ingroup DelayPoolsAPI
diff --git a/src/DescriptorSet.cc b/src/DescriptorSet.cc
index 05ca6232a4..67c5e51aa4 100644
--- a/src/DescriptorSet.cc
+++ b/src/DescriptorSet.cc
@@ -2,8 +2,8 @@
  * DEBUG: section 05    Comm
  */
 #include "squid.h"
-#include "globals.h" /* for Squid_MaxFD */
 #include "DescriptorSet.h"
+#include "globals.h" /* for Squid_MaxFD */
 
 // pre-allocates descriptor store and index for Squid_MaxFD descriptors
 DescriptorSet::DescriptorSet(): descriptors_(NULL), index_(NULL),
diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc
index 7a4b9df4ab..b16e4dc010 100644
--- a/src/DiskIO/AIO/AIODiskFile.cc
+++ b/src/DiskIO/AIO/AIODiskFile.cc
@@ -47,10 +47,10 @@
 #include "squid.h"
 #include "AIODiskFile.h"
 #include "AIODiskIOStrategy.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
 #include "globals.h"
 
 #if HAVE_ERRNO_H
diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h
index 15e052c177..4153645b92 100644
--- a/src/DiskIO/AIO/AIODiskFile.h
+++ b/src/DiskIO/AIO/AIODiskFile.h
@@ -33,9 +33,9 @@
 
 #if USE_DISKIO_AIO
 
-#include "DiskIO/DiskFile.h"
 #include "async_io.h"
 #include "cbdata.h"
+#include "DiskIO/DiskFile.h"
 #include "SquidString.h"
 
 class AIODiskIOStrategy;
diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.cc b/src/DiskIO/AIO/AIODiskIOStrategy.cc
index 4f2b9ab667..21c4685c22 100644
--- a/src/DiskIO/AIO/AIODiskIOStrategy.cc
+++ b/src/DiskIO/AIO/AIODiskIOStrategy.cc
@@ -41,8 +41,8 @@
  */
 
 #include "squid.h"
-#include "AIODiskIOStrategy.h"
 #include "AIODiskFile.h"
+#include "AIODiskIOStrategy.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.h b/src/DiskIO/AIO/AIODiskIOStrategy.h
index e43717876e..9bace9b294 100644
--- a/src/DiskIO/AIO/AIODiskIOStrategy.h
+++ b/src/DiskIO/AIO/AIODiskIOStrategy.h
@@ -33,8 +33,8 @@
 
 #if USE_DISKIO_AIO
 
-#include "DiskIO/DiskIOStrategy.h"
 #include "async_io.h"
+#include "DiskIO/DiskIOStrategy.h"
 
 class AIODiskIOStrategy : public DiskIOStrategy
 {
diff --git a/src/DiskIO/AIO/aio_win32.cc b/src/DiskIO/AIO/aio_win32.cc
index a7504a28c4..606d2473da 100644
--- a/src/DiskIO/AIO/aio_win32.cc
+++ b/src/DiskIO/AIO/aio_win32.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "DiskIO/AIO/aio_win32.h"
 #include "comm.h"
+#include "DiskIO/AIO/aio_win32.h"
 #include "fd.h"
 #include "StatCounters.h"
 #include "win32.h"
diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index d44dde48f1..06ef4231e5 100644
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -34,11 +34,11 @@
 #include "BlockingFile.h"
 #include "Debug.h"
 #include "defines.h"
-#include "globals.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
+#include "globals.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>
diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.cc b/src/DiskIO/Blocking/BlockingIOStrategy.cc
index 8bffd4f117..eaa52e4634 100644
--- a/src/DiskIO/Blocking/BlockingIOStrategy.cc
+++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "BlockingIOStrategy.h"
 #include "BlockingFile.h"
+#include "BlockingIOStrategy.h"
 #include "unlinkd.h"
 
 bool
diff --git a/src/DiskIO/DiskDaemon/DiskdAction.h b/src/DiskIO/DiskDaemon/DiskdAction.h
index 6da6fd0c04..8ca6230b03 100644
--- a/src/DiskIO/DiskDaemon/DiskdAction.h
+++ b/src/DiskIO/DiskDaemon/DiskdAction.h
@@ -7,8 +7,8 @@
 #define SQUID_DISKD_ACTION_H
 
 #include "ipc/forward.h"
-#include "mgr/forward.h"
 #include "mgr/Action.h"
+#include "mgr/forward.h"
 
 /// store disk daemon stats
 class DiskdActionData
diff --git a/src/DiskIO/DiskDaemon/DiskdFile.cc b/src/DiskIO/DiskDaemon/DiskdFile.cc
index 4120b37e98..b3e5e57bad 100644
--- a/src/DiskIO/DiskDaemon/DiskdFile.cc
+++ b/src/DiskIO/DiskDaemon/DiskdFile.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "DiskdFile.h"
 #include "ConfigOption.h"
 #include "diomsg.h"
+#include "DiskdFile.h"
 #include "DiskdIOStrategy.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
index 4ef7543e8b..cb1a482a25 100644
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
@@ -34,16 +34,16 @@
 #include "squid.h"
 #include "comm/Loops.h"
 #include "ConfigOption.h"
+#include "diomsg.h"
+#include "DiskdFile.h"
 #include "DiskdIOStrategy.h"
 #include "DiskIO/DiskFile.h"
-#include "DiskdFile.h"
-#include "diomsg.h"
 #include "fd.h"
-#include "Store.h"
-#include "StatCounters.h"
 #include "SquidConfig.h"
 #include "SquidIpc.h"
 #include "SquidTime.h"
+#include "StatCounters.h"
+#include "Store.h"
 #include "unlinkd.h"
 
 #if HAVE_SYS_IPC_H
diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
index bc16d41518..660391a970 100644
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
@@ -33,10 +33,10 @@
 
 #include "squid.h"
 #include "disk.h"
-#include "DiskThreadsDiskFile.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
+#include "DiskThreadsDiskFile.h"
 #include "fd.h"
 #include "Generic.h"
 #include "globals.h"
diff --git a/src/DiskIO/DiskThreads/async_io.cc b/src/DiskIO/DiskThreads/async_io.cc
index c436e701dd..60e17a1db3 100644
--- a/src/DiskIO/DiskThreads/async_io.cc
+++ b/src/DiskIO/DiskThreads/async_io.cc
@@ -34,10 +34,10 @@
 
 #include "squid.h"
 #include "DiskThreads.h"
-#include "Store.h"
-#include "fde.h"
 #include "DiskThreadsIOStrategy.h"
+#include "fde.h"
 #include "Generic.h"
+#include "Store.h"
 
 AIOCounts squidaio_counts;
 
diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc
index dba711984e..bdee5a3865 100644
--- a/src/DiskIO/IpcIo/IpcIoFile.cc
+++ b/src/DiskIO/IpcIo/IpcIoFile.cc
@@ -5,11 +5,11 @@
 #include "squid.h"
 #include "base/RunnersRegistry.h"
 #include "base/TextException.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/IpcIo/IpcIoFile.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
 #include "fd.h"
 #include "globals.h"
 #include "ipc/mem/Pages.h"
diff --git a/src/DiskIO/IpcIo/IpcIoFile.h b/src/DiskIO/IpcIo/IpcIoFile.h
index 3d1409ad2b..ed84869c2d 100644
--- a/src/DiskIO/IpcIo/IpcIoFile.h
+++ b/src/DiskIO/IpcIo/IpcIoFile.h
@@ -5,9 +5,9 @@
 #include "cbdata.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskIO/IORequestor.h"
-#include "SquidString.h"
 #include "ipc/forward.h"
 #include "ipc/mem/Page.h"
+#include "SquidString.h"
 #include <list>
 #include <map>
 #include <memory>
diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc
index 314c934bda..2c06746370 100644
--- a/src/DiskIO/Mmapped/MmappedFile.cc
+++ b/src/DiskIO/Mmapped/MmappedFile.cc
@@ -4,11 +4,11 @@
 
 #include "squid.h"
 #include "Debug.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/Mmapped/MmappedFile.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
 #include "globals.h"
 
 #if HAVE_SYS_MMAN_H
diff --git a/src/EventLoop.cc b/src/EventLoop.cc
index 247ada8e23..b74d6ef90f 100644
--- a/src/EventLoop.cc
+++ b/src/EventLoop.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "AsyncEngine.h"
+#include "base/AsyncCallQueue.h"
 #include "Debug.h"
 #include "EventLoop.h"
-#include "base/AsyncCallQueue.h"
 #include "SquidTime.h"
 
 EventLoop::EventLoop() : errcount(0), last_loop(false), timeService(NULL),
diff --git a/src/FadingCounter.cc b/src/FadingCounter.cc
index b5087bbac0..1dd0576fd3 100644
--- a/src/FadingCounter.cc
+++ b/src/FadingCounter.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "base/TextException.h"
-#include "SquidTime.h"
 #include "FadingCounter.h"
+#include "SquidTime.h"
 
 #if HAVE_MATH_H
 #include <math.h>
diff --git a/src/FwdState.cc b/src/FwdState.cc
index 2936ad20ff..2e3f1d56b4 100644
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -36,8 +36,8 @@
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
 #include "anyp/PortCfg.h"
-#include "CachePeer.h"
 #include "CacheManager.h"
+#include "CachePeer.h"
 #include "client_side.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
@@ -74,10 +74,10 @@
 #if USE_SSL
 #include "ssl/cert_validate_message.h"
 #include "ssl/Config.h"
-#include "ssl/helper.h"
-#include "ssl/support.h"
 #include "ssl/ErrorDetail.h"
+#include "ssl/helper.h"
 #include "ssl/ServerBump.h"
+#include "ssl/support.h"
 #endif
 #if HAVE_ERRNO_H
 #include <errno.h>
diff --git a/src/FwdState.h b/src/FwdState.h
index a1b70f2a2c..5472b5164b 100644
--- a/src/FwdState.h
+++ b/src/FwdState.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_FORWARD_H
 #define SQUID_FORWARD_H
 
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "err_type.h"
diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc
index ba46f04111..f8359f84f4 100644
--- a/src/HelperChildConfig.cc
+++ b/src/HelperChildConfig.cc
@@ -2,8 +2,8 @@
 #include "cache_cf.h"
 #include "ConfigParser.h"
 #include "Debug.h"
-#include "HelperChildConfig.h"
 #include "globals.h"
+#include "HelperChildConfig.h"
 #include "Parsing.h"
 
 #include <string.h>
diff --git a/src/HelperReply.cc b/src/HelperReply.cc
index 433a9e0b69..80857e5394 100644
--- a/src/HelperReply.cc
+++ b/src/HelperReply.cc
@@ -4,11 +4,11 @@
  */
 #include "squid.h"
 #include "ConfigParser.h"
-#include "HelperReply.h"
+#include "Debug.h"
 #include "helper.h"
+#include "HelperReply.h"
 #include "rfc1738.h"
 #include "SquidString.h"
-#include "Debug.h"
 
 HelperReply::HelperReply(char *buf, size_t len) :
         result(HelperReply::Unknown),
diff --git a/src/HierarchyLogEntry.h b/src/HierarchyLogEntry.h
index de2614ee3b..921eb07c5f 100644
--- a/src/HierarchyLogEntry.h
+++ b/src/HierarchyLogEntry.h
@@ -37,8 +37,8 @@
 #include "hier_code.h"
 #include "http/StatusCode.h"
 #include "lookup_t.h"
-#include "rfc2181.h"
 #include "PingData.h"
+#include "rfc2181.h"
 
 class HierarchyLogEntry
 {
diff --git a/src/HttpControlMsg.h b/src/HttpControlMsg.h
index 667329446c..fb3fa8e600 100644
--- a/src/HttpControlMsg.h
+++ b/src/HttpControlMsg.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_HTTP_CONTROL_MSG_H
 #define SQUID_HTTP_CONTROL_MSG_H
 
-#include "HttpReply.h"
 #include "base/AsyncCall.h"
+#include "HttpReply.h"
 
 class HttpControlMsg;
 
diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index 9b2afe5a01..a2de7e2618 100644
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -32,11 +32,11 @@
 
 #include "squid.h"
 #include "base/StringArea.h"
+#include "HttpHdrCc.h"
 #include "HttpHeader.h"
 #include "HttpHeaderFieldStat.h"
 #include "HttpHeaderStat.h"
 #include "HttpHeaderTools.h"
-#include "HttpHdrCc.h"
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"
diff --git a/src/HttpHdrCc.cci b/src/HttpHdrCc.cci
index 4256a8bfbb..d50068390e 100644
--- a/src/HttpHdrCc.cci
+++ b/src/HttpHdrCc.cci
@@ -30,8 +30,8 @@
  *
  */
 
-#include "defines.h"
 #include "Debug.h"
+#include "defines.h"
 
 bool
 HttpHdrCc::isSet(http_hdr_cc_type id) const
diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index a47fdae4a2..bea0c7a42c 100644
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -32,11 +32,11 @@
  */
 
 #include "squid.h"
-#include "Store.h"
-#include "HttpHeaderRange.h"
 #include "client_side_request.h"
-#include "HttpReply.h"
+#include "HttpHeaderRange.h"
 #include "HttpHeaderTools.h"
+#include "HttpReply.h"
+#include "Store.h"
 #include "StrList.h"
 
 /*
diff --git a/src/HttpHdrScTarget.h b/src/HttpHdrScTarget.h
index 25e583d665..36b3fafafa 100644
--- a/src/HttpHdrScTarget.h
+++ b/src/HttpHdrScTarget.h
@@ -30,9 +30,9 @@
 #ifndef SQUID_HTTPHDRSURROGATECONTROLTARGET_H
 #define SQUID_HTTPHDRSURROGATECONTROLTARGET_H
 
-#include "MemPool.h"
 #include "defines.h"
 #include "dlink.h"
+#include "MemPool.h"
 #include "SquidString.h"
 #include "typedefs.h"
 
diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 60aeb26472..6561001e01 100644
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -43,11 +43,11 @@
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"
 #include "rfc1123.h"
+#include "SquidConfig.h"
+#include "SquidString.h"
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"
-#include "SquidConfig.h"
-#include "SquidString.h"
 #include "TimeOrTag.h"
 
 /*
diff --git a/src/HttpHeaderFieldInfo.h b/src/HttpHeaderFieldInfo.h
index 1b19007990..f5a37a7488 100644
--- a/src/HttpHeaderFieldInfo.h
+++ b/src/HttpHeaderFieldInfo.h
@@ -29,8 +29,8 @@
  *
  */
 
-#include "SquidString.h"
 #include "HttpHeaderFieldStat.h"
+#include "SquidString.h"
 
 /// compiled version of HttpHeaderFieldAttrs plus stats. Currently a POD.
 class HttpHeaderFieldInfo
diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 588f1c6902..6a16f03b26 100644
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -31,15 +31,15 @@
  */
 
 #include "squid.h"
-#include "globals.h"
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "comm/Connection.h"
 #include "compat/strtoll.h"
 #include "ConfigParser.h"
 #include "fde.h"
+#include "globals.h"
 #include "HttpHdrContRange.h"
 #include "HttpHeader.h"
 #include "HttpHeaderFieldInfo.h"
diff --git a/src/HttpMsg.h b/src/HttpMsg.h
index 829cd778c1..f20ba6838f 100644
--- a/src/HttpMsg.h
+++ b/src/HttpMsg.h
@@ -33,10 +33,10 @@
 
 #include "base/Lock.h"
 #include "BodyPipe.h"
+#include "http/ProtocolVersion.h"
+#include "http/StatusCode.h"
 #include "HttpHeader.h"
 #include "HttpRequestMethod.h"
-#include "http/StatusCode.h"
-#include "http/ProtocolVersion.h"
 
 /// common parts of HttpRequest and HttpReply
 class HttpMsg : public RefCountable
diff --git a/src/HttpReply.h b/src/HttpReply.h
index c7f3f3e364..93758fc134 100644
--- a/src/HttpReply.h
+++ b/src/HttpReply.h
@@ -30,10 +30,10 @@
 #ifndef SQUID_HTTPREPLY_H
 #define SQUID_HTTPREPLY_H
 
+#include "http/StatusLine.h"
 #include "HttpBody.h"
 #include "HttpMsg.h"
 #include "HttpRequest.h"
-#include "http/StatusLine.h"
 
 void httpReplyInitModule(void);
 
diff --git a/src/ICP.h b/src/ICP.h
index 59629f44e9..32b8a3fc57 100644
--- a/src/ICP.h
+++ b/src/ICP.h
@@ -39,8 +39,8 @@
 #include "comm/forward.h"
 #include "icp_opcode.h"
 #include "ip/Address.h"
-#include "StoreClient.h"
 #include "LogTags.h"
+#include "StoreClient.h"
 
 class HttpRequest;
 
diff --git a/src/LeakFinder.cc b/src/LeakFinder.cc
index 62fad1d209..60eb820b2a 100644
--- a/src/LeakFinder.cc
+++ b/src/LeakFinder.cc
@@ -39,8 +39,8 @@
 #if USE_LEAKFINDER
 
 #include "LeakFinder.h"
-#include "Store.h"
 #include "SquidTime.h"
+#include "Store.h"
 
 /* ========================================================================= */
 
diff --git a/src/Notes.cc b/src/Notes.cc
index b852028f62..b482f4eb20 100644
--- a/src/Notes.cc
+++ b/src/Notes.cc
@@ -28,13 +28,13 @@
  */
 
 #include "squid.h"
-#include "globals.h"
 #include "AccessLogEntry.h"
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
 #include "ConfigParser.h"
-#include "HttpRequest.h"
+#include "globals.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 #include "SquidConfig.h"
 #include "Store.h"
 #include "StrList.h"
diff --git a/src/Notes.h b/src/Notes.h
index 0068bd2332..29bac331ee 100644
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -2,8 +2,8 @@
 #define SQUID_NOTES_H
 
 #include "acl/forward.h"
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 #include "CbDataList.h"
 #include "MemPool.h"
 #include "SquidString.h"
diff --git a/src/Packer.cc b/src/Packer.cc
index 355e2ccdc1..541ef04b11 100644
--- a/src/Packer.cc
+++ b/src/Packer.cc
@@ -68,8 +68,8 @@
  */
 
 #include "squid.h"
-#include "Store.h"
 #include "MemBuf.h"
+#include "Store.h"
 
 /* local types */
 
diff --git a/src/Parsing.cc b/src/Parsing.cc
index 22ea60152a..6f2141a3e5 100644
--- a/src/Parsing.cc
+++ b/src/Parsing.cc
@@ -34,9 +34,9 @@
 #include "cache_cf.h"
 #include "compat/strtoll.h"
 #include "ConfigParser.h"
-#include "Parsing.h"
-#include "globals.h"
 #include "Debug.h"
+#include "globals.h"
+#include "Parsing.h"
 
 /*
  * These functions is the same as atoi/l/f, except that they check for errors
diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h
index 2328279930..84634404a7 100644
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@ -38,8 +38,8 @@
 #include "cbdata.h"
 #include "comm/forward.h"
 #include "hier_code.h"
-#include "PingData.h"
 #include "ip/Address.h"
+#include "PingData.h"
 
 class HttpRequest;
 class StoreEntry;
diff --git a/src/Server.cc b/src/Server.cc
index 39ed4fe0f6..1703cddbab 100644
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -36,9 +36,9 @@
 #include "comm/Connection.h"
 #include "comm/forward.h"
 #include "comm/Write.h"
-#include "fd.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
+#include "fd.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "Server.h"
diff --git a/src/Server.h b/src/Server.h
index c02c54c924..2633e8f8f3 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -32,8 +32,8 @@
 #ifndef SQUID_SERVER_H
 #define SQUID_SERVER_H
 
-#include "BodyPipe.h"
 #include "base/AsyncJob.h"
+#include "BodyPipe.h"
 #include "CommCalls.h"
 #include "FwdState.h"
 #include "StoreIOBuffer.h"
diff --git a/src/Store.cci b/src/Store.cci
index f84e97d993..01add65b16 100644
--- a/src/Store.cci
+++ b/src/Store.cci
@@ -30,8 +30,8 @@
  *
  */
 
-#include "MemObject.h"
 #include "HttpReply.h"
+#include "MemObject.h"
 
 /**
  \retval true	Store contains 0 bytes of data.
diff --git a/src/StoreIOBuffer.h b/src/StoreIOBuffer.h
index 7aa5a6f916..d26bb881fe 100644
--- a/src/StoreIOBuffer.h
+++ b/src/StoreIOBuffer.h
@@ -34,8 +34,8 @@
 #define SQUID_STOREIOBUFFER_H
 
 /* TODO: move this and the range() method into a .cci */
-#include "Range.h"
 #include "MemBuf.h"
+#include "Range.h"
 
 class StoreIOBuffer
 {
diff --git a/src/StoreMeta.cc b/src/StoreMeta.cc
index a31caf95ea..801092f2cf 100644
--- a/src/StoreMeta.cc
+++ b/src/StoreMeta.cc
@@ -32,15 +32,15 @@
  */
 
 #include "squid.h"
-#include "StoreMeta.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMeta.h"
 #include "StoreMetaMD5.h"
-#include "StoreMetaURL.h"
+#include "StoreMetaObjSize.h"
 #include "StoreMetaSTD.h"
 #include "StoreMetaSTDLFS.h"
+#include "StoreMetaURL.h"
 #include "StoreMetaVary.h"
-#include "StoreMetaObjSize.h"
 
 bool
 StoreMeta::validType(char type)
diff --git a/src/StoreMetaObjSize.h b/src/StoreMetaObjSize.h
index dab727f8f5..ad0e7cb446 100644
--- a/src/StoreMetaObjSize.h
+++ b/src/StoreMetaObjSize.h
@@ -30,8 +30,8 @@
 #ifndef SQUID_STOREMETAOBJSIZE_H
 #define SQUID_STOREMETAOBJSIZE_H
 
-#include "StoreMeta.h"
 #include "MemPool.h"
+#include "StoreMeta.h"
 
 class StoreMetaObjSize : public StoreMeta
 {
diff --git a/src/StoreMetaSTD.cc b/src/StoreMetaSTD.cc
index c586cf67bc..b85cd1d489 100644
--- a/src/StoreMetaSTD.cc
+++ b/src/StoreMetaSTD.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaSTD.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaSTD.h"
 
 bool
 StoreMetaSTD::validLength(int len) const
diff --git a/src/StoreMetaSTDLFS.cc b/src/StoreMetaSTDLFS.cc
index a8bec28aa9..7fc6e3c5dc 100644
--- a/src/StoreMetaSTDLFS.cc
+++ b/src/StoreMetaSTDLFS.cc
@@ -31,9 +31,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaSTDLFS.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaSTDLFS.h"
 
 bool
 StoreMetaSTDLFS::validLength(int len) const
diff --git a/src/StoreMetaURL.cc b/src/StoreMetaURL.cc
index 9ad9d292c5..e4302d1c0d 100644
--- a/src/StoreMetaURL.cc
+++ b/src/StoreMetaURL.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaURL.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaURL.h"
 
 bool
 StoreMetaURL::checkConsistency(StoreEntry *e) const
diff --git a/src/StoreMetaUnpacker.cc b/src/StoreMetaUnpacker.cc
index 2fb97f53cd..62a163c495 100644
--- a/src/StoreMetaUnpacker.cc
+++ b/src/StoreMetaUnpacker.cc
@@ -32,10 +32,10 @@
  */
 
 #include "squid.h"
-#include "defines.h"
 #include "Debug.h"
-#include "StoreMetaUnpacker.h"
+#include "defines.h"
 #include "StoreMeta.h"
+#include "StoreMetaUnpacker.h"
 
 int const StoreMetaUnpacker::MinimumBufferLength = sizeof(char) + sizeof(int);
 
diff --git a/src/StoreMetaVary.cc b/src/StoreMetaVary.cc
index 995a1a9679..84380db916 100644
--- a/src/StoreMetaVary.cc
+++ b/src/StoreMetaVary.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaVary.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaVary.h"
 
 bool
 StoreMetaVary::checkConsistency(StoreEntry *e) const
diff --git a/src/StoreStats.cc b/src/StoreStats.cc
index 5c1d062c5f..3998db33ed 100644
--- a/src/StoreStats.cc
+++ b/src/StoreStats.cc
@@ -4,8 +4,8 @@
  */
 
 #include "squid.h"
-#include "tools.h"
 #include "StoreStats.h"
+#include "tools.h"
 
 /* StoreInfoStats */
 
diff --git a/src/acl/AclAddress.h b/src/acl/AclAddress.h
index ead7b36e4c..7e69f644c1 100644
--- a/src/acl/AclAddress.h
+++ b/src/acl/AclAddress.h
@@ -29,8 +29,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
-#include "ip/Address.h"
 #include "acl/Acl.h"
+#include "ip/Address.h"
 
 /// list of address-based ACLs. Currently a POD.
 class AclAddress
diff --git a/src/acl/AllOf.cc b/src/acl/AllOf.cc
index 3e4cc32600..876535602d 100644
--- a/src/acl/AllOf.cc
+++ b/src/acl/AllOf.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "acl/AllOf.h"
-#include "acl/Checklist.h"
 #include "acl/BoolOps.h"
+#include "acl/Checklist.h"
 #include "globals.h"
 #include "MemBuf.h"
 
diff --git a/src/acl/Asn.h b/src/acl/Asn.h
index c49e862229..d6932d7847 100644
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ACLASN_H
 #define SQUID_ACLASN_H
 
+#include "acl/Checklist.h"
 #include "acl/Data.h"
-#include "CbDataList.h"
 #include "acl/Strategised.h"
-#include "acl/Checklist.h"
+#include "CbDataList.h"
 #include "ip/Address.h"
 
 int asnMatchIp(CbDataList<int> *, Ip::Address &);
diff --git a/src/acl/Browser.cc b/src/acl/Browser.cc
index a09b143d0f..36e746d254 100644
--- a/src/acl/Browser.cc
+++ b/src/acl/Browser.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/Checklist.h"
 #include "acl/Browser.h"
+#include "acl/Checklist.h"
 #include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */
diff --git a/src/acl/Certificate.cc b/src/acl/Certificate.cc
index 16b0ca997d..74a27b0616 100644
--- a/src/acl/Certificate.cc
+++ b/src/acl/Certificate.cc
@@ -40,12 +40,12 @@
 #if USE_SSL
 
 #include "acl/Certificate.h"
-#include "acl/Checklist.h"
 #include "acl/CertificateData.h"
-#include "HttpRequest.h"
+#include "acl/Checklist.h"
 #include "client_side.h"
 #include "fde.h"
 #include "globals.h"
+#include "HttpRequest.h"
 
 int
 ACLCertificateStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)
diff --git a/src/acl/Certificate.h b/src/acl/Certificate.h
index b9d0d0da16..308eb92ff3 100644
--- a/src/acl/Certificate.h
+++ b/src/acl/Certificate.h
@@ -34,10 +34,10 @@
 #define SQUID_ACLCERTIFICATE_H
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
-#include "ssl/support.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
+#include "ssl/support.h"
 
 /// \ingroup ACLAPI
 class ACLCertificateStrategy : public ACLStrategy<X509 *>
diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index 83b6ac3b1a..d3ed5edf72 100644
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -35,8 +35,8 @@
 #include "squid.h"
 #include "acl/CertificateData.h"
 #include "acl/Checklist.h"
-#include "Debug.h"
 #include "cache_cf.h"
+#include "Debug.h"
 #include "wordlist.h"
 
 ACLCertificateData::ACLCertificateData(Ssl::GETX509ATTRIBUTE *sslStrategy, const char *attrs, bool optionalAttr) : validAttributesStr(attrs), attributeIsOptional(optionalAttr), attribute (NULL), values (), sslAttributeCall (sslStrategy)
diff --git a/src/acl/CertificateData.h b/src/acl/CertificateData.h
index 911f549bd6..9ca261eb7d 100644
--- a/src/acl/CertificateData.h
+++ b/src/acl/CertificateData.h
@@ -33,11 +33,11 @@
 #ifndef SQUID_ACLCERTIFICATEDATA_H
 #define SQUID_ACLCERTIFICATEDATA_H
 
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "ssl/support.h"
 #include "acl/StringData.h"
+#include "splay.h"
+#include "ssl/support.h"
 #include <string>
 #include <list>
 
diff --git a/src/acl/DestinationDomain.cc b/src/acl/DestinationDomain.cc
index 88244faec7..a5e1abd80b 100644
--- a/src/acl/DestinationDomain.cc
+++ b/src/acl/DestinationDomain.cc
@@ -33,10 +33,10 @@
  */
 
 #include "squid.h"
-#include "acl/DestinationDomain.h"
 #include "acl/Checklist.h"
-#include "acl/RegexData.h"
+#include "acl/DestinationDomain.h"
 #include "acl/DomainData.h"
+#include "acl/RegexData.h"
 #include "fqdncache.h"
 #include "HttpRequest.h"
 #include "ipcache.h"
diff --git a/src/acl/DestinationDomain.h b/src/acl/DestinationDomain.h
index d772521fd6..7d2e4968aa 100644
--- a/src/acl/DestinationDomain.h
+++ b/src/acl/DestinationDomain.h
@@ -34,8 +34,8 @@
 #define SQUID_ACLDESTINATIONDOMAIN_H
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
 
 /// \ingroup ACLAPI
diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index 98716b89fd..b2f6e8be5a 100644
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -33,12 +33,12 @@
  */
 
 #include "squid.h"
-#include "acl/DomainData.h"
 #include "acl/Checklist.h"
+#include "acl/DomainData.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "wordlist.h"
 #include "src/URL.h"
+#include "wordlist.h"
 
 template<class T>
 inline void
diff --git a/src/acl/DomainData.h b/src/acl/DomainData.h
index 7e7e3b41be..7839a8f75d 100644
--- a/src/acl/DomainData.h
+++ b/src/acl/DomainData.h
@@ -33,9 +33,9 @@
 #ifndef SQUID_ACLDOMAINDATA_H
 #define SQUID_ACLDOMAINDATA_H
 
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 /// \ingroup ACLAPI
 class ACLDomainData : public ACLData<char const *>
diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index 9e8fa17ea4..c02f799a4a 100644
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -7,8 +7,8 @@
 #include "HttpRequest.h"
 #include "SquidConfig.h"
 #if USE_AUTH
-#include "auth/UserRequest.h"
 #include "auth/AclProxyAuth.h"
+#include "auth/UserRequest.h"
 #endif
 
 CBDATA_CLASS_INIT(ACLFilledChecklist);
diff --git a/src/acl/Gadgets.cc b/src/acl/Gadgets.cc
index 8d3c0a5681..62c1d18bef 100644
--- a/src/acl/Gadgets.cc
+++ b/src/acl/Gadgets.cc
@@ -38,12 +38,12 @@
 
 #include "squid.h"
 #include "acl/Acl.h"
-#include "acl/AclNameList.h"
 #include "acl/AclDenyInfoList.h"
+#include "acl/AclNameList.h"
 #include "acl/Checklist.h"
-#include "acl/Tree.h"
-#include "acl/Strategised.h"
 #include "acl/Gadgets.h"
+#include "acl/Strategised.h"
+#include "acl/Tree.h"
 #include "ConfigParser.h"
 #include "errorpage.h"
 #include "globals.h"
diff --git a/src/acl/Gadgets.h b/src/acl/Gadgets.h
index a5a36f0000..be68d3335f 100644
--- a/src/acl/Gadgets.h
+++ b/src/acl/Gadgets.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACL_GADGETS_H
 #define SQUID_ACL_GADGETS_H
 
-#include "err_type.h"
 #include "acl/forward.h"
+#include "err_type.h"
 
 #if HAVE_SSTREAM
 #include <sstream>
diff --git a/src/acl/HierCode.cc b/src/acl/HierCode.cc
index c691e78e51..0ed141f9c0 100644
--- a/src/acl/HierCode.cc
+++ b/src/acl/HierCode.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/HierCode.h"
 #include "acl/HierCodeData.h"
-#include "acl/Checklist.h"
 #include "HttpRequest.h"
 
 /* explicit template instantiation required for some systems */
diff --git a/src/acl/HierCode.h b/src/acl/HierCode.h
index ac9aac8d2a..7b35eedddb 100644
--- a/src/acl/HierCode.h
+++ b/src/acl/HierCode.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACLHIERCODE_H
 #define SQUID_ACLHIERCODE_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "hier_code.h"
 
 /// \ingroup ACLAPI
diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc
index 8f6ec2c0dc..a5c224fc69 100644
--- a/src/acl/HierCodeData.cc
+++ b/src/acl/HierCodeData.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "acl/HierCodeData.h"
 #include "acl/Checklist.h"
+#include "acl/HierCodeData.h"
 #include "cache_cf.h"
 #include "hier_code.h"
 #include "wordlist.h"
diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index d84633df05..56e1632aff 100644
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -33,15 +33,15 @@
  */
 
 #include "squid.h"
-#include "acl/HttpHeaderData.h"
-#include "acl/Checklist.h"
 #include "acl/Acl.h"
+#include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
 #include "acl/RegexData.h"
 #include "cache_cf.h"
-#include "Debug.h"
-#include "wordlist.h"
 #include "ConfigParser.h"
+#include "Debug.h"
 #include "HttpHeaderTools.h"
+#include "wordlist.h"
 
 /* Construct an ACLHTTPHeaderData that uses an ACLRegex rule with the value of the
  * selected header from a given request.
diff --git a/src/acl/HttpRepHeader.cc b/src/acl/HttpRepHeader.cc
index d14daa2908..a040e2407d 100644
--- a/src/acl/HttpRepHeader.cc
+++ b/src/acl/HttpRepHeader.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/HttpRepHeader.h"
-#include "acl/HttpHeaderData.h"
 #include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
+#include "acl/HttpRepHeader.h"
 #include "HttpReply.h"
 
 int
diff --git a/src/acl/HttpRepHeader.h b/src/acl/HttpRepHeader.h
index 1f019058a5..9f605631c6 100644
--- a/src/acl/HttpRepHeader.h
+++ b/src/acl/HttpRepHeader.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLHTTPREPHEADER_H
 #define SQUID_ACLHTTPREPHEADER_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "HttpHeader.h"
 
 /// \ingroup ACLAPI
diff --git a/src/acl/HttpReqHeader.cc b/src/acl/HttpReqHeader.cc
index 49c701b04d..5c6acd2ab5 100644
--- a/src/acl/HttpReqHeader.cc
+++ b/src/acl/HttpReqHeader.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/HttpReqHeader.h"
-#include "acl/HttpHeaderData.h"
 #include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
+#include "acl/HttpReqHeader.h"
 #include "HttpRequest.h"
 
 int
diff --git a/src/acl/HttpReqHeader.h b/src/acl/HttpReqHeader.h
index e805207ebe..1f342eabca 100644
--- a/src/acl/HttpReqHeader.h
+++ b/src/acl/HttpReqHeader.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLHTTPREQHEADER_H
 #define SQUID_ACLHTTPREQHEADER_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "HttpHeader.h"
 
 /// \ingroup ACLAPI
diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc
index a20120cfa9..f4e423ac43 100644
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/HttpStatus.h"
 #include "acl/FilledChecklist.h"
+#include "acl/HttpStatus.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "HttpReply.h"
diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index f0dc78fc78..40eeb67f14 100644
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -36,8 +36,8 @@
 #include "acl/IntRange.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "wordlist.h"
 #include "Parsing.h"
+#include "wordlist.h"
 
 /* explicit instantiation required for some systems */
 /** \cond AUTODOCS-IGNORE */
diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc
index 47dc027d46..81ff1becdb 100644
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/Ip.h"
 #include "acl/Checklist.h"
+#include "acl/Ip.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "ip/tools.h"
diff --git a/src/acl/Ip.h b/src/acl/Ip.h
index 49f8f00318..662d41424b 100644
--- a/src/acl/Ip.h
+++ b/src/acl/Ip.h
@@ -34,8 +34,8 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "splay.h"
 #include "ip/Address.h"
+#include "splay.h"
 
 /// \ingroup ACLAPI
 class acl_ip_data
diff --git a/src/acl/LocalIp.cc b/src/acl/LocalIp.cc
index a32f09f8fb..e4c08198fc 100644
--- a/src/acl/LocalIp.cc
+++ b/src/acl/LocalIp.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/LocalIp.h"
 #include "acl/FilledChecklist.h"
+#include "acl/LocalIp.h"
 
 char const *
 ACLLocalIP::typeString() const
diff --git a/src/acl/LocalPort.cc b/src/acl/LocalPort.cc
index 34b9703f27..77e267894c 100644
--- a/src/acl/LocalPort.cc
+++ b/src/acl/LocalPort.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/LocalPort.h"
-#include "acl/IntRange.h"
 #include "acl/Checklist.h"
+#include "acl/IntRange.h"
+#include "acl/LocalPort.h"
 
 int
 ACLLocalPortStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)
diff --git a/src/acl/LocalPort.h b/src/acl/LocalPort.h
index dd57aa03ea..2dec7f6755 100644
--- a/src/acl/LocalPort.h
+++ b/src/acl/LocalPort.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLLOCALPORT_H
 #define SQUID_ACLLOCALPORT_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 /// \ingroup ACLAPI
 class ACLLocalPortStrategy : public ACLStrategy<int>
diff --git a/src/acl/Method.cc b/src/acl/Method.cc
index 08fd2eeb58..fd43d97e0c 100644
--- a/src/acl/Method.cc
+++ b/src/acl/Method.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/Method.h"
 #include "acl/MethodData.h"
-#include "acl/Checklist.h"
 #include "HttpRequest.h"
 
 /* explicit template instantiation required for some systems */
diff --git a/src/acl/Method.h b/src/acl/Method.h
index 96ade28de3..636793d4ad 100644
--- a/src/acl/Method.h
+++ b/src/acl/Method.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLMETHOD_H
 #define SQUID_ACLMETHOD_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "HttpRequestMethod.h"
 
 /// \ingroup ACLAPI
diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 0cc5241555..b9a8fefd8a 100644
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/MethodData.h"
 #include "acl/Checklist.h"
+#include "acl/MethodData.h"
 #include "cache_cf.h"
 #include "HttpRequestMethod.h"
 #include "wordlist.h"
diff --git a/src/acl/MyPortName.h b/src/acl/MyPortName.h
index 9890d5a381..b5aa37ca5c 100644
--- a/src/acl/MyPortName.h
+++ b/src/acl/MyPortName.h
@@ -33,8 +33,8 @@
 
 #ifndef SQUID_ACLMYPORTNAME_H
 #define SQUID_ACLMYPORTNAME_H
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLMyPortNameStrategy : public ACLStrategy<const char *>
 {
diff --git a/src/acl/Note.cc b/src/acl/Note.cc
index a5d8a85a25..24e4e116f2 100644
--- a/src/acl/Note.cc
+++ b/src/acl/Note.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "acl/Note.h"
-#include "acl/HttpHeaderData.h"
 #include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
+#include "acl/Note.h"
 #include "HttpRequest.h"
 #include "Notes.h"
 
diff --git a/src/acl/Note.h b/src/acl/Note.h
index 972cd65429..798bb23756 100644
--- a/src/acl/Note.h
+++ b/src/acl/Note.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACLNOTE_H
 #define SQUID_ACLNOTE_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class HttpRequest;
 
diff --git a/src/acl/NoteData.h b/src/acl/NoteData.h
index b62031072e..c6ef8f37fd 100644
--- a/src/acl/NoteData.h
+++ b/src/acl/NoteData.h
@@ -2,8 +2,8 @@
 #define SQUID_ACLNOTEDATA_H
 
 #include "acl/Data.h"
-#include "SquidString.h"
 #include "MemPool.h"
+#include "SquidString.h"
 
 class HttpRequest;
 class NotePairs;
diff --git a/src/acl/PeerName.cc b/src/acl/PeerName.cc
index a3c36eb2d0..3b69a04300 100644
--- a/src/acl/PeerName.cc
+++ b/src/acl/PeerName.cc
@@ -1,8 +1,8 @@
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/PeerName.h"
 #include "acl/RegexData.h"
 #include "acl/StringData.h"
-#include "acl/Checklist.h"
 #include "CachePeer.h"
 
 int
diff --git a/src/acl/PeerName.h b/src/acl/PeerName.h
index 84c23ee6fa..20c80c9755 100644
--- a/src/acl/PeerName.h
+++ b/src/acl/PeerName.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACLPEERNAME_H
 #define SQUID_ACLPEERNAME_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLPeerNameStrategy : public ACLStrategy<const char *>
 {
diff --git a/src/acl/Protocol.cc b/src/acl/Protocol.cc
index 067977b9f8..1fb1bc38fb 100644
--- a/src/acl/Protocol.cc
+++ b/src/acl/Protocol.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/Protocol.h"
 #include "acl/ProtocolData.h"
-#include "acl/Checklist.h"
 #include "HttpRequest.h"
 
 /* explicit template instantiation required for some systems */
diff --git a/src/acl/Protocol.h b/src/acl/Protocol.h
index d2aea168b4..7693558222 100644
--- a/src/acl/Protocol.h
+++ b/src/acl/Protocol.h
@@ -34,8 +34,8 @@
 #ifndef SQUID_ACLPROTOCOL_H
 #define SQUID_ACLPROTOCOL_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "anyp/ProtocolType.h"
 
 class ACLProtocolStrategy : public ACLStrategy<AnyP::ProtocolType>
diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc
index 9b61dc50d1..dc2a453a2b 100644
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/ProtocolData.h"
 #include "acl/Checklist.h"
+#include "acl/ProtocolData.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "URLScheme.h"
diff --git a/src/acl/Referer.cc b/src/acl/Referer.cc
index c8eb4b638f..406455edd7 100644
--- a/src/acl/Referer.cc
+++ b/src/acl/Referer.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/Referer.h"
 #include "acl/Checklist.h"
+#include "acl/Referer.h"
 #include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */
diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc
index 469ff0dbda..63ebe2db14 100644
--- a/src/acl/RegexData.cc
+++ b/src/acl/RegexData.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "acl/RegexData.h"
-#include "acl/Checklist.h"
 #include "acl/Acl.h"
+#include "acl/Checklist.h"
+#include "acl/RegexData.h"
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "Mem.h"
diff --git a/src/acl/ReplyHeaderStrategy.h b/src/acl/ReplyHeaderStrategy.h
index 857b7d9d3f..a8ef8c83d8 100644
--- a/src/acl/ReplyHeaderStrategy.h
+++ b/src/acl/ReplyHeaderStrategy.h
@@ -36,8 +36,8 @@ class ACLChecklist;
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/FilledChecklist.h"
+#include "acl/Strategy.h"
 #include "HttpReply.h"
 
 template <http_hdr_type header>
diff --git a/src/acl/ReplyMimeType.cc b/src/acl/ReplyMimeType.cc
index 9be4a97889..5ca6f6512b 100644
--- a/src/acl/ReplyMimeType.cc
+++ b/src/acl/ReplyMimeType.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/ReplyMimeType.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/ReplyMimeType.h"
 
 /* explicit template instantiation required for some systems */
 
diff --git a/src/acl/ReplyMimeType.h b/src/acl/ReplyMimeType.h
index cec43f7106..9e619b7158 100644
--- a/src/acl/ReplyMimeType.h
+++ b/src/acl/ReplyMimeType.h
@@ -45,9 +45,9 @@ private:
 
 /* partial specialisation */
 
+#include "acl/Checklist.h"
 #include "acl/Data.h"
 #include "acl/ReplyHeaderStrategy.h"
-#include "acl/Checklist.h"
 
 template <>
 inline int
diff --git a/src/acl/RequestHeaderStrategy.h b/src/acl/RequestHeaderStrategy.h
index 7d2c718909..c2be587ebf 100644
--- a/src/acl/RequestHeaderStrategy.h
+++ b/src/acl/RequestHeaderStrategy.h
@@ -35,9 +35,9 @@
 #define SQUID_ACLREQUESTHEADERSTRATEGY_H
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "acl/FilledChecklist.h"
 #include "acl/Strategy.h"
 #include "HttpRequest.h"
-#include "acl/FilledChecklist.h"
 
 template <http_hdr_type header>
 
diff --git a/src/acl/RequestMimeType.cc b/src/acl/RequestMimeType.cc
index b96da428c1..4297446231 100644
--- a/src/acl/RequestMimeType.cc
+++ b/src/acl/RequestMimeType.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/RequestMimeType.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/RequestMimeType.h"
 
 /* explicit template instantiation required for some systems */
 
diff --git a/src/acl/RequestMimeType.h b/src/acl/RequestMimeType.h
index 2859370839..292ef4d769 100644
--- a/src/acl/RequestMimeType.h
+++ b/src/acl/RequestMimeType.h
@@ -45,9 +45,9 @@ private:
 
 /* partial specialisation */
 
+#include "acl/Checklist.h"
 #include "acl/Data.h"
 #include "acl/RequestHeaderStrategy.h"
-#include "acl/Checklist.h"
 
 template <>
 inline int
diff --git a/src/acl/ServerCertificate.cc b/src/acl/ServerCertificate.cc
index f87189a638..5d5e73ec29 100644
--- a/src/acl/ServerCertificate.cc
+++ b/src/acl/ServerCertificate.cc
@@ -5,9 +5,9 @@
 
 #if USE_SSL
 
-#include "acl/ServerCertificate.h"
-#include "acl/Checklist.h"
 #include "acl/CertificateData.h"
+#include "acl/Checklist.h"
+#include "acl/ServerCertificate.h"
 #include "client_side.h"
 #include "fde.h"
 #include "ssl/ServerBump.h"
diff --git a/src/acl/ServerCertificate.h b/src/acl/ServerCertificate.h
index e32cda3669..26e66091ee 100644
--- a/src/acl/ServerCertificate.h
+++ b/src/acl/ServerCertificate.h
@@ -5,10 +5,10 @@
 #define SQUID_ACLSERVERCERTIFICATE_H
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
-#include "ssl/support.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
+#include "ssl/support.h"
 
 /// \ingroup ACLAPI
 class ACLServerCertificateStrategy : public ACLStrategy<X509 *>
diff --git a/src/acl/SourceDomain.cc b/src/acl/SourceDomain.cc
index a68ed988d8..be97c3551a 100644
--- a/src/acl/SourceDomain.cc
+++ b/src/acl/SourceDomain.cc
@@ -33,10 +33,10 @@
  */
 
 #include "squid.h"
-#include "acl/SourceDomain.h"
 #include "acl/Checklist.h"
-#include "acl/RegexData.h"
 #include "acl/DomainData.h"
+#include "acl/RegexData.h"
+#include "acl/SourceDomain.h"
 #include "fqdncache.h"
 #include "HttpRequest.h"
 
diff --git a/src/acl/SourceDomain.h b/src/acl/SourceDomain.h
index 8e82857419..2be3caba21 100644
--- a/src/acl/SourceDomain.h
+++ b/src/acl/SourceDomain.h
@@ -34,8 +34,8 @@
 #ifndef SQUID_ACLSOURCEDOMAIN_H
 #define SQUID_ACLSOURCEDOMAIN_H
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
 
 class ACLSourceDomainStrategy : public ACLStrategy<char const *>
diff --git a/src/acl/SourceIp.cc b/src/acl/SourceIp.cc
index c2726fff76..d0a5453023 100644
--- a/src/acl/SourceIp.cc
+++ b/src/acl/SourceIp.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/SourceIp.h"
 #include "acl/FilledChecklist.h"
+#include "acl/SourceIp.h"
 
 char const *
 ACLSourceIP::typeString() const
diff --git a/src/acl/SslError.cc b/src/acl/SslError.cc
index 6eae03e67b..8a2336b0b2 100644
--- a/src/acl/SslError.cc
+++ b/src/acl/SslError.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/SslError.h"
 #include "acl/SslErrorData.h"
-#include "acl/Checklist.h"
 
 int
 ACLSslErrorStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)
diff --git a/src/acl/SslError.h b/src/acl/SslError.h
index ea71844062..a14ba05f33 100644
--- a/src/acl/SslError.h
+++ b/src/acl/SslError.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_ACLSSL_ERROR_H
 #define SQUID_ACLSSL_ERROR_H
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "ssl/support.h"
 
 class ACLSslErrorStrategy : public ACLStrategy<const Ssl::CertErrors *>
diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc
index 2de5e2394f..4ac522228d 100644
--- a/src/acl/SslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/SslErrorData.h"
 #include "acl/Checklist.h"
+#include "acl/SslErrorData.h"
 #include "cache_cf.h"
 #include "wordlist.h"
 
diff --git a/src/acl/SslErrorData.h b/src/acl/SslErrorData.h
index 70f1c14223..5104b308ed 100644
--- a/src/acl/SslErrorData.h
+++ b/src/acl/SslErrorData.h
@@ -3,8 +3,8 @@
 #include "acl/Acl.h"
 #include "acl/Data.h"
 #include "CbDataList.h"
-#include "ssl/support.h"
 #include "ssl/ErrorDetail.h"
+#include "ssl/support.h"
 #include <vector>
 
 class ACLSslErrorData : public ACLData<const Ssl::CertErrors *>
diff --git a/src/acl/Strategised.h b/src/acl/Strategised.h
index 971cc62a5c..6a2e276c09 100644
--- a/src/acl/Strategised.h
+++ b/src/acl/Strategised.h
@@ -35,8 +35,8 @@
 #define SQUID_ACLSTRATEGISED_H
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/FilledChecklist.h"
+#include "acl/Strategy.h"
 
 template <class M>
 
diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index 2067b91043..c67fd456d2 100644
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/StringData.h"
 #include "acl/Checklist.h"
+#include "acl/StringData.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "wordlist.h"
diff --git a/src/acl/StringData.h b/src/acl/StringData.h
index b036ffa385..4a8bab582c 100644
--- a/src/acl/StringData.h
+++ b/src/acl/StringData.h
@@ -33,9 +33,9 @@
 
 #ifndef SQUID_ACLSTRINGDATA_H
 #define SQUID_ACLSTRINGDATA_H
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 class ACLStringData : public ACLData<char const *>
 {
diff --git a/src/acl/Tag.cc b/src/acl/Tag.cc
index 17ffdcdd28..64e4de45a2 100644
--- a/src/acl/Tag.cc
+++ b/src/acl/Tag.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "acl/Tag.h"
-#include "acl/StringData.h"
 #include "acl/Checklist.h"
+#include "acl/StringData.h"
+#include "acl/Tag.h"
 #include "HttpRequest.h"
 
 int
diff --git a/src/acl/Tag.h b/src/acl/Tag.h
index bdd2431830..33fec55328 100644
--- a/src/acl/Tag.h
+++ b/src/acl/Tag.h
@@ -34,8 +34,8 @@
 #ifndef SQUID_ACLTAG_H
 #define SQUID_ACLTAG_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLTagStrategy : public ACLStrategy<const char *>
 {
diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc
index efa5ea0bcc..6f8a3da20a 100644
--- a/src/acl/TimeData.cc
+++ b/src/acl/TimeData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/TimeData.h"
 #include "acl/Checklist.h"
+#include "acl/TimeData.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "wordlist.h"
diff --git a/src/acl/TimeData.h b/src/acl/TimeData.h
index f929c0a077..dca42ac47e 100644
--- a/src/acl/TimeData.h
+++ b/src/acl/TimeData.h
@@ -33,9 +33,9 @@
 
 #ifndef SQUID_ACLTIMEDATA_H
 #define SQUID_ACLTIMEDATA_H
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 class ACLTimeData : public ACLData<time_t>
 {
diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index ca47794c10..bdb693aee3 100644
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/Url.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/Url.h"
 #include "rfc1738.h"
 #include "src/URL.h"
 
diff --git a/src/acl/UrlLogin.cc b/src/acl/UrlLogin.cc
index bdefaf0f9e..5691edadbd 100644
--- a/src/acl/UrlLogin.cc
+++ b/src/acl/UrlLogin.cc
@@ -31,9 +31,9 @@
  */
 
 #include "squid.h"
-#include "acl/UrlLogin.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/UrlLogin.h"
 #include "HttpRequest.h"
 #include "rfc1738.h"
 
diff --git a/src/acl/UrlLogin.h b/src/acl/UrlLogin.h
index 572b3ad354..7e64c6aa37 100644
--- a/src/acl/UrlLogin.h
+++ b/src/acl/UrlLogin.h
@@ -38,8 +38,8 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLUrlLoginStrategy : public ACLStrategy<char const *>
 {
diff --git a/src/acl/UrlPath.cc b/src/acl/UrlPath.cc
index 018e20bbc5..fdcfdb7381 100644
--- a/src/acl/UrlPath.cc
+++ b/src/acl/UrlPath.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/UrlPath.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/UrlPath.h"
 #include "HttpRequest.h"
 #include "rfc1738.h"
 
diff --git a/src/acl/UrlPath.h b/src/acl/UrlPath.h
index 0ae533d25b..d1f9a210e1 100644
--- a/src/acl/UrlPath.h
+++ b/src/acl/UrlPath.h
@@ -35,8 +35,8 @@
 #define SQUID_ACLURLPATH_H
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLUrlPathStrategy : public ACLStrategy<char const *>
 {
diff --git a/src/acl/UrlPort.cc b/src/acl/UrlPort.cc
index 81cbf47414..1d7b536442 100644
--- a/src/acl/UrlPort.cc
+++ b/src/acl/UrlPort.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/UrlPort.h"
-#include "acl/IntRange.h"
 #include "acl/Checklist.h"
+#include "acl/IntRange.h"
+#include "acl/UrlPort.h"
 #include "HttpRequest.h"
 
 int
diff --git a/src/acl/UrlPort.h b/src/acl/UrlPort.h
index bdc07708ca..2cc894d17a 100644
--- a/src/acl/UrlPort.h
+++ b/src/acl/UrlPort.h
@@ -33,8 +33,8 @@
 
 #ifndef SQUID_ACLURLPORT_H
 #define SQUID_ACLURLPORT_H
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLUrlPortStrategy : public ACLStrategy<int>
 {
diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index e023f3b113..499400d0e3 100644
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -33,11 +33,11 @@
  */
 
 #include "squid.h"
-#include "acl/UserData.h"
 #include "acl/Checklist.h"
+#include "acl/UserData.h"
+#include "ConfigParser.h"
 #include "Debug.h"
 #include "wordlist.h"
-#include "ConfigParser.h"
 
 template<class T>
 inline void
diff --git a/src/acl/UserData.h b/src/acl/UserData.h
index 39e6374907..0abec76633 100644
--- a/src/acl/UserData.h
+++ b/src/acl/UserData.h
@@ -33,9 +33,9 @@
 
 #ifndef SQUID_ACLUSERDATA_H
 #define SQUID_ACLUSERDATA_H
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 class ACLUserData : public ACLData<char const *>
 {
diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h
index fe56065e58..cbcda89f8c 100644
--- a/src/adaptation/AccessCheck.h
+++ b/src/adaptation/AccessCheck.h
@@ -2,11 +2,11 @@
 #define SQUID_ADAPTATION__ACCESS_CHECK_H
 
 #include "acl/Acl.h"
-#include "base/AsyncJob.h"
 #include "adaptation/Elements.h"
 #include "adaptation/forward.h"
 #include "adaptation/Initiator.h"
 #include "adaptation/ServiceFilter.h"
+#include "base/AsyncJob.h"
 
 class HttpRequest;
 class HttpReply;
diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h
index 13e84aeb19..15d1e5bade 100644
--- a/src/adaptation/Config.h
+++ b/src/adaptation/Config.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_ADAPTATION__CONFIG_H
 #define SQUID_ADAPTATION__CONFIG_H
 
-#include "event.h"
 #include "acl/forward.h"
-#include "base/AsyncCall.h"
-#include "adaptation/forward.h"
 #include "adaptation/Elements.h"
+#include "adaptation/forward.h"
+#include "base/AsyncCall.h"
+#include "event.h"
 #include "Notes.h"
 #include "SquidString.h"
 
diff --git a/src/adaptation/History.h b/src/adaptation/History.h
index 07b3cf312f..1ef64e4cdf 100644
--- a/src/adaptation/History.h
+++ b/src/adaptation/History.h
@@ -2,8 +2,8 @@
 #define SQUID_ADAPT_HISTORY_H
 
 #include "adaptation/DynamicGroupCfg.h"
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 #include "HttpHeader.h"
 #include "Notes.h"
 #include "SquidString.h"
diff --git a/src/adaptation/Initiate.cc b/src/adaptation/Initiate.cc
index 68c2bca350..ebb1c348f8 100644
--- a/src/adaptation/Initiate.cc
+++ b/src/adaptation/Initiate.cc
@@ -3,11 +3,11 @@
  */
 
 #include "squid.h"
-#include "HttpMsg.h"
 #include "adaptation/Answer.h"
-#include "adaptation/Initiator.h"
 #include "adaptation/Initiate.h"
+#include "adaptation/Initiator.h"
 #include "base/AsyncJobCalls.h"
+#include "HttpMsg.h"
 
 namespace Adaptation
 {
diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h
index 39f6a28b92..9c1650235e 100644
--- a/src/adaptation/Initiate.h
+++ b/src/adaptation/Initiate.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_ADAPTATION__INITIATE_H
 #define SQUID_ADAPTATION__INITIATE_H
 
+#include "adaptation/forward.h"
 #include "base/AsyncJob.h"
 #include "base/CbcPointer.h"
-#include "adaptation/forward.h"
 
 namespace Adaptation
 {
diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc
index 11505edf2b..3b60e82b15 100644
--- a/src/adaptation/Iterator.cc
+++ b/src/adaptation/Iterator.cc
@@ -10,9 +10,9 @@
 #include "adaptation/ServiceFilter.h"
 #include "adaptation/ServiceGroups.h"
 #include "base/TextException.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
 #include "HttpMsg.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
 
 Adaptation::Iterator::Iterator(
     HttpMsg *aMsg, HttpRequest *aCause,
diff --git a/src/adaptation/Iterator.h b/src/adaptation/Iterator.h
index c0d2958bbc..fda39bb693 100644
--- a/src/adaptation/Iterator.h
+++ b/src/adaptation/Iterator.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ADAPTATION__ITERATOR_H
 #define SQUID_ADAPTATION__ITERATOR_H
 
-#include "adaptation/Initiator.h"
 #include "adaptation/Initiate.h"
+#include "adaptation/Initiator.h"
 #include "adaptation/ServiceGroups.h"
 
 class HttpMsg;
diff --git a/src/adaptation/Service.cc b/src/adaptation/Service.cc
index 730035db8d..33b60a8b9f 100644
--- a/src/adaptation/Service.cc
+++ b/src/adaptation/Service.cc
@@ -3,9 +3,9 @@
  */
 
 #include "squid.h"
-#include "HttpRequest.h"
-#include "adaptation/ServiceFilter.h"
 #include "adaptation/Service.h"
+#include "adaptation/ServiceFilter.h"
+#include "HttpRequest.h"
 
 Adaptation::Service::Service(const ServiceConfigPointer &aConfig): theConfig(aConfig)
 {
diff --git a/src/adaptation/Service.h b/src/adaptation/Service.h
index 3b60b4bf51..1166f1c64b 100644
--- a/src/adaptation/Service.h
+++ b/src/adaptation/Service.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_ADAPTATION__SERVICE_H
 #define SQUID_ADAPTATION__SERVICE_H
 
-#include "SquidString.h"
-#include "adaptation/forward.h"
 #include "adaptation/Elements.h"
+#include "adaptation/forward.h"
 #include "adaptation/ServiceConfig.h"
 #include "base/RefCount.h"
+#include "SquidString.h"
 
 // TODO: Move src/ICAP/ICAPServiceRep.h API comments here and update them
 
diff --git a/src/adaptation/ServiceConfig.h b/src/adaptation/ServiceConfig.h
index 940c45a965..1d8cb93a6d 100644
--- a/src/adaptation/ServiceConfig.h
+++ b/src/adaptation/ServiceConfig.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_ADAPTATION__SERVICE_CONFIG_H
 #define SQUID_ADAPTATION__SERVICE_CONFIG_H
 
-#include "SquidString.h"
-#include "base/RefCount.h"
 #include "adaptation/Elements.h"
+#include "base/RefCount.h"
+#include "SquidString.h"
 
 namespace Adaptation
 {
diff --git a/src/adaptation/ServiceFilter.cc b/src/adaptation/ServiceFilter.cc
index f488eba8d7..25fbfac9f6 100644
--- a/src/adaptation/ServiceFilter.cc
+++ b/src/adaptation/ServiceFilter.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
 #include "adaptation/ServiceFilter.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
 
 Adaptation::ServiceFilter::ServiceFilter(Method aMethod, VectPoint aPoint, HttpRequest *aReq, HttpReply *aRep):
         method(aMethod),
diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h
index 0fdaf80341..ab7bc6f711 100644
--- a/src/adaptation/ServiceGroups.h
+++ b/src/adaptation/ServiceGroups.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_ADAPTATION__SERVICE_GROUPS_H
 #define SQUID_ADAPTATION__SERVICE_GROUPS_H
 
-#include "SquidString.h"
-#include "base/Vector.h"
 #include "adaptation/Elements.h"
 #include "adaptation/forward.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
+#include "SquidString.h"
 
 namespace Adaptation
 {
diff --git a/src/adaptation/ecap/Config.cc b/src/adaptation/ecap/Config.cc
index 2ed9d5051d..314b743dda 100644
--- a/src/adaptation/ecap/Config.cc
+++ b/src/adaptation/ecap/Config.cc
@@ -2,9 +2,9 @@
  * DEBUG: section 93    eCAP Interface
  */
 #include "squid.h"
+#include "adaptation/ecap/Config.h"
 #include "adaptation/ecap/Host.h"
 #include "adaptation/ecap/ServiceRep.h"
-#include "adaptation/ecap/Config.h"
 
 Adaptation::Ecap::Config Adaptation::Ecap::TheConfig;
 
diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc
index df38fed72c..0883837052 100644
--- a/src/adaptation/ecap/Host.cc
+++ b/src/adaptation/ecap/Host.cc
@@ -5,12 +5,12 @@
 #include <libecap/adapter/service.h>
 #include <libecap/common/names.h>
 #include <libecap/common/registry.h>
-#include "base/TextException.h"
-#include "adaptation/ecap/ServiceRep.h"
 #include "adaptation/ecap/Host.h"
 #include "adaptation/ecap/MessageRep.h"
-#include "HttpRequest.h"
+#include "adaptation/ecap/ServiceRep.h"
+#include "base/TextException.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 const libecap::Name Adaptation::Ecap::protocolInternal("internal", libecap::Name::NextId());
 const libecap::Name Adaptation::Ecap::protocolCacheObj("cache_object", libecap::Name::NextId());
diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index cf32e6209c..89512fc6e9 100644
--- a/src/adaptation/ecap/MessageRep.cc
+++ b/src/adaptation/ecap/MessageRep.cc
@@ -2,16 +2,16 @@
  * DEBUG: section 93    eCAP Interface
  */
 #include "squid.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
 #include "BodyPipe.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
 #include <libecap/common/names.h>
 #include <libecap/common/area.h>
 #include <libecap/common/version.h>
 #include <libecap/common/named_values.h>
+#include "adaptation/ecap/Host.h" /* for protocol constants */
 #include "adaptation/ecap/MessageRep.h"
 #include "adaptation/ecap/XactionRep.h"
-#include "adaptation/ecap/Host.h" /* for protocol constants */
 #include "base/TextException.h"
 #include "URL.h"
 
diff --git a/src/adaptation/ecap/MessageRep.h b/src/adaptation/ecap/MessageRep.h
index 9f8d001ad2..cfcf739236 100644
--- a/src/adaptation/ecap/MessageRep.h
+++ b/src/adaptation/ecap/MessageRep.h
@@ -5,11 +5,11 @@
 #ifndef SQUID__ECAP__MESSAGE_REP_H
 #define SQUID__ECAP__MESSAGE_REP_H
 
-#include "HttpHeader.h"
-#include "BodyPipe.h"
 #include "adaptation/forward.h"
 #include "adaptation/Message.h"
 #include "anyp/ProtocolType.h"
+#include "BodyPipe.h"
+#include "HttpHeader.h"
 #include <libecap/common/message.h>
 #include <libecap/common/header.h>
 #include <libecap/common/body.h>
diff --git a/src/adaptation/ecap/ServiceRep.h b/src/adaptation/ecap/ServiceRep.h
index 1bcc2495dd..d3617c0290 100644
--- a/src/adaptation/ecap/ServiceRep.h
+++ b/src/adaptation/ecap/ServiceRep.h
@@ -5,8 +5,8 @@
 #ifndef SQUID_ECAP_SERVICE_REP_H
 #define SQUID_ECAP_SERVICE_REP_H
 
-#include "adaptation/Service.h"
 #include "adaptation/forward.h"
+#include "adaptation/Service.h"
 #include <libecap/common/forward.h>
 #include <libecap/common/memory.h>
 
diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc
index 6090c5e917..7ee3f1d9e3 100644
--- a/src/adaptation/ecap/XactionRep.cc
+++ b/src/adaptation/ecap/XactionRep.cc
@@ -7,14 +7,14 @@
 #include <libecap/common/named_values.h>
 #include <libecap/common/names.h>
 #include <libecap/adapter/xaction.h>
-#include "HttpRequest.h"
-#include "HttpReply.h"
-#include "SquidTime.h"
 #include "adaptation/Answer.h"
-#include "adaptation/ecap/XactionRep.h"
 #include "adaptation/ecap/Config.h"
+#include "adaptation/ecap/XactionRep.h"
 #include "adaptation/Initiator.h"
 #include "base/TextException.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
+#include "SquidTime.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Ecap::XactionRep, XactionRep);
 
diff --git a/src/adaptation/ecap/XactionRep.h b/src/adaptation/ecap/XactionRep.h
index 80f4c6f8ee..3c100b0545 100644
--- a/src/adaptation/ecap/XactionRep.h
+++ b/src/adaptation/ecap/XactionRep.h
@@ -5,11 +5,11 @@
 #ifndef SQUID_ECAP_XACTION_REP_H
 #define SQUID_ECAP_XACTION_REP_H
 
-#include "BodyPipe.h"
-#include "adaptation/Initiate.h"
-#include "adaptation/Message.h"
 #include "adaptation/ecap/MessageRep.h"
 #include "adaptation/ecap/ServiceRep.h"
+#include "adaptation/Initiate.h"
+#include "adaptation/Message.h"
+#include "BodyPipe.h"
 #include <libecap/common/forward.h>
 #include <libecap/common/memory.h>
 #include <libecap/host/xaction.h>
diff --git a/src/adaptation/icap/Client.cc b/src/adaptation/icap/Client.cc
index a335b83ea7..878578e48f 100644
--- a/src/adaptation/icap/Client.cc
+++ b/src/adaptation/icap/Client.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "Debug.h"
 #include "adaptation/icap/Client.h"
+#include "Debug.h"
 
 void Adaptation::Icap::InitModule()
 {
diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc
index 3e2288e0c7..d66c3f67c9 100644
--- a/src/adaptation/icap/Config.cc
+++ b/src/adaptation/icap/Config.cc
@@ -31,14 +31,14 @@
  */
 
 #include "squid.h"
-#include "ConfigParser.h"
-#include "Store.h"
-#include "base/Vector.h"
 #include "adaptation/icap/Config.h"
 #include "adaptation/icap/ServiceRep.h"
-#include "HttpRequest.h"
+#include "base/Vector.h"
+#include "ConfigParser.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 #include "SquidConfig.h"
+#include "Store.h"
 #include "wordlist.h"
 
 Adaptation::Icap::Config Adaptation::Icap::TheConfig;
diff --git a/src/adaptation/icap/Config.h b/src/adaptation/icap/Config.h
index 012efb7e43..5da8ec7adb 100644
--- a/src/adaptation/icap/Config.h
+++ b/src/adaptation/icap/Config.h
@@ -34,11 +34,11 @@
 #ifndef SQUID_ICAPCONFIG_H
 #define SQUID_ICAPCONFIG_H
 
-#include "event.h"
-#include "base/AsyncCall.h"
 #include "acl/forward.h"
 #include "adaptation/Config.h"
 #include "adaptation/icap/ServiceRep.h"
+#include "base/AsyncCall.h"
+#include "event.h"
 
 namespace Adaptation
 {
diff --git a/src/adaptation/icap/InOut.h b/src/adaptation/icap/InOut.h
index 4251c93c07..83a6270f11 100644
--- a/src/adaptation/icap/InOut.h
+++ b/src/adaptation/icap/InOut.h
@@ -33,8 +33,8 @@
 #define SQUID_ICAPINOUT_H
 
 #include "HttpMsg.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 // IcapInOut manages a pointer to the HTTP message being worked on.
 // For HTTP responses, request header information is also available
diff --git a/src/adaptation/icap/Launcher.cc b/src/adaptation/icap/Launcher.cc
index 1355a9cca0..7d77f57ee0 100644
--- a/src/adaptation/icap/Launcher.cc
+++ b/src/adaptation/icap/Launcher.cc
@@ -5,15 +5,15 @@
 #include "squid.h"
 #include "acl/FilledChecklist.h"
 #include "adaptation/Answer.h"
+#include "adaptation/icap/Config.h"
 #include "adaptation/icap/Launcher.h"
-#include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/ServiceRep.h"
-#include "adaptation/icap/Config.h"
+#include "adaptation/icap/Xaction.h"
 #include "base/TextException.h"
 #include "globals.h"
 #include "HttpMsg.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 Adaptation::Icap::Launcher::Launcher(const char *aTypeName,
                                      Adaptation::ServicePointer &aService):
diff --git a/src/adaptation/icap/Launcher.h b/src/adaptation/icap/Launcher.h
index c70d59767d..37beb79d31 100644
--- a/src/adaptation/icap/Launcher.h
+++ b/src/adaptation/icap/Launcher.h
@@ -32,9 +32,9 @@
 #ifndef SQUID_ICAPLAUNCHER_H
 #define SQUID_ICAPLAUNCHER_H
 
-#include "adaptation/Initiator.h"
-#include "adaptation/Initiate.h"
 #include "adaptation/icap/ServiceRep.h"
+#include "adaptation/Initiate.h"
+#include "adaptation/Initiator.h"
 
 /*
  * The ICAP Launcher starts an ICAP transaction. If the transaction fails
diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h
index e062697e60..319aa72b21 100644
--- a/src/adaptation/icap/ModXact.h
+++ b/src/adaptation/icap/ModXact.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ICAPMODXACT_H
 #define SQUID_ICAPMODXACT_H
 
-#include "BodyPipe.h"
-#include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/InOut.h"
 #include "adaptation/icap/Launcher.h"
+#include "adaptation/icap/Xaction.h"
+#include "BodyPipe.h"
 
 /*
  * ICAPModXact implements ICAP REQMOD and RESPMOD transaction using
diff --git a/src/adaptation/icap/OptXact.h b/src/adaptation/icap/OptXact.h
index fd366c9077..70dc4952a7 100644
--- a/src/adaptation/icap/OptXact.h
+++ b/src/adaptation/icap/OptXact.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_ICAPOPTXACT_H
 #define SQUID_ICAPOPTXACT_H
 
-#include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/Launcher.h"
+#include "adaptation/icap/Xaction.h"
 
 namespace Adaptation
 {
diff --git a/src/adaptation/icap/ServiceRep.h b/src/adaptation/icap/ServiceRep.h
index 473e3809d1..6e1a2b0079 100644
--- a/src/adaptation/icap/ServiceRep.h
+++ b/src/adaptation/icap/ServiceRep.h
@@ -32,14 +32,14 @@
 #ifndef SQUID_ICAPSERVICEREP_H
 #define SQUID_ICAPSERVICEREP_H
 
-#include "cbdata.h"
-#include "FadingCounter.h"
-#include "adaptation/Service.h"
 #include "adaptation/forward.h"
-#include "adaptation/Initiator.h"
 #include "adaptation/icap/Elements.h"
+#include "adaptation/Initiator.h"
+#include "adaptation/Service.h"
 #include "base/AsyncJobCalls.h"
+#include "cbdata.h"
 #include "comm.h"
+#include "FadingCounter.h"
 #include "pconn.h"
 #include <deque>
 
diff --git a/src/adaptation/icap/Xaction.h b/src/adaptation/icap/Xaction.h
index 0dd6938445..5074bb8ae0 100644
--- a/src/adaptation/icap/Xaction.h
+++ b/src/adaptation/icap/Xaction.h
@@ -32,14 +32,14 @@
 #ifndef SQUID_ICAPXACTION_H
 #define SQUID_ICAPXACTION_H
 
-#include "comm/forward.h"
-#include "CommCalls.h"
-#include "MemBuf.h"
+#include "AccessLogEntry.h"
 #include "adaptation/icap/ServiceRep.h"
 #include "adaptation/Initiate.h"
-#include "AccessLogEntry.h"
+#include "comm/forward.h"
+#include "CommCalls.h"
 #include "HttpReply.h"
 #include "ipcache.h"
+#include "MemBuf.h"
 
 class CommConnectCbParams;
 namespace Comm
diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc
index a3dfe922ed..7a1f4d93a4 100644
--- a/src/adaptation/icap/icap_log.cc
+++ b/src/adaptation/icap/icap_log.cc
@@ -1,9 +1,9 @@
 #include "squid.h"
-#include "icap_log.h"
 #include "AccessLogEntry.h"
 #include "acl/FilledChecklist.h"
-#include "HttpReply.h"
 #include "globals.h"
+#include "HttpReply.h"
+#include "icap_log.h"
 #include "log/CustomLog.h"
 #include "log/File.h"
 #include "log/Formats.h"
diff --git a/src/auth/Acl.cc b/src/auth/Acl.cc
index 0ca048eba6..5a6736e3d6 100644
--- a/src/auth/Acl.cc
+++ b/src/auth/Acl.cc
@@ -1,9 +1,9 @@
 #include "squid.h"
 #include "acl/Acl.h"
 #include "acl/FilledChecklist.h"
-#include "auth/UserRequest.h"
 #include "auth/Acl.h"
 #include "auth/AclProxyAuth.h"
+#include "auth/UserRequest.h"
 #include "client_side.h"
 #include "HttpRequest.h"
 
diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index 1b197c0e1c..0a7072dd04 100644
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -8,10 +8,10 @@
 #include "auth/Acl.h"
 #include "auth/AclMaxUserIp.h"
 #include "auth/UserRequest.h"
-#include "Debug.h"
-#include "wordlist.h"
 #include "ConfigParser.h"
+#include "Debug.h"
 #include "Parsing.h"
+#include "wordlist.h"
 
 ACL *
 ACLMaxUserIP::clone() const
diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc
index f714fec009..0c05e5270b 100644
--- a/src/auth/AclProxyAuth.cc
+++ b/src/auth/AclProxyAuth.cc
@@ -33,16 +33,16 @@
  */
 
 #include "squid.h"
-#include "auth/AclProxyAuth.h"
-#include "auth/Gadgets.h"
 #include "acl/FilledChecklist.h"
-#include "acl/UserData.h"
 #include "acl/RegexData.h"
-#include "client_side.h"
-#include "HttpRequest.h"
+#include "acl/UserData.h"
 #include "auth/Acl.h"
+#include "auth/AclProxyAuth.h"
+#include "auth/Gadgets.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
+#include "client_side.h"
+#include "HttpRequest.h"
 
 ACLProxyAuth::~ACLProxyAuth()
 {
diff --git a/src/auth/AclProxyAuth.h b/src/auth/AclProxyAuth.h
index fb0854d02c..cdcb5aefc6 100644
--- a/src/auth/AclProxyAuth.h
+++ b/src/auth/AclProxyAuth.h
@@ -35,8 +35,8 @@
 #if USE_AUTH
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
+#include "acl/Data.h"
 
 class ProxyAuthLookup : public ACLChecklist::AsyncState
 {
diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc
index a723a6b562..8a025dc5a8 100644
--- a/src/auth/Gadgets.cc
+++ b/src/auth/Gadgets.cc
@@ -37,13 +37,13 @@
 #include "squid.h"
 #include "acl/Acl.h"
 #include "acl/FilledChecklist.h"
-#include "client_side.h"
+#include "auth/AclProxyAuth.h"
 #include "auth/Config.h"
-#include "auth/Scheme.h"
 #include "auth/Gadgets.h"
+#include "auth/Scheme.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
-#include "auth/AclProxyAuth.h"
+#include "client_side.h"
 #include "globals.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
diff --git a/src/auth/Gadgets.h b/src/auth/Gadgets.h
index 92a9e6ebe1..c01c1a42fb 100644
--- a/src/auth/Gadgets.h
+++ b/src/auth/Gadgets.h
@@ -33,10 +33,10 @@
 
 #if USE_AUTH
 
-#include "hash.h"
-#include "MemPool.h"
 #include "auth/Config.h"
 #include "auth/User.h"
+#include "hash.h"
+#include "MemPool.h"
 
 /**
  \ingroup AuthAPI
diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc
index 4a09bcfcc4..bce72370c4 100644
--- a/src/auth/Scheme.cc
+++ b/src/auth/Scheme.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "auth/Scheme.h"
-#include "auth/Gadgets.h"
 #include "auth/Config.h"
+#include "auth/Gadgets.h"
+#include "auth/Scheme.h"
 #include "globals.h"
 
 Vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;
diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h
index 1f2ed38aba..f5d22fa01f 100644
--- a/src/auth/Scheme.h
+++ b/src/auth/Scheme.h
@@ -33,8 +33,8 @@
 
 #if USE_AUTH
 
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 
 /**
  \defgroup AuthSchemeAPI	Authentication Scheme API
diff --git a/src/auth/User.cc b/src/auth/User.cc
index 95fd1d49e2..83526f966e 100644
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -32,12 +32,12 @@
  */
 
 #include "squid.h"
-#include "auth/User.h"
-#include "auth/UserRequest.h"
-#include "auth/Config.h"
-#include "auth/Gadgets.h"
 #include "acl/Acl.h"
 #include "acl/Gadgets.h"
+#include "auth/Config.h"
+#include "auth/Gadgets.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
 #include "event.h"
 #include "globals.h"
 #include "SquidConfig.h"
diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc
index 9d7761af8e..3655db1516 100644
--- a/src/auth/UserRequest.cc
+++ b/src/auth/UserRequest.cc
@@ -37,8 +37,8 @@
 #include "squid.h"
 #include "auth/Config.h"
 #include "auth/Scheme.h"
-#include "auth/UserRequest.h"
 #include "auth/User.h"
+#include "auth/UserRequest.h"
 #include "client_side.h"
 #include "comm/Connection.h"
 #include "HttpReply.h"
diff --git a/src/auth/UserRequest.h b/src/auth/UserRequest.h
index beed1b9942..0bdebdfe4e 100644
--- a/src/auth/UserRequest.h
+++ b/src/auth/UserRequest.h
@@ -36,9 +36,9 @@
 #include "auth/Scheme.h"
 #include "auth/User.h"
 #include "dlink.h"
-#include "ip/Address.h"
 #include "helper.h"
 #include "HttpHeader.h"
+#include "ip/Address.h"
 
 class ConnStateData;
 class HttpReply;
diff --git a/src/auth/basic/Scheme.h b/src/auth/basic/Scheme.h
index 607058987a..bbd217742b 100644
--- a/src/auth/basic/Scheme.h
+++ b/src/auth/basic/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_BASIC_SCHEME_H
 #define SQUID_AUTH_BASIC_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/basic/auth_basic.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {
diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 71002efeab..7ece07ed63 100644
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -43,14 +43,14 @@
 #include "auth/State.h"
 #include "cache_cf.h"
 #include "charset.h"
-#include "mgr/Registration.h"
-#include "Store.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
+#include "mgr/Registration.h"
 #include "rfc1738.h"
+#include "SquidTime.h"
+#include "Store.h"
 #include "uudecode.h"
 #include "wordlist.h"
-#include "SquidTime.h"
 
 /* Basic Scheme */
 static AUTHSSTATS authenticateBasicStats;
diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index 3e10b21f6d..0c2e6a4b87 100644
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -6,9 +6,9 @@
 #ifndef __AUTH_BASIC_H__
 #define __AUTH_BASIC_H__
 
+#include "auth/Config.h"
 #include "auth/Gadgets.h"
 #include "auth/UserRequest.h"
-#include "auth/Config.h"
 #include "helper.h"
 
 #define DefaultAuthenticateChildrenMax  32	/* 32 processes */
diff --git a/src/auth/digest/Scheme.h b/src/auth/digest/Scheme.h
index 30e2f4dbb4..6b34665772 100644
--- a/src/auth/digest/Scheme.h
+++ b/src/auth/digest/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_DIGEST_SCHEME_H
 #define SQUID_AUTH_DIGEST_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/digest/auth_digest.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {
diff --git a/src/auth/digest/UserRequest.h b/src/auth/digest/UserRequest.h
index 6c328ed933..55787a2837 100644
--- a/src/auth/digest/UserRequest.h
+++ b/src/auth/digest/UserRequest.h
@@ -1,8 +1,8 @@
 #ifndef _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H
 #define _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H
 
-#include "auth/UserRequest.h"
 #include "auth/digest/auth_digest.h"
+#include "auth/UserRequest.h"
 #include "MemPool.h"
 
 class ConnStateData;
diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index f9609c842a..b1a3237920 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -35,25 +35,25 @@
  * See acl.c for access control and client_side.c for auditing */
 
 #include "squid.h"
-#include "cache_cf.h"
-#include "rfc2617.h"
 #include "auth/digest/auth_digest.h"
 #include "auth/digest/Scheme.h"
 #include "auth/digest/User.h"
 #include "auth/digest/UserRequest.h"
 #include "auth/Gadgets.h"
 #include "auth/State.h"
-#include "base64.h"
 #include "base/StringArea.h"
+#include "base64.h"
+#include "cache_cf.h"
 #include "event.h"
 #include "HttpHeaderTools.h"
-#include "mgr/Registration.h"
-#include "Store.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
-#include "wordlist.h"
+#include "HttpRequest.h"
+#include "mgr/Registration.h"
+#include "rfc2617.h"
 #include "SquidTime.h"
+#include "Store.h"
 #include "StrList.h"
+#include "wordlist.h"
 
 /* Digest Scheme */
 
diff --git a/src/auth/negotiate/Scheme.h b/src/auth/negotiate/Scheme.h
index c4bfa2ebb0..9b48254861 100644
--- a/src/auth/negotiate/Scheme.h
+++ b/src/auth/negotiate/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_NEGOTIATE_SCHEME_H
 #define SQUID_AUTH_NEGOTIATE_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/negotiate/auth_negotiate.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {
diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index dd0b75f114..2455e6f2cb 100644
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -35,20 +35,20 @@
  * See acl.c for access control and client_side.c for auditing */
 
 #include "squid.h"
-#include "auth/negotiate/auth_negotiate.h"
 #include "auth/Gadgets.h"
+#include "auth/negotiate/auth_negotiate.h"
+#include "auth/negotiate/Scheme.h"
+#include "auth/negotiate/User.h"
+#include "auth/negotiate/UserRequest.h"
 #include "auth/State.h"
 #include "cache_cf.h"
-#include "mgr/Registration.h"
-#include "Store.h"
 #include "client_side.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
+#include "mgr/Registration.h"
 #include "SquidTime.h"
-#include "auth/negotiate/Scheme.h"
-#include "auth/negotiate/User.h"
-#include "auth/negotiate/UserRequest.h"
+#include "Store.h"
 #include "wordlist.h"
 
 /**
diff --git a/src/auth/ntlm/Scheme.h b/src/auth/ntlm/Scheme.h
index 9bab40109c..034ff07bb3 100644
--- a/src/auth/ntlm/Scheme.h
+++ b/src/auth/ntlm/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_NTLM_SCHEME_H
 #define SQUID_AUTH_NTLM_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/ntlm/auth_ntlm.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {
diff --git a/src/auth/ntlm/UserRequest.h b/src/auth/ntlm/UserRequest.h
index 396e86038c..b353c416c7 100644
--- a/src/auth/ntlm/UserRequest.h
+++ b/src/auth/ntlm/UserRequest.h
@@ -1,8 +1,8 @@
 #ifndef _SQUID_SRC_AUTH_NTLM_USERREQUEST_H
 #define _SQUID_SRC_AUTH_NTLM_USERREQUEST_H
 
-#include "auth/UserRequest.h"
 #include "auth/ntlm/auth_ntlm.h"
+#include "auth/UserRequest.h"
 #include "MemPool.h"
 
 class ConnStateData;
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 34b1478c81..4515183e3b 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -42,14 +42,14 @@
 #include "auth/ntlm/UserRequest.h"
 #include "auth/State.h"
 #include "cache_cf.h"
-#include "mgr/Registration.h"
-#include "Store.h"
 #include "client_side.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "wordlist.h"
+#include "mgr/Registration.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "wordlist.h"
 
 /* NTLM Scheme */
 static AUTHSSTATS authenticateNTLMStats;
diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index b19e1c8569..04c0c43c7d 100644
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -5,9 +5,9 @@
 
 #ifndef __AUTH_NTLM_H__
 #define __AUTH_NTLM_H__
+#include "auth/Config.h"
 #include "auth/Gadgets.h"
 #include "auth/UserRequest.h"
-#include "auth/Config.h"
 #include "helper.h"
 
 #define DefaultAuthenticateChildrenMax  32	/* 32 processes */
diff --git a/src/base/AsyncCallQueue.cc b/src/base/AsyncCallQueue.cc
index a058f8db46..58be965b53 100644
--- a/src/base/AsyncCallQueue.cc
+++ b/src/base/AsyncCallQueue.cc
@@ -5,8 +5,8 @@
  */
 
 #include "squid.h"
-#include "base/AsyncCallQueue.h"
 #include "base/AsyncCall.h"
+#include "base/AsyncCallQueue.h"
 #include "Debug.h"
 
 AsyncCallQueue *AsyncCallQueue::TheInstance = 0;
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 330412ca2a..667b7b3b82 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -42,10 +42,9 @@
 #include "anyp/PortCfg.h"
 #include "AuthReg.h"
 #include "base/RunnersRegistry.h"
-#include "mgr/ActionPasswordList.h"
+#include "cache_cf.h"
 #include "CachePeer.h"
 #include "CachePeerDomainList.h"
-#include "cache_cf.h"
 #include "ConfigParser.h"
 #include "CpuAffinityMap.h"
 #include "DiskIO/DiskIOModule.h"
@@ -64,7 +63,9 @@
 #include "log/CustomLog.h"
 #include "Mem.h"
 #include "MemBuf.h"
+#include "mgr/ActionPasswordList.h"
 #include "mgr/Registration.h"
+#include "neighbors.h"
 #include "NeighborTypeDomainList.h"
 #include "Parsing.h"
 #include "PeerDigest.h"
@@ -76,10 +77,9 @@
 #include "Store.h"
 #include "StoreFileSystem.h"
 #include "SwapDir.h"
-#include "wordlist.h"
-#include "neighbors.h"
 #include "tools.h"
 #include "URLScheme.h"
+#include "wordlist.h"
 /* wccp2 has its own conditional definitions */
 #include "wccp2.h"
 #if USE_ADAPTATION
@@ -92,8 +92,8 @@
 #include "adaptation/ecap/Config.h"
 #endif
 #if USE_SSL
-#include "ssl/support.h"
 #include "ssl/Config.h"
+#include "ssl/support.h"
 #endif
 #if USE_AUTH
 #include "auth/Config.h"
@@ -1648,8 +1648,8 @@ free_acl_b_size_t(AclSizeLimit ** head)
 
 #if USE_DELAY_POOLS
 
-#include "DelayPools.h"
 #include "DelayConfig.h"
+#include "DelayPools.h"
 /* do nothing - free_delay_pool_count is the magic free function.
  * this is why delay_pool_count isn't just marked TYPE: u_short
  */
diff --git a/src/cache_manager.cc b/src/cache_manager.cc
index 9d881b5cf4..66976cd916 100644
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@ -32,7 +32,6 @@
 
 #include "squid.h"
 #include "base/TextException.h"
-#include "mgr/ActionPasswordList.h"
 #include "CacheManager.h"
 #include "comm/Connection.h"
 #include "Debug.h"
@@ -40,8 +39,9 @@
 #include "fde.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "mgr/ActionCreator.h"
 #include "mgr/Action.h"
+#include "mgr/ActionCreator.h"
+#include "mgr/ActionPasswordList.h"
 #include "mgr/ActionProfile.h"
 #include "mgr/BasicActions.h"
 #include "mgr/Command.h"
@@ -49,10 +49,10 @@
 #include "mgr/FunAction.h"
 #include "mgr/QueryParams.h"
 #include "protos.h"
-#include "tools.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "tools.h"
 #include "wordlist.h"
 
 #include <algorithm>
diff --git a/src/clientStream.cc b/src/clientStream.cc
index 3624e39f80..6452835a34 100644
--- a/src/clientStream.cc
+++ b/src/clientStream.cc
@@ -32,10 +32,10 @@
  */
 
 #include "squid.h"
+#include "client_side_request.h"
 #include "clientStream.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "client_side_request.h"
 
 /**
  \defgroup ClientStreamInternal Client Streams Internals
diff --git a/src/client_db.cc b/src/client_db.cc
index fb737b21e7..1f6eb6ebf6 100644
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "client_db.h"
+#include "ClientInfo.h"
 #include "event.h"
 #include "format/Token.h"
-#include "ClientInfo.h"
 #include "fqdncache.h"
 #include "ip/Address.h"
 #include "log/access_log.h"
diff --git a/src/client_side.cc b/src/client_side.cc
index 1f402207b7..24c8147e37 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -86,9 +86,9 @@
 #include "CachePeer.h"
 #include "ChunkedCodingParser.h"
 #include "client_db.h"
+#include "client_side.h"
 #include "client_side_reply.h"
 #include "client_side_request.h"
-#include "client_side.h"
 #include "ClientRequestContext.h"
 #include "clientStream.h"
 #include "comm.h"
@@ -136,16 +136,16 @@
 #include "ClientInfo.h"
 #endif
 #if USE_SSL
-#include "ssl/ProxyCerts.h"
 #include "ssl/context_storage.h"
+#include "ssl/gadgets.h"
 #include "ssl/helper.h"
+#include "ssl/ProxyCerts.h"
 #include "ssl/ServerBump.h"
 #include "ssl/support.h"
-#include "ssl/gadgets.h"
 #endif
 #if USE_SSL_CRTD
-#include "ssl/crtd_message.h"
 #include "ssl/certificate_db.h"
+#include "ssl/crtd_message.h"
 #endif
 
 #if HAVE_LIMITS_H
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 0f6a39b5b1..ee815d0c4c 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -43,10 +43,10 @@
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
 #include "anyp/PortCfg.h"
-#include "ClientRequestContext.h"
 #include "client_side.h"
 #include "client_side_reply.h"
 #include "client_side_request.h"
+#include "ClientRequestContext.h"
 #include "clientStream.h"
 #include "comm/Connection.h"
 #include "comm/Write.h"
@@ -62,8 +62,8 @@
 #include "HttpHdrCc.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "ipcache.h"
 #include "ip/QosConfig.h"
+#include "ipcache.h"
 #include "log/access_log.h"
 #include "MemObject.h"
 #include "Parsing.h"
@@ -89,8 +89,8 @@
 #endif
 #endif
 #if USE_SSL
-#include "ssl/support.h"
 #include "ssl/ServerBump.h"
+#include "ssl/support.h"
 #endif
 
 #if LINGERING_CLOSE
diff --git a/src/client_side_request.h b/src/client_side_request.h
index 509d9a1934..e4744ab8de 100644
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -30,10 +30,10 @@
 #ifndef SQUID_CLIENTSIDEREQUEST_H
 #define SQUID_CLIENTSIDEREQUEST_H
 
-#include "acl/forward.h"
 #include "AccessLogEntry.h"
-#include "clientStream.h"
+#include "acl/forward.h"
 #include "client_side.h"
+#include "clientStream.h"
 #include "HttpHeaderRange.h"
 #include "LogTags.h"
 
@@ -205,8 +205,8 @@ void clientAccessCheck(ClientHttpRequest *);
 void tunnelStart(ClientHttpRequest *, int64_t *, int *, const AccessLogEntry::Pointer &al);
 
 #if _USE_INLINE_
-#include "Store.h"
 #include "client_side_request.cci"
+#include "Store.h"
 #endif
 
 #endif /* SQUID_CLIENTSIDEREQUEST_H */
diff --git a/src/comm.cc b/src/comm.cc
index dd9d5717a5..017a4c3315 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -39,8 +39,8 @@
 #include "comm/Connection.h"
 #include "comm/IoCallback.h"
 #include "comm/Loops.h"
-#include "comm/Write.h"
 #include "comm/TcpAcceptor.h"
+#include "comm/Write.h"
 #include "CommRead.h"
 #include "compat/cmsg.h"
 #include "DescriptorSet.h"
diff --git a/src/comm.h b/src/comm.h
index 571c1b310e..8c5b04ea91 100644
--- a/src/comm.h
+++ b/src/comm.h
@@ -1,8 +1,8 @@
 #ifndef __COMM_H__
 #define __COMM_H__
 
-#include "CommCalls.h"
 #include "comm/IoCallback.h"
+#include "CommCalls.h"
 #include "StoreIOBuffer.h"
 
 namespace Ip
diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 4c95f37b19..c2913dbc55 100644
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -4,16 +4,16 @@
 
 #include "squid.h"
 #include "CachePeer.h"
-#include "comm/ConnOpener.h"
+#include "comm.h"
 #include "comm/Connection.h"
+#include "comm/ConnOpener.h"
 #include "comm/Loops.h"
-#include "comm.h"
 #include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "icmp/net_db.h"
-#include "ipcache.h"
 #include "ip/tools.h"
+#include "ipcache.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 
diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h
index f4dce459de..003b474908 100644
--- a/src/comm/ConnOpener.h
+++ b/src/comm/ConnOpener.h
@@ -4,9 +4,9 @@
 #include "base/AsyncCall.h"
 #include "base/AsyncJob.h"
 #include "cbdata.h"
-#include "CommCalls.h"
-#include "comm_err_t.h"
 #include "comm/forward.h"
+#include "comm_err_t.h"
+#include "CommCalls.h"
 
 namespace Comm
 {
diff --git a/src/comm/ModSelect.cc b/src/comm/ModSelect.cc
index 81e8a29839..47c8225669 100644
--- a/src/comm/ModSelect.cc
+++ b/src/comm/ModSelect.cc
@@ -39,11 +39,11 @@
 #include "globals.h"
 #include "ICP.h"
 #include "mgr/Registration.h"
+#include "SquidConfig.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 #include "StatHist.h"
 #include "Store.h"
-#include "SquidConfig.h"
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 33cf3fbd7f..d0d3709c31 100644
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -37,11 +37,11 @@
 #include "base/TextException.h"
 #include "client_db.h"
 #include "comm/AcceptLimiter.h"
-#include "CommCalls.h"
 #include "comm/comm_internal.h"
 #include "comm/Connection.h"
 #include "comm/Loops.h"
 #include "comm/TcpAcceptor.h"
+#include "CommCalls.h"
 #include "eui/Config.h"
 #include "fd.h"
 #include "fde.h"
diff --git a/src/comm/TcpAcceptor.h b/src/comm/TcpAcceptor.h
index 48aee211ee..ee3b392cd1 100644
--- a/src/comm/TcpAcceptor.h
+++ b/src/comm/TcpAcceptor.h
@@ -4,8 +4,8 @@
 #include "base/AsyncJob.h"
 #include "base/CbcPointer.h"
 #include "base/Subscription.h"
-#include "comm_err_t.h"
 #include "comm/forward.h"
+#include "comm_err_t.h"
 
 namespace Comm
 {
diff --git a/src/comm/forward.h b/src/comm/forward.h
index 104d7a7820..711c546814 100644
--- a/src/comm/forward.h
+++ b/src/comm/forward.h
@@ -1,8 +1,8 @@
 #ifndef _SQUID_COMM_FORWARD_H
 #define _SQUID_COMM_FORWARD_H
 
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 
 namespace Comm
 {
diff --git a/src/debug.cc b/src/debug.cc
index 7320fe9ad3..ec3a998771 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "Debug.h"
+#include "ipc/Kids.h"
 #include "SquidTime.h"
 #include "util.h"
-#include "ipc/Kids.h"
 
 /* for shutting_down flag in xassert() */
 #include "globals.h"
diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index bcc6ad7691..96489686eb 100644
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -63,8 +63,8 @@
 #include "NullDelayId.h"
 #include "SquidString.h"
 #include "SquidTime.h"
-#include "StoreClient.h"
 #include "Store.h"
+#include "StoreClient.h"
 
 /// \ingroup DelayPoolsInternal
 long DelayPools::MemoryUsed = 0;
diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 4122a1dbb0..fd3c43facd 100644
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "base/InstanceId.h"
+#include "comm.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
-#include "comm.h"
 #include "comm/Loops.h"
 #include "comm/Write.h"
 #include "dlink.h"
diff --git a/src/errorpage.cc b/src/errorpage.cc
index edea909c66..65b92ac247 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -36,21 +36,21 @@
 #include "disk.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
+#include "fde.h"
 #include "ftp.h"
-#include "Store.h"
 #include "html_quote.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "MemObject.h"
-#include "fde.h"
 #include "MemBuf.h"
+#include "MemObject.h"
 #include "rfc1738.h"
 #include "SquidConfig.h"
+#include "Store.h"
+#include "tools.h"
 #include "URL.h"
-#include "URLScheme.h"
 #include "URL.h"
-#include "tools.h"
+#include "URLScheme.h"
 #include "wordlist.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"
diff --git a/src/esi/Context.cc b/src/esi/Context.cc
index 4b321afd46..870c33bd16 100644
--- a/src/esi/Context.cc
+++ b/src/esi/Context.cc
@@ -38,9 +38,9 @@
  */
 #if (USE_SQUID_ESI == 1)
 
+#include "client_side_request.h"
 #include "esi/Context.h"
 #include "Store.h"
-#include "client_side_request.h"
 
 void
 ESIContext::updateCachedAST()
diff --git a/src/esi/Context.h b/src/esi/Context.h
index 7f8012dfbd..801de17318 100644
--- a/src/esi/Context.h
+++ b/src/esi/Context.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ESICONTEXT_H
 #define SQUID_ESICONTEXT_H
 
-#include "esi/Parser.h"
-#include "esi/Element.h"
 #include "clientStream.h"
 #include "err_type.h"
+#include "esi/Element.h"
+#include "esi/Parser.h"
 #include "http/StatusCode.h"
 
 class ESIVarState;
diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
index effb2a6465..8f632ca79f 100644
--- a/src/esi/CustomParser.cc
+++ b/src/esi/CustomParser.cc
@@ -33,8 +33,8 @@
 
 #include "squid.h"
 #include "base/Vector.h"
-#include "esi/CustomParser.h"
 #include "Debug.h"
+#include "esi/CustomParser.h"
 #include "libTrie/Trie.h"
 #include "libTrie/TrieCharTransform.h"
 
diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index 480453d54f..bfdd18ddc3 100644
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -38,8 +38,8 @@
  */
 #if (USE_SQUID_ESI == 1)
 
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "clientStream.h"
 #include "comm/Connection.h"
 #include "errorpage.h"
diff --git a/src/esi/Include.cc b/src/esi/Include.cc
index 46d441a1d5..120f71beff 100644
--- a/src/esi/Include.cc
+++ b/src/esi/Include.cc
@@ -39,8 +39,8 @@
  */
 #if (USE_SQUID_ESI == 1)
 
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "esi/Include.h"
 #include "esi/VarState.h"
 #include "HttpReply.h"
diff --git a/src/esi/Module.cc b/src/esi/Module.cc
index 64da18979a..abeb1f9417 100644
--- a/src/esi/Module.cc
+++ b/src/esi/Module.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "esi/Module.h"
 #include "esi/CustomParser.h"
 #include "esi/Libxml2Parser.h"
+#include "esi/Module.h"
 /* include for esi/ExpatParser.h must follow esi/Libxml2Parser.h */
 /* do not remove this comment, as it acts as barrier for the autmatic sorting */
 #include "esi/ExpatParser.h"
diff --git a/src/esi/Sequence.cc b/src/esi/Sequence.cc
index 75c794d8a5..94b373f0d6 100644
--- a/src/esi/Sequence.cc
+++ b/src/esi/Sequence.cc
@@ -40,10 +40,10 @@
  */
 #if (USE_SQUID_ESI == 1)
 
-#include "esi/Sequence.h"
-#include "esi/Literal.h"
 #include "esi/Attempt.h"
 #include "esi/Except.h"
+#include "esi/Literal.h"
+#include "esi/Sequence.h"
 
 class esiExcept;
 
diff --git a/src/esi/VarState.h b/src/esi/VarState.h
index 0a538fb494..7a00daf244 100644
--- a/src/esi/VarState.h
+++ b/src/esi/VarState.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ESIVARSTATE_H
 #define SQUID_ESIVARSTATE_H
 
-#include "esi/Segment.h"
-#include "libTrie/Trie.h"
 #include "base/Vector.h"
+#include "esi/Segment.h"
 #include "HttpHeader.h"
+#include "libTrie/Trie.h"
 
 class HttpReply;
 
diff --git a/src/event.cc b/src/event.cc
index a812705904..12db66a9b8 100644
--- a/src/event.cc
+++ b/src/event.cc
@@ -34,9 +34,9 @@
 #include "compat/drand48.h"
 #include "event.h"
 #include "mgr/Registration.h"
-#include "Store.h"
-#include "SquidTime.h"
 #include "profiler/Profiler.h"
+#include "SquidTime.h"
+#include "Store.h"
 #include "tools.h"
 
 /* The list of event processes */
diff --git a/src/event.h b/src/event.h
index e35460d448..ed66a9e0cf 100644
--- a/src/event.h
+++ b/src/event.h
@@ -32,8 +32,8 @@
 #ifndef SQUID_EVENT_H
 #define SQUID_EVENT_H
 
-#include "base/Vector.h"
 #include "AsyncEngine.h"
+#include "base/Vector.h"
 #include "MemPool.h"
 
 class StoreEntry;
diff --git a/src/format/Config.cc b/src/format/Config.cc
index cb955a0bd8..c0cfb2fc98 100644
--- a/src/format/Config.cc
+++ b/src/format/Config.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "ConfigParser.h"
 #include "cache_cf.h"
+#include "ConfigParser.h"
 #include "Debug.h"
 #include "format/Config.h"
 #include <list>
diff --git a/src/fs/rock/RockIoState.cc b/src/fs/rock/RockIoState.cc
index a682fb5128..8190f28e9c 100644
--- a/src/fs/rock/RockIoState.cc
+++ b/src/fs/rock/RockIoState.cc
@@ -3,15 +3,15 @@
  */
 
 #include "squid.h"
-#include "MemObject.h"
-#include "Parsing.h"
 #include "DiskIO/DiskIOModule.h"
 #include "DiskIO/DiskIOStrategy.h"
 #include "DiskIO/WriteRequest.h"
-#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockIoRequests.h"
+#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockSwapDir.h"
 #include "globals.h"
+#include "MemObject.h"
+#include "Parsing.h"
 
 Rock::IoState::IoState(SwapDir *dir,
                        StoreEntry *anEntry,
diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc
index 8f07ded9d9..aca7d89059 100644
--- a/src/fs/rock/RockRebuild.cc
+++ b/src/fs/rock/RockRebuild.cc
@@ -4,15 +4,15 @@
 
 #include "squid.h"
 #include "disk.h"
+#include "fs/rock/RockDbCell.h"
 #include "fs/rock/RockRebuild.h"
 #include "fs/rock/RockSwapDir.h"
-#include "fs/rock/RockDbCell.h"
 #include "globals.h"
 #include "md5.h"
-#include "tools.h"
-#include "typedefs.h"
 #include "SquidTime.h"
 #include "store_rebuild.h"
+#include "tools.h"
+#include "typedefs.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>
diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index 7f4526b367..88183253c1 100644
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -9,10 +9,10 @@
 #include "DiskIO/DiskIOStrategy.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "fs/rock/RockSwapDir.h"
-#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockIoRequests.h"
+#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockRebuild.h"
+#include "fs/rock/RockSwapDir.h"
 #include "globals.h"
 #include "ipc/mem/Pages.h"
 #include "MemObject.h"
diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h
index 165fa2cfc1..00cb22ca87 100644
--- a/src/fs/rock/RockSwapDir.h
+++ b/src/fs/rock/RockSwapDir.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_FS_ROCK_SWAP_DIR_H
 #define SQUID_FS_ROCK_SWAP_DIR_H
 
-#include "SwapDir.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskIO/IORequestor.h"
 #include "fs/rock/RockDbCell.h"
 #include "ipc/StoreMap.h"
+#include "SwapDir.h"
 
 class DiskIOStrategy;
 class ReadRequest;
diff --git a/src/fs/ufs/RebuildState.h b/src/fs/ufs/RebuildState.h
index 6a89e055d4..9c20e01ecb 100644
--- a/src/fs/ufs/RebuildState.h
+++ b/src/fs/ufs/RebuildState.h
@@ -31,9 +31,9 @@
 #define SQUID_FS_UFS_REBUILDSTATE_H
 
 #include "base/RefCount.h"
+#include "store_rebuild.h"
 #include "UFSSwapDir.h"
 #include "UFSSwapLogParser.h"
-#include "store_rebuild.h"
 
 class StoreEntry;
 
diff --git a/src/fs/ufs/UFSStoreState.cc b/src/fs/ufs/UFSStoreState.cc
index a6c4708571..5a5b9e2fe3 100644
--- a/src/fs/ufs/UFSStoreState.cc
+++ b/src/fs/ufs/UFSStoreState.cc
@@ -32,16 +32,16 @@
  */
 
 #include "squid.h"
-#include "Store.h"
-#include "Generic.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskIO/DiskIOStrategy.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
+#include "Generic.h"
 #include "SquidList.h"
+#include "Store.h"
 #include "SwapDir.h"
-#include "UFSStrategy.h"
 #include "UFSStoreState.h"
+#include "UFSStrategy.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,UFSStoreState);
 
diff --git a/src/fs/ufs/UFSStrategy.cc b/src/fs/ufs/UFSStrategy.cc
index fd3517440e..5df2477c0f 100644
--- a/src/fs/ufs/UFSStrategy.cc
+++ b/src/fs/ufs/UFSStrategy.cc
@@ -32,8 +32,8 @@
 #include "squid.h"
 
 #include "DiskIO/DiskIOStrategy.h"
-#include "UFSStrategy.h"
 #include "UFSStoreState.h"
+#include "UFSStrategy.h"
 #include "UFSSwapDir.h"
 
 bool
diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc
index 9a1094d7dd..39e114573f 100644
--- a/src/fs/ufs/UFSSwapDir.cc
+++ b/src/fs/ufs/UFSSwapDir.cc
@@ -33,22 +33,22 @@
 
 #include "squid.h"
 #include "cache_cf.h"
-#include "disk.h"
 #include "ConfigOption.h"
+#include "disk.h"
 #include "DiskIO/DiskIOModule.h"
-#include "FileMap.h"
+#include "DiskIO/DiskIOStrategy.h"
 #include "fde.h"
+#include "FileMap.h"
 #include "globals.h"
 #include "Parsing.h"
 #include "RebuildState.h"
+#include "SquidConfig.h"
 #include "SquidMath.h"
-#include "DiskIO/DiskIOStrategy.h"
+#include "SquidTime.h"
+#include "StatCounters.h"
 #include "store_key_md5.h"
 #include "StoreSearchUFS.h"
 #include "StoreSwapLogData.h"
-#include "SquidConfig.h"
-#include "SquidTime.h"
-#include "StatCounters.h"
 #include "tools.h"
 #include "UFSSwapDir.h"
 
diff --git a/src/fs/ufs/UFSSwapDir.h b/src/fs/ufs/UFSSwapDir.h
index 3132e37bc5..dc6776e5e7 100644
--- a/src/fs/ufs/UFSSwapDir.h
+++ b/src/fs/ufs/UFSSwapDir.h
@@ -33,8 +33,8 @@
 #include "Store.h"
 #include "StoreIOState.h"
 #include "StoreSearch.h"
-#include "SwapDir.h"
 #include "swap_log_op.h"
+#include "SwapDir.h"
 #include "UFSStrategy.h"
 
 class HttpRequest;
diff --git a/src/helper.h b/src/helper.h
index 34dfd8465e..cc865e93d8 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -37,9 +37,9 @@
 #include "cbdata.h"
 #include "comm/forward.h"
 #include "dlink.h"
-#include "ip/Address.h"
 #include "HelperChildConfig.h"
 #include "HelperReply.h"
+#include "ip/Address.h"
 
 class helper_request;
 
diff --git a/src/htcp.cc b/src/htcp.cc
index 6f6f1fd7ce..4ad6678bac 100644
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -54,8 +54,8 @@
 #include "SquidConfig.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
-#include "store_key_md5.h"
 #include "Store.h"
+#include "store_key_md5.h"
 #include "StoreClient.h"
 #include "tools.h"
 #include "URL.h"
diff --git a/src/http.cc b/src/http.cc
index 7807094863..9a8f6ddf16 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -36,9 +36,9 @@
 
 #include "squid.h"
 #include "acl/FilledChecklist.h"
-#include "base64.h"
 #include "base/AsyncJobCalls.h"
 #include "base/TextException.h"
+#include "base64.h"
 #include "CachePeer.h"
 #include "ChunkedCodingParser.h"
 #include "client_side.h"
@@ -49,8 +49,8 @@
 #include "fd.h"
 #include "fde.h"
 #include "globals.h"
-#include "HttpControlMsg.h"
 #include "http.h"
+#include "HttpControlMsg.h"
 #include "HttpHdrCc.h"
 #include "HttpHdrContRange.h"
 #include "HttpHdrSc.h"
diff --git a/src/icmp/Icmp.cc b/src/icmp/Icmp.cc
index 1346a286b5..422b99fdd0 100644
--- a/src/icmp/Icmp.cc
+++ b/src/icmp/Icmp.cc
@@ -30,9 +30,9 @@
  *
  */
 #include "squid.h"
+#include "Debug.h"
 #include "Icmp.h"
 #include "SquidTime.h"
-#include "Debug.h"
 
 Icmp::Icmp()
 {
diff --git a/src/icmp/Icmp4.cc b/src/icmp/Icmp4.cc
index a983cca1ca..3b79d2116f 100644
--- a/src/icmp/Icmp4.cc
+++ b/src/icmp/Icmp4.cc
@@ -35,11 +35,11 @@
 
 #if USE_ICMP
 
-#include "leakcheck.h"
-#include "SquidTime.h"
+#include "Debug.h"
 #include "Icmp4.h"
 #include "IcmpPinger.h"
-#include "Debug.h"
+#include "leakcheck.h"
+#include "SquidTime.h"
 
 const char *icmpPktStr[] = {
     "Echo Reply",
diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc
index 7b4bde6ec7..6e8cab1eb2 100644
--- a/src/icmp/Icmp6.cc
+++ b/src/icmp/Icmp6.cc
@@ -35,11 +35,11 @@
 
 #if USE_ICMP
 
-#include "leakcheck.h"
-#include "SquidTime.h"
 #include "Debug.h"
 #include "Icmp6.h"
 #include "IcmpPinger.h"
+#include "leakcheck.h"
+#include "SquidTime.h"
 
 // Some system headers are only neeed internally here.
 // They should not be included via the header.
diff --git a/src/icmp/IcmpPinger.cc b/src/icmp/IcmpPinger.cc
index e230fb332e..e49c69b8cd 100644
--- a/src/icmp/IcmpPinger.cc
+++ b/src/icmp/IcmpPinger.cc
@@ -36,11 +36,11 @@
 
 #if USE_ICMP
 
-#include "SquidTime.h"
-#include "IcmpPinger.h"
+#include "Debug.h"
 #include "Icmp4.h"
 #include "Icmp6.h"
-#include "Debug.h"
+#include "IcmpPinger.h"
+#include "SquidTime.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>
diff --git a/src/icp_v3.cc b/src/icp_v3.cc
index 5bfe8680a1..41f87ab6f0 100644
--- a/src/icp_v3.cc
+++ b/src/icp_v3.cc
@@ -36,9 +36,9 @@
  */
 
 #include "squid.h"
-#include "Store.h"
-#include "ICP.h"
 #include "HttpRequest.h"
+#include "ICP.h"
+#include "Store.h"
 
 /// \ingroup ServerProtocolICPInternal3
 class ICP3State : public ICPState, public StoreClient
diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc
index 3f15b8700b..1f90afebec 100644
--- a/src/ident/Ident.cc
+++ b/src/ident/Ident.cc
@@ -35,8 +35,8 @@
 #include "comm.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
-#include "CommCalls.h"
 #include "comm/Write.h"
+#include "CommCalls.h"
 #include "globals.h"
 #include "ident/Config.h"
 #include "ident/Ident.h"
diff --git a/src/internal.cc b/src/internal.cc
index 15d388877d..a9c51c2008 100644
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -35,13 +35,13 @@
 #include "CacheManager.h"
 #include "comm/Connection.h"
 #include "errorpage.h"
-#include "icmp/net_db.h"
-#include "Store.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
+#include "icmp/net_db.h"
 #include "MemBuf.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
 #include "tools.h"
 #include "URL.h"
 #include "wordlist.h"
diff --git a/src/ip/Address.cc b/src/ip/Address.cc
index 693319f045..774e21431d 100644
--- a/src/ip/Address.cc
+++ b/src/ip/Address.cc
@@ -4,8 +4,8 @@
  * COPYRIGHT: GPL version 2, (C)2007-2013 Treehouse Networks Ltd.
  */
 #include "squid.h"
-#include "compat/inet_ntop.h"
 #include "compat/getaddrinfo.h"
+#include "compat/inet_ntop.h"
 #include "Debug.h"
 #include "ip/Address.h"
 #include "ip/tools.h"
diff --git a/src/ip/Intercept.cc b/src/ip/Intercept.cc
index 0bf0d7a569..8e00276b64 100644
--- a/src/ip/Intercept.cc
+++ b/src/ip/Intercept.cc
@@ -32,8 +32,8 @@
  */
 #include "squid.h"
 #include "comm/Connection.h"
-#include "ip/Intercept.h"
 #include "fde.h"
+#include "ip/Intercept.h"
 #include "src/tools.h"
 
 #if IPF_TRANSPARENT
diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc
index b300a4c20d..c1a52675f3 100644
--- a/src/ip/QosConfig.cc
+++ b/src/ip/QosConfig.cc
@@ -7,8 +7,8 @@
 #include "fde.h"
 #include "globals.h"
 #include "hier_code.h"
-#include "ip/tools.h"
 #include "ip/QosConfig.h"
+#include "ip/tools.h"
 #include "Parsing.h"
 
 #if HAVE_ERRNO_H
diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc
index 4280b0b410..e8a69a0f27 100644
--- a/src/ip/testAddress.cc
+++ b/src/ip/testAddress.cc
@@ -1,9 +1,9 @@
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
 //#include "compat/getaddrinfo.h"
-#include "testAddress.h"
 #include "ip/Address.h"
 #include "ip/tools.h"
+#include "testAddress.h"
 
 #if HAVE_CSTRING
 #include <cstring>
diff --git a/src/ipc.cc b/src/ipc.cc
index 2f3f5c3c6b..94e611ec86 100644
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -37,10 +37,10 @@
 #include "globals.h"
 #include "ip/Address.h"
 #include "ipc/Kid.h"
+#include "rfc1738.h"
 #include "SquidConfig.h"
 #include "SquidIpc.h"
 #include "tools.h"
-#include "rfc1738.h"
 
 static const char *hello_string = "hi there\n";
 #define HELLO_BUF_SZ 32
diff --git a/src/ipc/Inquirer.h b/src/ipc/Inquirer.h
index c51c5423c9..3743347793 100644
--- a/src/ipc/Inquirer.h
+++ b/src/ipc/Inquirer.h
@@ -6,8 +6,8 @@
 #ifndef SQUID_IPC_INQUIRER_H
 #define SQUID_IPC_INQUIRER_H
 
-#include "base/AsyncJobCalls.h"
 #include "base/AsyncJob.h"
+#include "base/AsyncJobCalls.h"
 #include "ipc/forward.h"
 #include "ipc/Request.h"
 #include "ipc/Response.h"
diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc
index a5dfddfba3..17c1465144 100644
--- a/src/ipc/Kids.cc
+++ b/src/ipc/Kids.cc
@@ -6,8 +6,8 @@
 #include "base/TextException.h"
 #include "globals.h"
 #include "ipc/Kids.h"
-#include "tools.h"
 #include "SquidConfig.h"
+#include "tools.h"
 
 Kids TheKids;
 KidName TheKidName;
diff --git a/src/ipc/Port.cc b/src/ipc/Port.cc
index 720625f742..927252ce26 100644
--- a/src/ipc/Port.cc
+++ b/src/ipc/Port.cc
@@ -5,8 +5,8 @@
 
 #include "squid.h"
 #include "comm.h"
-#include "CommCalls.h"
 #include "comm/Connection.h"
+#include "CommCalls.h"
 #include "ipc/Port.h"
 
 const char Ipc::coordinatorAddr[] = DEFAULT_STATEDIR "/coordinator.ipc";
diff --git a/src/ipc/Port.h b/src/ipc/Port.h
index 9282f2385f..299a6c7ade 100644
--- a/src/ipc/Port.h
+++ b/src/ipc/Port.h
@@ -6,8 +6,8 @@
 #ifndef SQUID_IPC_PORT_H
 #define SQUID_IPC_PORT_H
 
-#include "SquidString.h"
 #include "ipc/UdsOp.h"
+#include "SquidString.h"
 
 namespace Ipc
 {
diff --git a/src/ipc/Queue.h b/src/ipc/Queue.h
index 6c2fecd8b7..9618b47bee 100644
--- a/src/ipc/Queue.h
+++ b/src/ipc/Queue.h
@@ -4,9 +4,9 @@
 #ifndef SQUID_IPC_QUEUE_H
 #define SQUID_IPC_QUEUE_H
 
+#include "base/InstanceId.h"
 #include "base/Vector.h"
 #include "Debug.h"
-#include "base/InstanceId.h"
 #include "ipc/AtomicWord.h"
 #include "ipc/mem/FlexibleArray.h"
 #include "ipc/mem/Pointer.h"
diff --git a/src/ipc/ReadWriteLock.cc b/src/ipc/ReadWriteLock.cc
index 14ba1b4549..855ab5bc99 100644
--- a/src/ipc/ReadWriteLock.cc
+++ b/src/ipc/ReadWriteLock.cc
@@ -3,8 +3,8 @@
  */
 
 #include "squid.h"
-#include "Store.h"
 #include "ipc/ReadWriteLock.h"
+#include "Store.h"
 
 bool
 Ipc::ReadWriteLock::lockShared()
diff --git a/src/ipc/SharedListen.cc b/src/ipc/SharedListen.cc
index 70a484805a..430617891e 100644
--- a/src/ipc/SharedListen.cc
+++ b/src/ipc/SharedListen.cc
@@ -3,16 +3,16 @@
  */
 
 #include "squid.h"
-#include "comm.h"
 #include "base/TextException.h"
+#include "comm.h"
 #include "comm/Connection.h"
 #include "globals.h"
-#include "ipc/Port.h"
-#include "ipc/Messages.h"
 #include "ipc/Kids.h"
-#include "ipc/TypedMsgHdr.h"
-#include "ipc/StartListening.h"
+#include "ipc/Messages.h"
+#include "ipc/Port.h"
 #include "ipc/SharedListen.h"
+#include "ipc/StartListening.h"
+#include "ipc/TypedMsgHdr.h"
 #include "tools.h"
 
 #include <map>
diff --git a/src/ipc/StartListening.h b/src/ipc/StartListening.h
index 5d73fdfdf6..44055c9948 100644
--- a/src/ipc/StartListening.h
+++ b/src/ipc/StartListening.h
@@ -6,11 +6,11 @@
 #ifndef SQUID_IPC_START_LISTENING_H
 #define SQUID_IPC_START_LISTENING_H
 
+#include "base/AsyncCall.h"
 #include "base/Subscription.h"
 #include "comm/forward.h"
 #include "ip/forward.h"
 #include "ipc/FdNotes.h"
-#include "base/AsyncCall.h"
 
 #if HAVE_IOSFWD
 #include <iosfwd>
diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc
index bb365513fd..41fdf6f0f9 100644
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -4,8 +4,8 @@
 
 #include "squid.h"
 #include "ipc/StoreMap.h"
-#include "store_key_md5.h"
 #include "Store.h"
+#include "store_key_md5.h"
 #include "tools.h"
 
 Ipc::StoreMap::Owner *
diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h
index fcb7f9d1a3..5497973016 100644
--- a/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_IPC_STORE_MAP_H
 #define SQUID_IPC_STORE_MAP_H
 
-#include "ipc/ReadWriteLock.h"
 #include "ipc/mem/FlexibleArray.h"
 #include "ipc/mem/Pointer.h"
+#include "ipc/ReadWriteLock.h"
 #include "typedefs.h"
 
 namespace Ipc
diff --git a/src/ipc/Strand.cc b/src/ipc/Strand.cc
index 363e706e0c..f6939b4b5e 100644
--- a/src/ipc/Strand.cc
+++ b/src/ipc/Strand.cc
@@ -6,19 +6,19 @@
 #include "squid.h"
 #include "base/Subscription.h"
 #include "base/TextException.h"
+#include "CacheManager.h"
 #include "comm/Connection.h"
 #include "globals.h"
-#include "ipc/Strand.h"
-#include "ipc/StrandCoord.h"
+#include "ipc/Kids.h"
 #include "ipc/Messages.h"
 #include "ipc/SharedListen.h"
+#include "ipc/Strand.h"
+#include "ipc/StrandCoord.h"
 #include "ipc/StrandSearch.h"
-#include "ipc/Kids.h"
+#include "mgr/Forwarder.h"
 #include "mgr/Request.h"
 #include "mgr/Response.h"
-#include "mgr/Forwarder.h"
 #include "SwapDir.h" /* XXX: scope boundary violation */
-#include "CacheManager.h"
 #if USE_DISKIO_IPCIO
 #include "DiskIO/IpcIo/IpcIoFile.h" /* XXX: scope boundary violation */
 #endif
diff --git a/src/ipc/UdsOp.cc b/src/ipc/UdsOp.cc
index 23991c2828..5f49ace375 100644
--- a/src/ipc/UdsOp.cc
+++ b/src/ipc/UdsOp.cc
@@ -4,11 +4,11 @@
  */
 
 #include "squid.h"
+#include "base/TextException.h"
 #include "comm.h"
-#include "CommCalls.h"
 #include "comm/Connection.h"
 #include "comm/Write.h"
-#include "base/TextException.h"
+#include "CommCalls.h"
 #include "ipc/UdsOp.h"
 
 Ipc::UdsOp::UdsOp(const String& pathAddr):
diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h
index 9c3b1eed13..e7278305fa 100644
--- a/src/ipc/UdsOp.h
+++ b/src/ipc/UdsOp.h
@@ -6,12 +6,12 @@
 #ifndef SQUID_IPC_ASYNCUDSOP_H
 #define SQUID_IPC_ASYNCUDSOP_H
 
-#include "SquidString.h"
 #include "base/AsyncJob.h"
 #include "cbdata.h"
 #include "comm/forward.h"
-#include "ipc/TypedMsgHdr.h"
 #include "ipc/FdNotes.h"
+#include "ipc/TypedMsgHdr.h"
+#include "SquidString.h"
 
 class CommTimeoutCbParams;
 class CommIoCbParams;
diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc
index 779db4fe96..51d65dd10c 100644
--- a/src/ipc/mem/Pages.cc
+++ b/src/ipc/mem/Pages.cc
@@ -4,8 +4,8 @@
  */
 
 #include "squid.h"
-#include "base/TextException.h"
 #include "base/RunnersRegistry.h"
+#include "base/TextException.h"
 #include "ipc/mem/PagePool.h"
 #include "ipc/mem/Pages.h"
 #include "SwapDir.h"
diff --git a/src/ipcache.cc b/src/ipcache.cc
index eab7767121..0e80859390 100644
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -31,8 +31,8 @@
  */
 
 #include "squid.h"
-#include "cbdata.h"
 #include "CacheManager.h"
+#include "cbdata.h"
 #include "dlink.h"
 #include "DnsLookupDetails.h"
 #include "event.h"
diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc
index ada83c521e..b63dc62132 100644
--- a/src/log/FormatHttpdCombined.cc
+++ b/src/log/FormatHttpdCombined.cc
@@ -32,8 +32,8 @@
 
 #include "squid.h"
 #include "AccessLogEntry.h"
-#include "format/Token.h"
 #include "format/Quoting.h"
+#include "format/Token.h"
 #include "globals.h"
 #include "HttpRequest.h"
 #include "log/File.h"
diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc
index e23fccf2c5..e03b677333 100644
--- a/src/log/ModDaemon.cc
+++ b/src/log/ModDaemon.cc
@@ -38,8 +38,8 @@
 #include "log/Config.h"
 #include "log/File.h"
 #include "log/ModDaemon.h"
-#include "SquidIpc.h"
 #include "SquidConfig.h"
+#include "SquidIpc.h"
 #include "SquidTime.h"
 
 #if HAVE_ERRNO_H
diff --git a/src/log/TcpLogger.cc b/src/log/TcpLogger.cc
index 647f623322..52593f3ed4 100644
--- a/src/log/TcpLogger.cc
+++ b/src/log/TcpLogger.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "comm.h"
-#include "comm/ConnOpener.h"
 #include "comm/Connection.h"
+#include "comm/ConnOpener.h"
 #include "comm/Loops.h"
 #include "comm/Write.h"
 #include "fde.h"
diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index cb5af0eed9..b161d7bd8e 100644
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -37,10 +37,10 @@
 #include "adaptation/Config.h"
 #endif
 #include "CachePeer.h"
-#include "errorpage.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
 #include "errorpage.h"
+#include "errorpage.h"
 #include "format/Token.h"
 #include "globals.h"
 #include "hier_code.h"
diff --git a/src/main.cc b/src/main.cc
index fc18b003dc..c5116e24fa 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -53,8 +53,8 @@
 #include "ExternalACL.h"
 #include "fd.h"
 #include "format/Token.h"
-#include "fs/Module.h"
 #include "fqdncache.h"
+#include "fs/Module.h"
 #include "FwdState.h"
 #include "globals.h"
 #include "htcp.h"
@@ -64,33 +64,33 @@
 #include "icmp/net_db.h"
 #include "ICP.h"
 #include "ident/Ident.h"
-#include "ipcache.h"
+#include "ip/tools.h"
 #include "ipc/Coordinator.h"
 #include "ipc/Kids.h"
 #include "ipc/Strand.h"
-#include "ip/tools.h"
+#include "ipcache.h"
 #include "Mem.h"
 #include "MemPool.h"
 #include "mime.h"
 #include "neighbors.h"
 #include "pconn.h"
-#include "PeerSelectState.h"
 #include "peer_sourcehash.h"
 #include "peer_userhash.h"
+#include "PeerSelectState.h"
 #include "profiler/Profiler.h"
 #include "redirect.h"
 #include "refresh.h"
 #include "send-announce.h"
-#include "store_log.h"
-#include "tools.h"
 #include "SquidConfig.h"
 #include "SquidDns.h"
 #include "SquidTime.h"
 #include "stat.h"
 #include "StatCounters.h"
-#include "StoreFileSystem.h"
 #include "Store.h"
+#include "store_log.h"
+#include "StoreFileSystem.h"
 #include "SwapDir.h"
+#include "tools.h"
 #include "unlinkd.h"
 #include "URL.h"
 #include "wccp.h"
@@ -123,8 +123,8 @@
 #include "ssl/certificate_db.h"
 #endif
 #if USE_SSL
-#include "ssl/helper.h"
 #include "ssl/context_storage.h"
+#include "ssl/helper.h"
 #endif
 #if ICAP_CLIENT
 #include "adaptation/icap/Config.h"
diff --git a/src/mem.cc b/src/mem.cc
index 3f5fe0d0e4..16e6e457be 100644
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -38,12 +38,12 @@
 #include "disk.h"
 #include "dlink.h"
 #include "event.h"
+#include "icmp/net_db.h"
 #include "md5.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "memMeter.h"
 #include "mgr/Registration.h"
-#include "icmp/net_db.h"
 #include "RegexList.h"
 #include "SquidConfig.h"
 #include "SquidList.h"
diff --git a/src/mem_node.h b/src/mem_node.h
index 214028caee..d0392fa472 100644
--- a/src/mem_node.h
+++ b/src/mem_node.h
@@ -34,8 +34,8 @@
 
 #include "defines.h"
 #include "MemPool.h"
-#include "StoreIOBuffer.h"
 #include "Range.h"
+#include "StoreIOBuffer.h"
 
 class mem_node
 {
diff --git a/src/mgr/Action.cc b/src/mgr/Action.cc
index dcb2dc88cf..4e1d2e6437 100644
--- a/src/mgr/Action.cc
+++ b/src/mgr/Action.cc
@@ -7,8 +7,8 @@
 #include "comm/Connection.h"
 #include "HttpReply.h"
 #include "ipc/Port.h"
-#include "mgr/ActionCreator.h"
 #include "mgr/Action.h"
+#include "mgr/ActionCreator.h"
 #include "mgr/ActionParams.h"
 #include "mgr/ActionProfile.h"
 #include "mgr/Command.h"
diff --git a/src/mgr/BasicActions.cc b/src/mgr/BasicActions.cc
index 8f96df20ca..19100d4a8f 100644
--- a/src/mgr/BasicActions.cc
+++ b/src/mgr/BasicActions.cc
@@ -11,8 +11,8 @@
 #include "mgr/BasicActions.h"
 #include "mgr/Registration.h"
 #include "protos.h"
-#include "Store.h"
 #include "SquidConfig.h"
+#include "Store.h"
 
 Mgr::IndexAction::Pointer
 Mgr::IndexAction::Create(const Command::Pointer &cmd)
diff --git a/src/mgr/Forwarder.cc b/src/mgr/Forwarder.cc
index d7a754dcfd..eb139e0209 100644
--- a/src/mgr/Forwarder.cc
+++ b/src/mgr/Forwarder.cc
@@ -6,8 +6,8 @@
 #include "squid.h"
 #include "base/AsyncJobCalls.h"
 #include "base/TextException.h"
-#include "CommCalls.h"
 #include "comm/Connection.h"
+#include "CommCalls.h"
 #include "errorpage.h"
 #include "globals.h"
 #include "HttpReply.h"
diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc
index dc9e6c1df1..174dabf78d 100644
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -9,8 +9,8 @@
 #include "globals.h"
 #include "HttpReply.h"
 #include "ipc/Messages.h"
-#include "ipc/UdsOp.h"
 #include "ipc/TypedMsgHdr.h"
+#include "ipc/UdsOp.h"
 #include "mgr/Filler.h"
 #include "mgr/InfoAction.h"
 #include "mgr/Request.h"
diff --git a/src/mgr/Inquirer.cc b/src/mgr/Inquirer.cc
index 8475857ec0..9eb412dea6 100644
--- a/src/mgr/Inquirer.cc
+++ b/src/mgr/Inquirer.cc
@@ -9,17 +9,17 @@
 #include "comm/Connection.h"
 #include "comm/Write.h"
 #include "CommCalls.h"
+#include "errorpage.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ipc/UdsOp.h"
 #include "mgr/ActionWriter.h"
-#include "mgr/IntParam.h"
-#include "mgr/Inquirer.h"
 #include "mgr/Command.h"
+#include "mgr/Inquirer.h"
+#include "mgr/IntParam.h"
 #include "mgr/Request.h"
 #include "mgr/Response.h"
 #include "SquidTime.h"
-#include "errorpage.h"
 #include <memory>
 #include <algorithm>
 
diff --git a/src/mgr/IoAction.h b/src/mgr/IoAction.h
index 6487247c1f..479fe77c50 100644
--- a/src/mgr/IoAction.h
+++ b/src/mgr/IoAction.h
@@ -6,8 +6,8 @@
 #ifndef SQUID_MGR_IO_ACTION_H
 #define SQUID_MGR_IO_ACTION_H
 
-#include "mgr/Action.h"
 #include "IoStats.h"
+#include "mgr/Action.h"
 
 namespace Mgr
 {
diff --git a/src/mgr/QueryParams.cc b/src/mgr/QueryParams.cc
index ef5438a17f..e43e709a2d 100644
--- a/src/mgr/QueryParams.cc
+++ b/src/mgr/QueryParams.cc
@@ -7,8 +7,8 @@
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/IntParam.h"
-#include "mgr/StringParam.h"
 #include "mgr/QueryParams.h"
+#include "mgr/StringParam.h"
 
 Mgr::QueryParam::Pointer
 Mgr::QueryParams::get(const String& name) const
diff --git a/src/mgr/StoreToCommWriter.cc b/src/mgr/StoreToCommWriter.cc
index ec16e9d052..43a3156204 100644
--- a/src/mgr/StoreToCommWriter.cc
+++ b/src/mgr/StoreToCommWriter.cc
@@ -6,12 +6,12 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "comm/Connection.h"
-#include "CommCalls.h"
 #include "comm/Write.h"
+#include "CommCalls.h"
 #include "ipc/FdNotes.h"
 #include "mgr/StoreToCommWriter.h"
-#include "StoreClient.h"
 #include "Store.h"
+#include "StoreClient.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Mgr, StoreToCommWriter);
 
diff --git a/src/neighbors.cc b/src/neighbors.cc
index 267d219126..81850d53e1 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -52,8 +52,8 @@
 #include "MemObject.h"
 #include "mgr/Registration.h"
 #include "multicast.h"
-#include "NeighborTypeDomainList.h"
 #include "neighbors.h"
+#include "NeighborTypeDomainList.h"
 #include "PeerDigest.h"
 #include "PeerSelectState.h"
 #include "RequestFlags.h"
diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 0d303a99d4..6abe52e2c8 100644
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -42,8 +42,8 @@
 #include "HttpRequest.h"
 #include "internal.h"
 #include "MemObject.h"
-#include "neighbors.h"
 #include "mime_header.h"
+#include "neighbors.h"
 #include "PeerDigest.h"
 #include "SquidTime.h"
 #include "Store.h"
diff --git a/src/peer_select.cc b/src/peer_select.cc
index 7746de51e3..9c92594e43 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -45,8 +45,8 @@
 #include "HttpRequest.h"
 #include "icmp/net_db.h"
 #include "ICP.h"
-#include "ipcache.h"
 #include "ip/tools.h"
+#include "ipcache.h"
 #include "Mem.h"
 #include "neighbors.h"
 #include "peer_sourcehash.h"
diff --git a/src/refresh.cc b/src/refresh.cc
index cf5d9fd966..4a4f08e921 100644
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -36,14 +36,14 @@
 #endif
 
 #include "squid.h"
-#include "mgr/Registration.h"
 #include "HttpHdrCc.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 #include "MemObject.h"
+#include "mgr/Registration.h"
 #include "RefreshPattern.h"
-#include "SquidTime.h"
 #include "SquidConfig.h"
+#include "SquidTime.h"
 #include "Store.h"
 #include "URL.h"
 
diff --git a/src/repl/heap/store_heap_replacement.cc b/src/repl/heap/store_heap_replacement.cc
index 5eb9265ddf..168687a0f0 100644
--- a/src/repl/heap/store_heap_replacement.cc
+++ b/src/repl/heap/store_heap_replacement.cc
@@ -41,10 +41,10 @@
 
 #include "squid.h"
 #include "heap.h"
-#include "store_heap_replacement.h"
-#include "Store.h"
 #include "MemObject.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "store_heap_replacement.h"
 
 #if HAVE_MATH_H
 #include <math.h>
diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc
index 66dabaf72a..0ac8c0714b 100644
--- a/src/repl/heap/store_repl_heap.cc
+++ b/src/repl/heap/store_repl_heap.cc
@@ -41,10 +41,10 @@
 
 #include "squid.h"
 #include "heap.h"
-#include "store_heap_replacement.h"
+#include "MemObject.h"
 #include "SquidList.h"
 #include "Store.h"
-#include "MemObject.h"
+#include "store_heap_replacement.h"
 #include "wordlist.h"
 
 REMOVALPOLICYCREATE createRemovalPolicy_heap;
diff --git a/src/repl/lru/store_repl_lru.cc b/src/repl/lru/store_repl_lru.cc
index 97b8acb512..86e2c39fd2 100644
--- a/src/repl/lru/store_repl_lru.cc
+++ b/src/repl/lru/store_repl_lru.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "Store.h"
 #include "MemObject.h"
 #include "SquidTime.h"
+#include "Store.h"
 
 REMOVALPOLICYCREATE createRemovalPolicy_lru;
 
diff --git a/src/snmp/Forwarder.cc b/src/snmp/Forwarder.cc
index 96811088fc..3ec663fcf2 100644
--- a/src/snmp/Forwarder.cc
+++ b/src/snmp/Forwarder.cc
@@ -5,14 +5,14 @@
 
 #include "squid.h"
 #include "base/TextException.h"
-#include "CommCalls.h"
 #include "comm.h"
+#include "CommCalls.h"
 #include "globals.h"
 #include "ipc/Port.h"
-#include "snmp_core.h"
 #include "snmp/Forwarder.h"
 #include "snmp/Request.h"
 #include "snmp/Response.h"
+#include "snmp_core.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Snmp, Forwarder);
 
diff --git a/src/snmp/Inquirer.cc b/src/snmp/Inquirer.cc
index 7b9b882455..aabf2e465d 100644
--- a/src/snmp/Inquirer.cc
+++ b/src/snmp/Inquirer.cc
@@ -5,14 +5,14 @@
 
 #include "squid.h"
 #include "base/TextException.h"
-#include "CommCalls.h"
 #include "comm.h"
 #include "comm/Connection.h"
+#include "CommCalls.h"
 #include "ipc/UdsOp.h"
-#include "snmp_core.h"
 #include "snmp/Inquirer.h"
-#include "snmp/Response.h"
 #include "snmp/Request.h"
+#include "snmp/Response.h"
+#include "snmp_core.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Snmp, Inquirer);
 
diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc
index bf8ab94d92..2c08fe45f4 100644
--- a/src/snmp/Pdu.cc
+++ b/src/snmp/Pdu.cc
@@ -6,9 +6,9 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
-#include "snmp_core.h"
 #include "snmp/Pdu.h"
 #include "snmp/Var.h"
+#include "snmp_core.h"
 #include "tools.h"
 #if HAVE_ALGORITHM
 #include <algorithm>
diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 5503c11f0f..fb359e90e9 100644
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -31,19 +31,19 @@
  */
 
 #include "squid.h"
-#include "CachePeer.h"
 #include "cache_snmp.h"
+#include "CachePeer.h"
 #include "globals.h"
 #include "mem_node.h"
 #include "neighbors.h"
 #include "snmp_agent.h"
 #include "snmp_core.h"
-#include "StatCounters.h"
-#include "StatHist.h"
 #include "SquidConfig.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "stat.h"
+#include "StatCounters.h"
+#include "StatHist.h"
 #include "Store.h"
 #include "tools.h"
 
diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 6bec56143d..c667bdb274 100644
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -40,9 +40,9 @@
 #include "comm/UdpOpenDialer.h"
 #include "ip/Address.h"
 #include "ip/tools.h"
+#include "snmp/Forwarder.h"
 #include "snmp_agent.h"
 #include "snmp_core.h"
-#include "snmp/Forwarder.h"
 #include "SnmpRequest.h"
 #include "SquidConfig.h"
 #include "tools.h"
@@ -1152,8 +1152,8 @@ oid2addr(oid * id, Ip::Address &addr, u_int size)
 }
 
 /* SNMP checklists */
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "acl/StringData.h"
 
 class ACLSNMPCommunityStrategy : public ACLStrategy<char const *>
diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc
index 4f0624186d..5c03138bee 100644
--- a/src/ssl/ErrorDetailManager.cc
+++ b/src/ssl/ErrorDetailManager.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "ErrorDetail.h"
-#include "errorpage.h"
 #include "ErrorDetailManager.h"
+#include "errorpage.h"
 #include "mime_header.h"
 
 void Ssl::errorDetailInitialize()
diff --git a/src/ssl/ErrorDetailManager.h b/src/ssl/ErrorDetailManager.h
index 265bd2d0ce..20a18a2caf 100644
--- a/src/ssl/ErrorDetailManager.h
+++ b/src/ssl/ErrorDetailManager.h
@@ -3,8 +3,8 @@
 
 #include "base/RefCount.h"
 #include "HttpRequest.h"
-#include "ssl/support.h"
 #include "SquidString.h"
+#include "ssl/support.h"
 
 #if HAVE_MAP
 #include <map>
diff --git a/src/ssl/cert_validate_message.cc b/src/ssl/cert_validate_message.cc
index 18ede8297d..1cd5ad267c 100644
--- a/src/ssl/cert_validate_message.cc
+++ b/src/ssl/cert_validate_message.cc
@@ -2,9 +2,9 @@
 #include "acl/FilledChecklist.h"
 #include "globals.h"
 #include "helper.h"
-#include "ssl/support.h"
 #include "ssl/cert_validate_message.h"
 #include "ssl/ErrorDetail.h"
+#include "ssl/support.h"
 
 void
 Ssl::CertValidationMsg::composeRequest(CertValidationRequest const &vcert)
diff --git a/src/ssl/cert_validate_message.h b/src/ssl/cert_validate_message.h
index 9f92aa991d..d3d2221c56 100644
--- a/src/ssl/cert_validate_message.h
+++ b/src/ssl/cert_validate_message.h
@@ -5,8 +5,8 @@
 #define SQUID_SSL_CERT_VALIDATE_MESSAGE_H
 
 #include "HelperReply.h"
-#include "ssl/support.h"
 #include "ssl/crtd_message.h"
+#include "ssl/support.h"
 #include <vector>
 
 namespace Ssl
diff --git a/src/ssl/context_storage.cc b/src/ssl/context_storage.cc
index c174684907..2753d590c0 100644
--- a/src/ssl/context_storage.cc
+++ b/src/ssl/context_storage.cc
@@ -1,8 +1,8 @@
 #include "squid.h"
+#include "mgr/Registration.h"
+#include "ssl/context_storage.h"
 #include "Store.h"
 #include "StoreEntryStream.h"
-#include "ssl/context_storage.h"
-#include "mgr/Registration.h"
 #if HAVE_LIMITS
 #include <limits>
 #endif
diff --git a/src/ssl/context_storage.h b/src/ssl/context_storage.h
index 59dd08c7d5..20a6436234 100644
--- a/src/ssl/context_storage.h
+++ b/src/ssl/context_storage.h
@@ -4,11 +4,11 @@
 #if USE_SSL
 
 #include "base/LruMap.h"
-#include "SquidTime.h"
 #include "CacheManager.h"
 #include "ip/Address.h"
 #include "mgr/Action.h"
 #include "mgr/Command.h"
+#include "SquidTime.h"
 #include "ssl/gadgets.h"
 #if HAVE_MAP
 #include <map>
diff --git a/src/ssl/crtd_message.cc b/src/ssl/crtd_message.cc
index 5759530373..f52db909da 100644
--- a/src/ssl/crtd_message.cc
+++ b/src/ssl/crtd_message.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "ssl/gadgets.h"
 #include "ssl/crtd_message.h"
+#include "ssl/gadgets.h"
 #if HAVE_CSTDLIB
 #include <cstdlib>
 #endif
diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index 789a4e31d9..3e3099c360 100644
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -1,13 +1,13 @@
 #include "squid.h"
 #include "anyp/PortCfg.h"
-#include "ssl/Config.h"
-#include "ssl/helper.h"
+#include "SquidConfig.h"
 #include "SquidString.h"
 #include "SquidTime.h"
-#include "SwapDir.h"
 #include "ssl/cert_validate_message.h"
+#include "ssl/Config.h"
+#include "ssl/helper.h"
+#include "SwapDir.h"
 #include "wordlist.h"
-#include "SquidConfig.h"
 
 LruMap<Ssl::CertValidationResponse> *Ssl::CertValidationHelper::HelperCache = NULL;
 
diff --git a/src/ssl/helper.h b/src/ssl/helper.h
index 0044191a02..93cda09f5c 100644
--- a/src/ssl/helper.h
+++ b/src/ssl/helper.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_SSL_HELPER_H
 #define SQUID_SSL_HELPER_H
 
-#include "base/LruMap.h"
 #include "../helper.h"
+#include "base/LruMap.h"
 #include "ssl/cert_validate_message.h"
 #include "ssl/crtd_message.h"
 
diff --git a/src/ssl/ssl_crtd.cc b/src/ssl/ssl_crtd.cc
index 3b139ebb06..982faf1575 100644
--- a/src/ssl/ssl_crtd.cc
+++ b/src/ssl/ssl_crtd.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "helpers/defines.h"
-#include "ssl/crtd_message.h"
 #include "ssl/certificate_db.h"
+#include "ssl/crtd_message.h"
 
 #if HAVE_CSTRING
 #include <cstring>
diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index e0123f6f66..5236ec5592 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -45,8 +45,8 @@
 #include "SquidConfig.h"
 #include "ssl/Config.h"
 #include "ssl/ErrorDetail.h"
-#include "ssl/support.h"
 #include "ssl/gadgets.h"
+#include "ssl/support.h"
 #include "URL.h"
 
 #if HAVE_ERRNO_H
diff --git a/src/stat.cc b/src/stat.cc
index 59db7e56a2..38c8a4f33c 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -33,8 +33,8 @@
 #include "squid.h"
 #include "CacheDigest.h"
 #include "CachePeer.h"
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "comm/Connection.h"
 #include "comm/Loops.h"
 #include "event.h"
@@ -43,9 +43,9 @@
 #include "globals.h"
 #include "HttpRequest.h"
 #include "IoStats.h"
-#include "MemObject.h"
 #include "mem_node.h"
 #include "MemBuf.h"
+#include "MemObject.h"
 #include "mgr/CountersAction.h"
 #include "mgr/FunAction.h"
 #include "mgr/InfoAction.h"
@@ -58,11 +58,11 @@
 #include "SquidConfig.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
-#include "StatCounters.h"
 #include "stat.h"
-#include "StoreClient.h"
+#include "StatCounters.h"
 #include "Store.h"
 #include "store_digest.h"
+#include "StoreClient.h"
 #include "tools.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"
diff --git a/src/stmem.h b/src/stmem.h
index c7b53981a2..e67e4d360a 100644
--- a/src/stmem.h
+++ b/src/stmem.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_STMEM_H
 #define SQUID_STMEM_H
 
-#include "splay.h"
 #include "Range.h"
+#include "splay.h"
 
 class mem_node;
 
diff --git a/src/store.cc b/src/store.cc
index 4d6b771bab..b4a9939f6a 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -54,12 +54,12 @@
 #include "Stack.h"
 #include "StatCounters.h"
 #include "stmem.h"
+#include "Store.h"
 #include "store_digest.h"
 #include "store_key_md5.h"
 #include "store_key_md5.h"
 #include "store_log.h"
 #include "store_rebuild.h"
-#include "Store.h"
 #include "StoreClient.h"
 #include "StoreIOState.h"
 #include "StoreMeta.h"
diff --git a/src/store_client.cc b/src/store_client.cc
index 9892758f3e..b990e385c2 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -42,9 +42,9 @@
 #include "profiler/Profiler.h"
 #include "SquidConfig.h"
 #include "StatCounters.h"
-#include "StoreClient.h"
 #include "Store.h"
 #include "store_swapin.h"
+#include "StoreClient.h"
 #include "StoreMeta.h"
 #include "StoreMetaUnpacker.h"
 #if USE_DELAY_POOLS
diff --git a/src/store_dir.cc b/src/store_dir.cc
index 07e8743ffb..cade545757 100644
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -43,8 +43,8 @@
 #include "Store.h"
 #include "store_key_md5.h"
 #include "StoreHashIndex.h"
-#include "SwapDir.h"
 #include "swap_log_op.h"
+#include "SwapDir.h"
 #include "tools.h"
 
 #if HAVE_STATVFS
diff --git a/src/store_io.cc b/src/store_io.cc
index e2f9d2a2c3..93a0a11a6d 100644
--- a/src/store_io.cc
+++ b/src/store_io.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "Store.h"
 #include "MemObject.h"
 #include "SquidConfig.h"
+#include "Store.h"
 #include "SwapDir.h"
 
 StoreIoStats store_io_stats;
diff --git a/src/store_log.cc b/src/store_log.cc
index c4b32217ae..c88b9a2989 100644
--- a/src/store_log.cc
+++ b/src/store_log.cc
@@ -36,10 +36,10 @@
 #include "log/File.h"
 #include "MemObject.h"
 #include "mgr/Registration.h"
-#include "Store.h"
-#include "store_log.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "store_log.h"
 
 static const char *storeLogTags[] = {
     "CREATE",
diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc
index c9cec3747f..f9f9de7776 100644
--- a/src/store_rebuild.cc
+++ b/src/store_rebuild.cc
@@ -34,15 +34,15 @@
 #include "event.h"
 #include "globals.h"
 #include "md5.h"
+#include "SquidConfig.h"
+#include "SquidTime.h"
 #include "StatCounters.h"
 #include "Store.h"
-#include "store_key_md5.h"
-#include "SwapDir.h"
 #include "store_digest.h"
+#include "store_key_md5.h"
 #include "store_rebuild.h"
 #include "StoreSearch.h"
-#include "SquidConfig.h"
-#include "SquidTime.h"
+#include "SwapDir.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>
@@ -243,9 +243,9 @@ storeRebuildProgress(int sd_index, int total, int sofar)
 }
 
 #include "fde.h"
-#include "StoreMetaUnpacker.h"
-#include "StoreMeta.h"
 #include "Generic.h"
+#include "StoreMeta.h"
+#include "StoreMetaUnpacker.h"
 
 struct InitStoreEntry : public unary_function<StoreMeta, void> {
     InitStoreEntry(StoreEntry *anEntry, cache_key *aKey):what(anEntry),index(aKey) {}
diff --git a/src/store_swapin.cc b/src/store_swapin.cc
index da4cab3427..f092df574a 100644
--- a/src/store_swapin.cc
+++ b/src/store_swapin.cc
@@ -33,9 +33,9 @@
 #include "squid.h"
 #include "globals.h"
 #include "StatCounters.h"
-#include "StoreClient.h"
 #include "Store.h"
 #include "store_swapin.h"
+#include "StoreClient.h"
 
 static StoreIOState::STIOCB storeSwapInFileClosed;
 static StoreIOState::STFNCB storeSwapInFileNotify;
diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 9d1ad7266e..53121e34b4 100644
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -33,17 +33,17 @@
 
 #include "squid.h"
 #include "cbdata.h"
-#include "StoreClient.h"
 #include "globals.h"
 #include "Store.h"
+#include "StoreClient.h"
 /* FIXME: Abstract the use of this more */
 #include "mem_node.h"
 #include "MemObject.h"
 #include "SquidConfig.h"
-#include "SwapDir.h"
 #include "StatCounters.h"
 #include "store_log.h"
 #include "swap_log_op.h"
+#include "SwapDir.h"
 
 static void storeSwapOutStart(StoreEntry * e);
 static StoreIOState::STIOCB storeSwapOutFileClosed;
diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc
index 55e4be97bd..b141f5b43a 100644
--- a/src/tests/stub_HelperChildConfig.cc
+++ b/src/tests/stub_HelperChildConfig.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "HelperChildConfig.h"
 #include "globals.h"
+#include "HelperChildConfig.h"
 
 #define STUB_API "stub_HelperChildconfig.cc"
 #include "tests/STUB.h"
diff --git a/src/tests/stub_MemObject.cc b/src/tests/stub_MemObject.cc
index 309e8cd7ff..53b54209df 100644
--- a/src/tests/stub_MemObject.cc
+++ b/src/tests/stub_MemObject.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "comm/Connection.h"
-#include "MemObject.h"
 #include "HttpReply.h"
+#include "MemObject.h"
 #if USE_DELAY_POOLS
 #include "DelayPools.h"
 #endif
diff --git a/src/tests/stub_http.cc b/src/tests/stub_http.cc
index 95497c2188..b85d7f196d 100644
--- a/src/tests/stub_http.cc
+++ b/src/tests/stub_http.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 #define STUB_API "http.cc"
 #include "tests/STUB.h"
diff --git a/src/tests/stub_mem.cc b/src/tests/stub_mem.cc
index 645b14a310..3e62c9ebbf 100644
--- a/src/tests/stub_mem.cc
+++ b/src/tests/stub_mem.cc
@@ -5,8 +5,8 @@
 #include "squid.h"
 
 #define STUB_API "stub_mem.cc"
-#include "STUB.h"
 #include "Mem.h"
+#include "STUB.h"
 
 void
 memFreeString(size_t size, void *buf)
diff --git a/src/tests/stub_pconn.cc b/src/tests/stub_pconn.cc
index 3a7fcd3d72..80e3db46fc 100644
--- a/src/tests/stub_pconn.cc
+++ b/src/tests/stub_pconn.cc
@@ -2,8 +2,8 @@
  * STUB file for the pconn.cc API
  */
 #include "squid.h"
-#include "pconn.h"
 #include "comm/Connection.h"
+#include "pconn.h"
 
 #define STUB_API "pconn.cc"
 #include "tests/STUB.h"
diff --git a/src/tests/stub_store_client.cc b/src/tests/stub_store_client.cc
index c90f04277c..f8c06c21ef 100644
--- a/src/tests/stub_store_client.cc
+++ b/src/tests/stub_store_client.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "StoreClient.h"
 #include "Store.h"
+#include "StoreClient.h"
 
 #define STUB_API "store_client.cc"
 #include "tests/STUB.h"
diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc
index c1e4fce924..128806264f 100644
--- a/src/tests/testACLMaxUserIP.cc
+++ b/src/tests/testACLMaxUserIP.cc
@@ -4,9 +4,9 @@
 
 #if USE_AUTH
 
-#include "testACLMaxUserIP.h"
 #include "auth/AclMaxUserIp.h"
 #include "ConfigParser.h"
+#include "testACLMaxUserIP.h"
 
 #if HAVE_STDEXCEPT
 #include <stdexcept>
diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc
index bb1cffc9ee..c7358fefaf 100644
--- a/src/tests/testAuth.cc
+++ b/src/tests/testAuth.cc
@@ -4,13 +4,13 @@
 
 #if USE_AUTH
 
-#include "testAuth.h"
+#include "auth/Config.h"
 #include "auth/Gadgets.h"
-#include "auth/UserRequest.h"
 #include "auth/Scheme.h"
-#include "auth/Config.h"
+#include "auth/UserRequest.h"
 #include "ConfigParser.h"
 #include "Mem.h"
+#include "testAuth.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testAuth );
 CPPUNIT_TEST_SUITE_REGISTRATION( testAuthConfig );
diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc
index 308ba35431..7d6691eed3 100644
--- a/src/tests/testCacheManager.cc
+++ b/src/tests/testCacheManager.cc
@@ -1,11 +1,11 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "mgr/Action.h"
-#include "Mem.h"
-#include "testCacheManager.h"
 #include "CacheManager.h"
+#include "Mem.h"
+#include "mgr/Action.h"
 #include "Store.h"
+#include "testCacheManager.h"
 
 #include <cppunit/TestAssert.h>
 
diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc
index a7cd80dbcd..3c9bdd24ad 100644
--- a/src/tests/testConfigParser.cc
+++ b/src/tests/testConfigParser.cc
@@ -1,10 +1,10 @@
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
-#include "testConfigParser.h"
-#include "SquidString.h"
-#include "Mem.h"
-#include "event.h"
 #include "ConfigParser.h"
+#include "event.h"
+#include "Mem.h"
+#include "SquidString.h"
+#include "testConfigParser.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testConfigParser);
 
diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc
index 7ba797b177..2325937201 100644
--- a/src/tests/testDiskIO.cc
+++ b/src/tests/testDiskIO.cc
@@ -1,15 +1,15 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testDiskIO.h"
-#include "Store.h"
-#include "SwapDir.h"
 #include "DiskIO/DiskIOModule.h"
-#include "Mem.h"
-#include "MemObject.h"
 #include "HttpHeader.h"
 #include "HttpReply.h"
+#include "Mem.h"
+#include "MemObject.h"
+#include "Store.h"
 #include "StoreFileSystem.h"
+#include "SwapDir.h"
+#include "testDiskIO.h"
 #include "testStoreSupport.h"
 
 #if HAVE_STDEXCEPT
diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 6abcf9ace6..b7b50925ee 100644
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -3,12 +3,12 @@
 
 #include <cppunit/TestAssert.h>
 
-#include "testEventLoop.h"
 #include "AsyncEngine.h"
 #include "EventLoop.h"
 #include "Mem.h"
 #include "SquidTime.h"
 #include "stat.h"
+#include "testEventLoop.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop );
 
diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc
index 5dde9b28d2..446d9f046d 100644
--- a/src/tests/testHttpParser.cc
+++ b/src/tests/testHttpParser.cc
@@ -3,11 +3,11 @@
 
 #include <cppunit/TestAssert.h>
 
-#include "testHttpParser.h"
 #include "HttpParser.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "SquidConfig.h"
+#include "testHttpParser.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpParser );
 
diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index 04aa5ab9a8..d3c378b957 100644
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -2,12 +2,12 @@
 #include "squid.h"
 #include <cppunit/TestAssert.h>
 
-#include "testHttpReply.h"
 #include "HttpHeader.h"
 #include "HttpReply.h"
 #include "Mem.h"
 #include "mime_header.h"
 #include "SquidConfig.h"
+#include "testHttpReply.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply );
 
diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 1f1ce12faf..a44fc213f2 100644
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -3,11 +3,11 @@
 
 #include <cppunit/TestAssert.h>
 
-#include "testHttpRequest.h"
 #include "HttpHeader.h"
 #include "HttpRequest.h"
 #include "Mem.h"
 #include "mime_header.h"
+#include "testHttpRequest.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
 
diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc
index 3855514c22..1e83ed1ce3 100644
--- a/src/tests/testHttpRequestMethod.cc
+++ b/src/tests/testHttpRequestMethod.cc
@@ -3,9 +3,9 @@
 #include "squid.h"
 #include <cppunit/TestAssert.h>
 
+#include "HttpRequestMethod.h"
 #include "Mem.h"
 #include "testHttpRequestMethod.h"
-#include "HttpRequestMethod.h"
 
 #if HAVE_SSTREAM
 #include <sstream>
diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index 49561b453a..479a9c21e0 100644
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -1,10 +1,10 @@
 #include "squid.h"
 #include "Mem.h"
 #include "SBuf.h"
+#include "SBufFindTest.h"
 #include "SBufStream.h"
 #include "SquidString.h"
 #include "testSBuf.h"
-#include "SBufFindTest.h"
 
 #include <iostream>
 #include <stdexcept>
diff --git a/src/tests/testStatHist.cc b/src/tests/testStatHist.cc
index c6254c071a..545c7046df 100644
--- a/src/tests/testStatHist.cc
+++ b/src/tests/testStatHist.cc
@@ -1,7 +1,7 @@
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
-#include "testStatHist.h"
 #include "StatHist.h"
+#include "testStatHist.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(testStatHist);
 
diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc
index 0c4989d25a..8560f47bcd 100644
--- a/src/tests/testStore.cc
+++ b/src/tests/testStore.cc
@@ -1,8 +1,8 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testStore.h"
 #include "Store.h"
+#include "testStore.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStore );
 
diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc
index 21e62cece9..328b983ba1 100644
--- a/src/tests/testStoreController.cc
+++ b/src/tests/testStoreController.cc
@@ -1,14 +1,14 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testStoreController.h"
-#include "Store.h"
-#include "SwapDir.h"
-#include "TestSwapDir.h"
 #include "Mem.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
 #include "StoreSearch.h"
+#include "SwapDir.h"
+#include "testStoreController.h"
+#include "TestSwapDir.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStoreController );
 
diff --git a/src/tests/testStoreEntryStream.cc b/src/tests/testStoreEntryStream.cc
index 4b0abdc4b2..28e0818a8d 100644
--- a/src/tests/testStoreEntryStream.cc
+++ b/src/tests/testStoreEntryStream.cc
@@ -1,12 +1,12 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "Mem.h"
-#include "testStore.h"
-#include "testStoreEntryStream.h"
 #include "CapturingStoreEntry.h"
+#include "Mem.h"
 #include "Store.h"
 #include "StoreEntryStream.h"
+#include "testStore.h"
+#include "testStoreEntryStream.h"
 
 #if HAVE_IOMANIP
 #include <iomanip>
diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc
index 9d320794f4..17cc99cc68 100644
--- a/src/tests/testStoreHashIndex.cc
+++ b/src/tests/testStoreHashIndex.cc
@@ -1,15 +1,15 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testStoreHashIndex.h"
-#include "Store.h"
-#include "SwapDir.h"
-#include "TestSwapDir.h"
-#include "StoreHashIndex.h"
 #include "Mem.h"
-#include "StoreSearch.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "StoreHashIndex.h"
+#include "StoreSearch.h"
+#include "SwapDir.h"
+#include "testStoreHashIndex.h"
+#include "TestSwapDir.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStoreHashIndex );
 
diff --git a/src/tests/testStoreSupport.cc b/src/tests/testStoreSupport.cc
index 89664c5493..2db03c4f42 100644
--- a/src/tests/testStoreSupport.cc
+++ b/src/tests/testStoreSupport.cc
@@ -33,10 +33,10 @@
 
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
-#include "testStoreSupport.h"
 #include "event.h"
 #include "EventLoop.h"
 #include "SquidTime.h"
+#include "testStoreSupport.h"
 
 /* construct a stock loop with event dispatching, a time service that advances
  * 1 second a tick
diff --git a/src/tests/testString.cc b/src/tests/testString.cc
index 0ca8cb01b4..090d426ee4 100644
--- a/src/tests/testString.cc
+++ b/src/tests/testString.cc
@@ -1,10 +1,10 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testString.h"
-#include "SquidString.h"
-#include "Mem.h"
 #include "event.h"
+#include "Mem.h"
+#include "SquidString.h"
+#include "testString.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testString );
 
diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc
index 89997eac76..379d431e9d 100644
--- a/src/tests/testURL.cc
+++ b/src/tests/testURL.cc
@@ -3,9 +3,9 @@
 
 #include <cppunit/TestAssert.h>
 
+#include "Mem.h"
 #include "testURL.h"
 #include "URL.h"
-#include "Mem.h"
 
 #if HAVE_SSTREAM
 #include <sstream>
diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc
index 03d513972a..bbf0544512 100644
--- a/src/tests/test_http_range.cc
+++ b/src/tests/test_http_range.cc
@@ -39,8 +39,8 @@
 
 /** \todo CLEANUP: This file shoudl be called something_stub.cc */
 
-#include "HttpHeaderRange.h"
 #include "HttpHeader.h"
+#include "HttpHeaderRange.h"
 #include "Mem.h"
 
 #if 0
diff --git a/src/tools.cc b/src/tools.cc
index a57af62dbc..d4b75da3d3 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -31,6 +31,7 @@
  */
 
 #include "squid.h"
+#include "anyp/PortCfg.h"
 #include "base/Subscription.h"
 #include "client_side.h"
 #include "disk.h"
@@ -40,16 +41,15 @@
 #include "ICP.h"
 #include "ip/Intercept.h"
 #include "ip/QosConfig.h"
+#include "ipc/Coordinator.h"
+#include "ipc/Kids.h"
+#include "ipcache.h"
 #include "MemBuf.h"
-#include "anyp/PortCfg.h"
 #include "SquidConfig.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
-#include "ipc/Kids.h"
-#include "ipc/Coordinator.h"
-#include "ipcache.h"
-#include "tools.h"
 #include "SwapDir.h"
+#include "tools.h"
 #include "wordlist.h"
 
 #if HAVE_SYS_PRCTL_H
diff --git a/src/tunnel.cc b/src/tunnel.cc
index 37cc5f700b..c44c21848b 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -35,8 +35,8 @@
 #include "acl/FilledChecklist.h"
 #include "base/Vector.h"
 #include "CachePeer.h"
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
diff --git a/src/ufsdump.cc b/src/ufsdump.cc
index c5fd2a1e21..b9f0276db9 100644
--- a/src/ufsdump.cc
+++ b/src/ufsdump.cc
@@ -31,12 +31,12 @@
  */
 
 #include "squid.h"
-#include "StoreMeta.h"
-#include "StoreMetaUnpacker.h"
-#include "Store.h"
-#include "store_key_md5.h"
 #include "Generic.h"
 #include "mgr/Registration.h"
+#include "Store.h"
+#include "store_key_md5.h"
+#include "StoreMeta.h"
+#include "StoreMetaUnpacker.h"
 
 #undef malloc
 #undef free
diff --git a/src/unlinkd.cc b/src/unlinkd.cc
index 38d066f850..1a140485ce 100644
--- a/src/unlinkd.cc
+++ b/src/unlinkd.cc
@@ -37,12 +37,12 @@
 #include "fd.h"
 #include "fde.h"
 #include "globals.h"
-#include "xusleep.h"
 #include "SquidIpc.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 #include "SwapDir.h"
 #include "tools.h"
+#include "xusleep.h"
 
 /* This code gets linked to Squid */
 
diff --git a/src/wordlist.cc b/src/wordlist.cc
index 21076ed0cc..8a9bdc09d7 100644
--- a/src/wordlist.cc
+++ b/src/wordlist.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "wordlist.h"
 #include "MemBuf.h"
+#include "wordlist.h"
 
 void
 wordlistDestroy(wordlist ** list)
diff --git a/test-suite/mem_hdr_test.cc b/test-suite/mem_hdr_test.cc
index a79ea2b2e8..4b5bc36738 100644
--- a/test-suite/mem_hdr_test.cc
+++ b/test-suite/mem_hdr_test.cc
@@ -33,10 +33,10 @@
  */
 
 #include "squid.h"
-#include "stmem.h"
-#include "mem_node.h"
-#include "Generic.h"
 #include "base/TextException.h"
+#include "Generic.h"
+#include "mem_node.h"
+#include "stmem.h"
 
 #if HAVE_IOSTREAM
 #include <iostream>
diff --git a/test-suite/syntheticoperators.cc b/test-suite/syntheticoperators.cc
index 663890f073..f6f06ba783 100644
--- a/test-suite/syntheticoperators.cc
+++ b/test-suite/syntheticoperators.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "stmem.h"
 #include "mem_node.h"
+#include "stmem.h"
 
 #if HAVE_IOSTREAM
 #include <iostream>
diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc
index 81baffeb38..558379e1ba 100644
--- a/tools/purge/purge.cc
+++ b/tools/purge/purge.cc
@@ -115,12 +115,12 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include "conffile.hh"
 #include "convert.hh"
-#include "socket.hh"
+#include "copyout.hh"
 #include "signal.hh"
+#include "socket.hh"
 #include "squid-tlv.hh"
-#include "copyout.hh"
-#include "conffile.hh"
 
 #ifndef DEFAULTHOST
 #define DEFAULTHOST "localhost"