Merge branch 'ondrej/clang-format-improve-includes' into 'master'

Improve #include block sorting and grouping in clang-format

See merge request isc-projects/bind9!3193

.clang-format

@@ -33,23 +33,35 @@ PointerBindsToType: false
 IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:           '^<isc/'
-    Priority:        2
-  - Regex:           '^<dns/'
-    Priority:        3
-  - Regex:           '^<iscccc/'
-    Priority:        4
-  - Regex:           '^<isccfg/'
     Priority:        5
+  - Regex:           '^<(pk11|pkcs11)/'
+    Priority:        10
+  - Regex:           '^<dns/'
+    Priority:        15
+  - Regex:           '^<dst/'
+    Priority:        20
+  - Regex:           '^<isccc/'
+    Priority:        25
+  - Regex:           '^<isccfg/'
+    Priority:        30
   - Regex:           '^<ns/'
-    Priority:        6
-  - Regex:           '^<bind9/)'
-    Priority:        7
-  - Regex:           '^(<[^/]*)/)'
-    Priority:        8
-  - Regex:           '<[[:alnum:].]+>'
+    Priority:        35
+  - Regex:           '^<irs/'
+    Priority:        40
+  - Regex:           '^<bind9/'
+    Priority:        45
+  - Regex:           '^<(dig|named|rndc|confgen|dlz)/'
+    Priority:        50
+  - Regex:           '^<dlz_'
+    Priority:        55
+  - Regex:           '^".*"'
+    Priority:        99
+  - Regex:           '<openssl/'
     Priority:        1
-  - Regex:           '".*"'
-    Priority:        9
+  - Regex:           '<(mysql|protobuf-c)/'
+    Priority:        1
+  - Regex:           '.*'
+    Priority:        0
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30

bin/check/named-checkconf.c

@@ -38,10 +38,10 @@
 #include <isccfg/grammar.h>
 #include <isccfg/namedconf.h>
 
-#include "check-tool.h"
-
 #include <bind9/check.h>
 
+#include "check-tool.h"
+
 static const char *program = "named-checkconf";
 
 static bool loadplugins = true;

bin/confgen/ddns-confgen.c

@@ -42,11 +42,12 @@
 #include <dns/name.h>
 #include <dns/result.h>
 
-#include "keygen.h"
-#include "util.h"
+#include <dst/dst.h>
 
 #include <confgen/os.h>
-#include <dst/dst.h>
+
+#include "keygen.h"
+#include "util.h"
 
 #define KEYGEN_DEFAULT	"tsig-key"
 #define CONFGEN_DEFAULT "ddns-key"

bin/confgen/keygen.c

@@ -12,7 +12,6 @@
 /*! \file */
 
 #include "keygen.h"
-
 #include <stdarg.h>
 #include <stdlib.h>
 
@@ -24,14 +23,16 @@
 #include <isc/result.h>
 #include <isc/string.h>
 
+#include <pk11/site.h>
+
 #include <dns/keyvalues.h>
 #include <dns/name.h>
 
-#include "util.h"
+#include <dst/dst.h>
 
 #include <confgen/os.h>
-#include <dst/dst.h>
-#include <pk11/site.h>
+
+#include "util.h"
 
 /*%
  * Convert algorithm type to string.

bin/confgen/rndc-confgen.c

@@ -37,15 +37,17 @@
 #include <isc/time.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/keyvalues.h>
 #include <dns/name.h>
 
-#include "keygen.h"
-#include "util.h"
+#include <dst/dst.h>
 
 #include <confgen/os.h>
-#include <dst/dst.h>
-#include <pk11/site.h>
+
+#include "keygen.h"
+#include "util.h"
 
 #define DEFAULT_KEYNAME "rndc-key"
 #define DEFAULT_SERVER	"127.0.0.1"

bin/confgen/unix/os.c

@@ -15,11 +15,11 @@
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <confgen/os.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 int
 set_user(FILE *fd, const char *user) {

bin/confgen/util.c

@@ -12,7 +12,6 @@
 /*! \file */
 
 #include "util.h"
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>

bin/confgen/win32/os.c

@@ -13,11 +13,11 @@
 #include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <confgen/os.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 int
 set_user(FILE *fd, const char *user) {

bin/delv/delv.c

@@ -12,11 +12,10 @@
 #include <bind.keys.h>
 
 #ifndef WIN32
-#include <netdb.h>
-#include <signal.h>
-
 #include <arpa/inet.h>
+#include <netdb.h>
 #include <netinet/in.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #endif /* ifndef WIN32 */
@@ -66,11 +65,12 @@
 #include <dns/secalg.h>
 #include <dns/view.h>
 
+#include <dst/dst.h>
+#include <dst/result.h>
+
 #include <isccfg/log.h>
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
-#include <dst/result.h>
 #include <irs/netdb.h>
 #include <irs/resconf.h>
 

bin/dig/dig.c

@@ -26,6 +26,8 @@
 #include <isc/task.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/byaddr.h>
 #include <dns/fixedname.h>
 #include <dns/masterdump.h>
@@ -40,7 +42,6 @@
 #include <dns/tsig.h>
 
 #include <dig/dig.h>
-#include <pk11/site.h>
 
 #define ADD_STRING(b, s)                                          \
 	{                                                         \

bin/dig/dighost.c

@@ -57,6 +57,8 @@
 #include <isc/types.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/byaddr.h>
 #include <dns/fixedname.h>
 #include <dns/log.h>
@@ -72,14 +74,16 @@
 #include <dns/result.h>
 #include <dns/tsig.h>
 
-#include <isccfg/namedconf.h>
-
-#include <bind9/getaddresses.h>
-#include <dig/dig.h>
 #include <dst/dst.h>
 #include <dst/result.h>
+
+#include <isccfg/namedconf.h>
+
 #include <irs/resconf.h>
-#include <pk11/site.h>
+
+#include <bind9/getaddresses.h>
+
+#include <dig/dig.h>
 
 #if USE_PKCS11
 #include <pk11/result.h>

bin/dnssec/dnssec-keyfromlabel.c

@@ -24,6 +24,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/dnssec.h>
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
@@ -34,7 +36,6 @@
 #include <dns/secalg.h>
 
 #include <dst/dst.h>
-#include <pk11/site.h>
 
 #if USE_PKCS11
 #include <pk11/result.h>

bin/dnssec/dnssec-keygen.c

@@ -39,6 +39,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/dnssec.h>
 #include <dns/fixedname.h>
 #include <dns/kasp.h>
@@ -49,14 +51,13 @@
 #include <dns/result.h>
 #include <dns/secalg.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/cfg.h>
 #include <isccfg/grammar.h>
 #include <isccfg/kaspconf.h>
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
-#include <pk11/site.h>
-
 #if USE_PKCS11
 #include <pk11/result.h>
 #endif /* if USE_PKCS11 */

bin/named/config.c

@@ -25,6 +25,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/fixedname.h>
 #include <dns/name.h>
 #include <dns/rdataclass.h>
@@ -32,13 +34,13 @@
 #include <dns/tsig.h>
 #include <dns/zone.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/grammar.h>
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
 #include <named/config.h>
 #include <named/globals.h>
-#include <pk11/site.h>
 
 /*% default configuration */
 static char defaultconf[] = "\

bin/named/control.c

@@ -26,6 +26,7 @@
 #include <isccc/alist.h>
 #include <isccc/cc.h>
 #include <isccc/result.h>
+
 #include <named/control.h>
 #include <named/globals.h>
 #include <named/log.h>

bin/named/controlconf.c

@@ -31,9 +31,6 @@
 
 #include <dns/result.h>
 
-#include <isccfg/namedconf.h>
-
-#include <bind9/check.h>
 #include <isccc/alist.h>
 #include <isccc/cc.h>
 #include <isccc/ccmsg.h>
@@ -42,6 +39,11 @@
 #include <isccc/sexpr.h>
 #include <isccc/symtab.h>
 #include <isccc/util.h>
+
+#include <isccfg/namedconf.h>
+
+#include <bind9/check.h>
+
 #include <named/config.h>
 #include <named/control.h>
 #include <named/log.h>

bin/named/fuzz.c

@@ -15,6 +15,7 @@
 #include <named/fuzz.h>
 
 #ifdef ENABLE_AFL
+#include <arpa/inet.h>
 #include <errno.h>
 #include <pthread.h>
 #include <signal.h>
@@ -30,7 +31,6 @@
 
 #include <dns/log.h>
 
-#include <arpa/inet.h>
 #include <named/globals.h>
 #include <named/log.h>
 #include <named/server.h>

bin/named/main.c

@@ -44,6 +44,7 @@
 #include <dns/view.h>
 
 #include <dst/result.h>
+
 #include <isccc/result.h>
 #if USE_PKCS11
 #include <pk11/result.h>

bin/named/server.c

@@ -16,6 +16,8 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/aes.h>
@@ -91,6 +93,9 @@
 #include <dns/zone.h>
 #include <dns/zt.h>
 
+#include <dst/dst.h>
+#include <dst/result.h>
+
 #include <isccfg/grammar.h>
 #include <isccfg/kaspconf.h>
 #include <isccfg/namedconf.h>
@@ -101,12 +106,9 @@
 #include <ns/listenlist.h>
 
 #include <bind9/check.h>
-#include <dst/dst.h>
-#include <dst/result.h>
+
 #include <named/config.h>
 #include <named/control.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #if defined(HAVE_GEOIP2)
 #include <named/geoip.h>
 #endif /* HAVE_GEOIP2 */

bin/named/statschannel.c

@@ -43,9 +43,8 @@
 #include <named/statschannel.h>
 
 #if HAVE_JSON_C
-#include <linkhash.h>
-
 #include <json_object.h>
+#include <linkhash.h>
 #endif /* HAVE_JSON_C */
 
 #if HAVE_LIBXML2

bin/named/tkeyconf.c

@@ -22,9 +22,10 @@
 #include <dns/name.h>
 #include <dns/tkey.h>
 
+#include <dst/gssapi.h>
+
 #include <isccfg/cfg.h>
 
-#include <dst/gssapi.h>
 #include <named/tkeyconf.h>
 
 #define RETERR(x)                            \

bin/named/unix/os.c

@@ -12,7 +12,6 @@
 /*! \file */
 #include <stdarg.h>
 #include <stdbool.h>
-
 #include <sys/stat.h>
 #include <sys/types.h> /* dev_t FreeBSD 2.1 */
 #ifdef HAVE_UNAME

bin/named/win32/os.c

@@ -18,6 +18,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <syslog.h>
 
 #include <isc/ntpaths.h>
@@ -32,8 +34,6 @@
 #include <named/main.h>
 #include <named/ntservice.h>
 #include <named/os.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 static char *lockfile = NULL;
 static char *pidfile = NULL;

bin/nsupdate/nsupdate.c

@@ -45,6 +45,8 @@
 #include <isc/types.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/callbacks.h>
 #include <dns/dispatch.h>
 #include <dns/dnssec.h>
@@ -66,11 +68,11 @@
 #include <dns/tkey.h>
 #include <dns/tsig.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
 #include <irs/resconf.h>
-#include <pk11/site.h>
 
 #ifdef GSSAPI
 #include <dst/gssapi.h>

bin/pkcs11/pkcs11-destroy.c

@@ -50,6 +50,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/print.h>
@@ -58,7 +59,6 @@
 
 #include <pk11/pk11.h>
 #include <pk11/result.h>
-#include <sys/types.h>
 
 #ifdef WIN32
 #define sleep(x) Sleep(x)

bin/pkcs11/pkcs11-keygen.c

@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/print.h>
@@ -70,7 +71,6 @@
 #include <pk11/pk11.h>
 #include <pk11/result.h>
 #include <pkcs11/eddsa.h>
-#include <sys/types.h>
 
 /* Define static key template values */
 static CK_BBOOL truevalue = TRUE;

bin/pkcs11/pkcs11-list.c

@@ -43,6 +43,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/print.h>
@@ -51,7 +52,6 @@
 
 #include <pk11/pk11.h>
 #include <pk11/result.h>
-#include <sys/types.h>
 
 int
 main(int argc, char *argv[]) {

bin/pkcs11/pkcs11-tokens.c

@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/mem.h>
@@ -27,7 +28,6 @@
 
 #include <pk11/pk11.h>
 #include <pk11/result.h>
-#include <sys/types.h>
 
 int
 main(int argc, char *argv[]) {

bin/rndc/rndc.c

@@ -33,13 +33,10 @@
 #include <isc/thread.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/name.h>
 
-#include <isccfg/namedconf.h>
-
-#include "util.h"
-
-#include <bind9/getaddresses.h>
 #include <isccc/alist.h>
 #include <isccc/base64.h>
 #include <isccc/cc.h>
@@ -48,7 +45,12 @@
 #include <isccc/sexpr.h>
 #include <isccc/types.h>
 #include <isccc/util.h>
-#include <pk11/site.h>
+
+#include <isccfg/namedconf.h>
+
+#include <bind9/getaddresses.h>
+
+#include "util.h"
 
 #define SERVERADDRS 10
 

bin/rndc/util.c

@@ -12,7 +12,6 @@
 /*! \file */
 
 #include "util.h"
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>

bin/tests/optional/fsaccess_test.c

@@ -14,14 +14,13 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/stat.h>  /* Non-portable. */
+#include <sys/types.h> /* Non-portable. */
 
 #include <isc/fsaccess.h>
 #include <isc/print.h>
 #include <isc/result.h>
 
-#include <sys/stat.h>  /* Non-portable. */
-#include <sys/types.h> /* Non-portable. */
-
 #define PATH "/tmp/fsaccess"
 
 int

bin/tests/optional/zone_test.c

@@ -10,6 +10,10 @@
  */
 
 #include <stdlib.h>
+#include <sys/param.h>
+#include <sys/select.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/app.h>
@@ -29,11 +33,6 @@
 #include <dns/result.h>
 #include <dns/zone.h>
 
-#include <sys/param.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
 static int debug = 0;
 static int quiet = 0;
 static int stats = 0;

bin/tests/system/dlzexternal/driver.c

@@ -15,7 +15,6 @@
  */
 
 #include "driver.h"
-
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdbool.h>

bin/tests/system/dyndb/driver/db.c

@@ -12,7 +12,6 @@
  */
 
 #include "db.h"
-
 #include <inttypes.h>
 #include <stdbool.h>
 

bin/tests/system/dyndb/driver/zone.c

@@ -5,7 +5,6 @@
  */
 
 #include "zone.h"
-
 #include <inttypes.h>
 #include <stdbool.h>
 

bin/tests/system/rndc/gencheck.c

@@ -13,12 +13,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include <isc/print.h>
 
-#include <sys/stat.h>
-
 #define USAGE "usage: gencheck <filename>\n"
 
 static int

bin/tests/system/rpz/dnsrps.c

@@ -27,14 +27,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/print.h>
 #include <isc/util.h>
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #ifdef USE_DNSRPS
 #define LIBRPZ_LIB_OPEN DNSRPS_LIB_OPEN
 #include <dns/librpz.h>

bin/tests/system/rsabigexponent/bigkey.c

@@ -23,6 +23,12 @@
 
 #define DST_KEY_INTERNAL
 
+#include <openssl/bn.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/rsa.h>
+
 #include <dns/dnssec.h>
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
@@ -34,11 +40,6 @@
 
 #include <dst/dst.h>
 #include <dst/result.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/rsa.h>
 
 dst_key_t *key;
 dns_fixedname_t fname;

bin/tests/system/tkey/keycreate.c

@@ -26,6 +26,8 @@
 #include <isc/timer.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/dispatch.h>
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
@@ -38,7 +40,6 @@
 #include <dns/view.h>
 
 #include <dst/result.h>
-#include <pk11/site.h>
 
 #define CHECK(str, x)                                        \
 	{                                                    \

bin/tests/system/tkey/keydelete.c

@@ -25,6 +25,8 @@
 #include <isc/timer.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/dispatch.h>
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
@@ -37,7 +39,6 @@
 #include <dns/view.h>
 
 #include <dst/result.h>
-#include <pk11/site.h>
 
 #define CHECK(str, x)                                        \
 	{                                                    \

bin/tools/dnstap-read.c

@@ -31,6 +31,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <protobuf-c/protobuf-c.h>
+
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/hex.h>
@@ -48,8 +50,6 @@
 
 #include "lib/dns/dnstap.pb-c.h"
 
-#include <protobuf-c/protobuf-c.h>
-
 isc_mem_t *mctx = NULL;
 bool memrecord = false;
 bool printmessage = false;

bin/tools/mdig.c

@@ -49,9 +49,10 @@
 #include <dns/types.h>
 #include <dns/view.h>
 
-#include <bind9/getaddresses.h>
 #include <dst/result.h>
 
+#include <bind9/getaddresses.h>
+
 #define CHECK(str, x)                                                       \
 	{                                                                   \
 		if ((x) != ISC_R_SUCCESS) {                                 \

contrib/dlz/drivers/dlz_filesystem_driver.c

@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include <isc/dir.h>
 #include <isc/mem.h>
@@ -61,7 +62,6 @@
 
 #include <dlz/dlz_filesystem_driver.h>
 #include <named/globals.h>
-#include <sys/stat.h>
 
 static dns_sdlzimplementation_t *dlz_fs = NULL;
 

contrib/dlz/drivers/dlz_postgres_driver.c

@@ -62,9 +62,8 @@
 #include <named/globals.h>
 
 /* temporarily include time. */
-#include <time.h>
-
 #include <libpq-fe.h>
+#include <time.h>
 
 static dns_sdlzimplementation_t *dlz_postgres = NULL;
 

contrib/dlz/modules/filesystem/dir.c

@@ -15,17 +15,15 @@
  */
 
 #include "dir.h"
-
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "dlz_minimal.h"
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 void
 dir_init(dir_t *dir) {
 	dir->entry.name[0] = '\0';

contrib/dlz/modules/filesystem/dir.h

@@ -15,9 +15,9 @@
  */
 
 #include <dirent.h>
+#include <sys/types.h>
 
 #include <dlz_minimal.h>
-#include <sys/types.h>
 
 #define DIR_NAMEMAX 256
 #define DIR_PATHMAX 1024

contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c

@@ -52,13 +52,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include "dir.h"
 #include "dlz_list.h"
 #include "dlz_minimal.h"
 
-#include <sys/stat.h>
-
 typedef struct config_data {
 	char *basedir;
 	int basedirsize;

contrib/dlz/modules/include/dlz_minimal.h

@@ -28,7 +28,6 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
-
 #include <sys/socket.h>
 #include <sys/types.h>
 #ifdef ISC_PLATFORM_HAVESYSUNH

contrib/dlz/modules/mysql/dlz_mysql_dynamic.c

@@ -52,11 +52,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <mysql/mysql.h>
+
 #include <dlz_dbi.h>
 #include <dlz_list.h>
 #include <dlz_minimal.h>
 #include <dlz_pthread.h>
-#include <mysql/mysql.h>
 
 #define dbc_search_limit 30
 #define ALLNODES	 1

contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c

@@ -43,22 +43,23 @@
 #include <ifaddrs.h>
 #include <inttypes.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
 
+#include <mysql/errmsg.h>
+#include <mysql/mysql.h>
+
 #include <dlz_list.h>
 #include <dlz_minimal.h>
 #include <dlz_pthread.h>
-#include <mysql/errmsg.h>
-#include <mysql/mysql.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 
 /*
  * The SQL queries that will be used for lookups and updates are defined

contrib/dlz/modules/perl/dlz_perl_driver.c

@@ -58,7 +58,6 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "dlz_perl_driver.h"
-
 #include <EXTERN.h>
 #include <perl.h>
 #include <stdio.h>

fuzz/main.c

@@ -15,12 +15,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "fuzz.h"
 
-#include <sys/stat.h>
-
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 
 #include <dirent.h>

lib/bind9/check.c

@@ -35,6 +35,8 @@
 #include <isc/symtab.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/acl.h>
 #include <dns/dnstap.h>
 #include <dns/fixedname.h>
@@ -47,6 +49,9 @@
 #include <dns/secalg.h>
 #include <dns/ssu.h>
 
+#include <dst/dst.h>
+#include <dst/result.h>
+
 #include <isccfg/aclconf.h>
 #include <isccfg/cfg.h>
 #include <isccfg/grammar.h>
@@ -56,9 +61,6 @@
 #include <ns/hooks.h>
 
 #include <bind9/check.h>
-#include <dst/dst.h>
-#include <dst/result.h>
-#include <pk11/site.h>
 
 static isc_result_t
 fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, bool writeable,

lib/dns/dispatch.c

@@ -14,6 +14,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/mem.h>
@@ -38,8 +39,6 @@
 #include <dns/tcpmsg.h>
 #include <dns/types.h>
 
-#include <sys/types.h>
-
 typedef ISC_LIST(dns_dispentry_t) dns_displist_t;
 
 typedef struct dispsocket dispsocket_t;

lib/dns/dnssec.c

@@ -23,6 +23,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/db.h>
 #include <dns/diff.h>
 #include <dns/dnssec.h>
@@ -40,7 +42,6 @@
 #include <dns/tsig.h> /* for DNS_TSIG_FUDGE */
 
 #include <dst/result.h>
-#include <pk11/site.h>
 
 LIBDNS_EXTERNAL_DATA isc_stats_t *dns_dnssec_stats;
 

lib/dns/dnstap.c

@@ -51,6 +51,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <protobuf-c/protobuf-c.h>
+
 #include <isc/buffer.h>
 #include <isc/file.h>
 #include <isc/log.h>
@@ -78,8 +80,6 @@
 
 #include "dnstap.pb-c.h"
 
-#include <protobuf-c/protobuf-c.h>
-
 #define DTENV_MAGIC	 ISC_MAGIC('D', 't', 'n', 'v')
 #define VALID_DTENV(env) ISC_MAGIC_VALID(env, DTENV_MAGIC)
 

lib/dns/dst_api.c

@@ -58,10 +58,10 @@
 #include <dns/ttl.h>
 #include <dns/types.h>
 
-#include "dst_internal.h"
-
 #include <dst/result.h>
 
+#include "dst_internal.h"
+
 #define DST_AS_STR(t) ((t).value.as_textregion.base)
 
 #define NEXTTOKEN(lex, opt, token)                       \

lib/dns/dst_internal.h

@@ -43,15 +43,16 @@
 #include <pk11/site.h>
 #endif /* USE_PKCS11 */
 
-#include <dns/time.h>
-
-#include <dst/dst.h>
 #include <openssl/dh.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/rsa.h>
 
+#include <dns/time.h>
+
+#include <dst/dst.h>
+
 ISC_LANG_BEGINDECLS
 
 #define KEY_MAGIC ISC_MAGIC('D', 'S', 'T', 'K')

lib/dns/dst_openssl.h

@@ -12,10 +12,6 @@
 #ifndef DST_OPENSSL_H
 #define DST_OPENSSL_H 1
 
-#include <isc/lang.h>
-#include <isc/log.h>
-#include <isc/result.h>
-
 #include <openssl/bn.h>
 #include <openssl/conf.h>
 #include <openssl/crypto.h>
@@ -23,6 +19,10 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
+#include <isc/lang.h>
+#include <isc/log.h>
+#include <isc/result.h>
+
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 /*
  * These are new in OpenSSL 1.1.0.  BN_GENCB _cb needs to be declared in

lib/dns/dst_parse.c

@@ -24,7 +24,6 @@
  */
 
 #include "dst_parse.h"
-
 #include <inttypes.h>
 #include <stdbool.h>
 
@@ -39,14 +38,14 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/log.h>
 #include <dns/time.h>
 
 #include "dst/result.h"
 #include "dst_internal.h"
 
-#include <pk11/site.h>
-
 #define DST_AS_STR(t) ((t).value.as_textregion.base)
 
 #define PRIVATE_KEY_STR "Private-key-format:"

lib/dns/gen-unix.h

@@ -29,12 +29,11 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <unistd.h> /* XXXDCL Required for ?. */
+#include <sys/types.h> /* Required on some systems for dirent.h. */
+#include <unistd.h>    /* XXXDCL Required for ?. */
 
 #include <isc/lang.h>
 
-#include <sys/types.h> /* Required on some systems for dirent.h. */
-
 #ifdef NEED_OPTARG
 extern char *optarg;
 #endif /* ifdef NEED_OPTARG */

lib/dns/gen.c

@@ -31,9 +31,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-
 #include <sys/types.h>
+#include <time.h>
 
 #ifndef PATH_MAX
 #define PATH_MAX 1024

lib/dns/gssapi_link.c

@@ -20,12 +20,12 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include "dst_internal.h"
-#include "dst_parse.h"
-
 #include <dst/gssapi.h>
 #include <dst/result.h>
 
+#include "dst_internal.h"
+#include "dst_parse.h"
+
 #define INITIAL_BUFFER_SIZE 1024
 #define BUFFER_EXTRA	    1024
 

lib/dns/gssapictx.c

@@ -37,11 +37,11 @@
 #include <dns/result.h>
 #include <dns/types.h>
 
-#include "dst_internal.h"
-
 #include <dst/gssapi.h>
 #include <dst/result.h>
 
+#include "dst_internal.h"
+
 /*
  * If we're using our own SPNEGO implementation (see configure.in),
  * pull it in now.  Otherwise, we just use whatever GSSAPI supplies.

lib/dns/hmac_link.c

@@ -38,10 +38,11 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include "dst_internal.h"
+#include <pk11/site.h>
 
 #include <dst/result.h>
-#include <pk11/site.h>
+
+#include "dst_internal.h"
 #ifdef HAVE_FIPS_MODE
 #include "dst_openssl.h" /* FIPS_mode() prototype */
 #endif			 /* ifdef HAVE_FIPS_MODE */

lib/dns/key.c

@@ -19,10 +19,10 @@
 
 #include <dns/keyvalues.h>
 
-#include "dst_internal.h"
-
 #include <dst/dst.h>
 
+#include "dst_internal.h"
+
 uint16_t
 dst_region_computeid(const isc_region_t *source) {
 	uint32_t ac;

lib/dns/openssl_link.c

@@ -33,11 +33,11 @@
 
 #include <dns/log.h>
 
+#include <dst/result.h>
+
 #include "dst_internal.h"
 #include "dst_openssl.h"
 
-#include <dst/result.h>
-
 static isc_mem_t *dst__mctx = NULL;
 
 #if !defined(OPENSSL_NO_ENGINE)

lib/dns/openssldh_link.c

@@ -29,19 +29,21 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include <openssl/opensslv.h>
+
 #include <isc/mem.h>
 #include <isc/safe.h>
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
+#include <dst/result.h>
+
 #include "dst_internal.h"
 #include "dst_openssl.h"
 #include "dst_parse.h"
 
-#include <dst/result.h>
-#include <openssl/opensslv.h>
-#include <pk11/site.h>
-
 #define PRIME2 "02"
 
 #define PRIME768                                                               \

lib/dns/opensslecdsa_link.c

@@ -15,6 +15,11 @@
 
 #include <stdbool.h>
 
+#include <openssl/bn.h>
+#include <openssl/ecdsa.h>
+#include <openssl/err.h>
+#include <openssl/objects.h>
+
 #include <isc/mem.h>
 #include <isc/safe.h>
 #include <isc/string.h>
@@ -22,16 +27,12 @@
 
 #include <dns/keyvalues.h>
 
+#include <dst/result.h>
+
 #include "dst_internal.h"
 #include "dst_openssl.h"
 #include "dst_parse.h"
 
-#include <dst/result.h>
-#include <openssl/bn.h>
-#include <openssl/ecdsa.h>
-#include <openssl/err.h>
-#include <openssl/objects.h>
-
 #ifndef NID_X9_62_prime256v1
 #error "P-256 group is not known (NID_X9_62_prime256v1)"
 #endif /* ifndef NID_X9_62_prime256v1 */

lib/dns/openssleddsa_link.c

@@ -15,6 +15,11 @@
 
 #include <stdbool.h>
 
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+
 #include <isc/mem.h>
 #include <isc/result.h>
 #include <isc/safe.h>
@@ -23,17 +28,13 @@
 
 #include <dns/keyvalues.h>
 
+#include <dst/result.h>
+
 #include "dst_internal.h"
 #include "dst_openssl.h"
 #include "dst_parse.h"
 #include "openssl_shim.h"
 
-#include <dst/result.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
 #define DST_RET(a)        \
 	{                 \
 		ret = a;  \

lib/dns/opensslrsa_link.c

@@ -14,21 +14,23 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include <openssl/bn.h>
+#include <openssl/err.h>
+#include <openssl/objects.h>
+#include <openssl/rsa.h>
+
 #include <isc/mem.h>
 #include <isc/safe.h>
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
+#include <dst/result.h>
+
 #include "dst_internal.h"
 #include "dst_openssl.h"
 #include "dst_parse.h"
-
-#include <dst/result.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/objects.h>
-#include <openssl/rsa.h>
-#include <pk11/site.h>
 #if !defined(OPENSSL_NO_ENGINE)
 #include <openssl/engine.h>
 #endif /* if !defined(OPENSSL_NO_ENGINE) */

lib/dns/pkcs11.c

@@ -13,15 +13,15 @@
 
 #include <isc/util.h>
 
+#include <pk11/internal.h>
+#include <pk11/pk11.h>
+
 #include <dns/log.h>
 #include <dns/result.h>
 
 #include "dst_internal.h"
 #include "dst_pkcs11.h"
 
-#include <pk11/internal.h>
-#include <pk11/pk11.h>
-
 isc_result_t
 dst__pkcs11_toresult(const char *funcname, const char *file, int line,
 		     isc_result_t fallback, CK_RV rv) {

lib/dns/pkcs11ecdsa_link.c

@@ -20,18 +20,19 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include <dns/keyvalues.h>
-
-#include "dst_internal.h"
-#include "dst_parse.h"
-#include "dst_pkcs11.h"
-
-#include <dst/result.h>
 #include <pk11/constants.h>
 #include <pk11/internal.h>
 #include <pk11/pk11.h>
 #include <pkcs11/pkcs11.h>
 
+#include <dns/keyvalues.h>
+
+#include <dst/result.h>
+
+#include "dst_internal.h"
+#include "dst_parse.h"
+#include "dst_pkcs11.h"
+
 /*
  * FIPS 186-3 ECDSA keys:
  *  mechanisms:

lib/dns/pkcs11eddsa_link.c

@@ -20,19 +20,20 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include <dns/keyvalues.h>
-
-#include "dst_internal.h"
-#include "dst_parse.h"
-#include "dst_pkcs11.h"
-
-#include <dst/result.h>
 #include <pk11/constants.h>
 #include <pk11/internal.h>
 #include <pk11/pk11.h>
 #include <pkcs11/eddsa.h>
 #include <pkcs11/pkcs11.h>
 
+#include <dns/keyvalues.h>
+
+#include <dst/result.h>
+
+#include "dst_internal.h"
+#include "dst_parse.h"
+#include "dst_pkcs11.h"
+
 /*
  * FIPS 186-3 EDDSA keys:
  *  mechanisms:

lib/dns/pkcs11rsa_link.c

@@ -21,14 +21,15 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/internal.h>
+#include <pk11/site.h>
+
+#include <dst/result.h>
+
 #include "dst_internal.h"
 #include "dst_parse.h"
 #include "dst_pkcs11.h"
 
-#include <dst/result.h>
-#include <pk11/internal.h>
-#include <pk11/site.h>
-
 /*
  * Limit the size of public exponents.
  */

lib/dns/rbt.c

@@ -13,6 +13,7 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
+#include <sys/stat.h>
 
 #include <isc/crc64.h>
 #include <isc/file.h>
@@ -27,8 +28,6 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include <sys/stat.h>
-
 /*%
  * This define is so dns/name.h (included by dns/fixedname.h) uses more
  * efficient macro calls instead of functions for a few operations.

lib/dns/rcode.c

@@ -24,6 +24,8 @@
 #include <isc/types.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/cert.h>
 #include <dns/ds.h>
 #include <dns/dsdigest.h>
@@ -35,8 +37,6 @@
 #include <dns/secalg.h>
 #include <dns/secproto.h>
 
-#include <pk11/site.h>
-
 #define RETERR(x)                        \
 	do {                             \
 		isc_result_t _r = (x);   \

lib/dns/spnego.c

@@ -152,11 +152,11 @@
 #include <dns/result.h>
 #include <dns/types.h>
 
-#include "dst_internal.h"
-
 #include <dst/gssapi.h>
 #include <dst/result.h>
 
+#include "dst_internal.h"
+
 /*
  * The API we export
  */

lib/dns/tests/dh_test.c

@@ -25,14 +25,15 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/name.h>
 
+#include <dst/result.h>
+
 #include "../dst_internal.h"
 #include "dnstest.h"
 
-#include <dst/result.h>
-#include <pk11/site.h>
-
 #if USE_OPENSSL
 static int
 _setup(void **state) {

lib/dns/tests/dst_test.c

@@ -28,12 +28,12 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include "../dst_internal.h"
-#include "dnstest.h"
-
 #include <dst/dst.h>
 #include <dst/result.h>
 
+#include "../dst_internal.h"
+#include "dnstest.h"
+
 static int
 _setup(void **state) {
 	isc_result_t result;

lib/dns/tests/keytable_test.c

@@ -38,10 +38,10 @@
 #include <dns/rootns.h>
 #include <dns/view.h>
 
-#include "dnstest.h"
-
 #include <dst/dst.h>
 
+#include "dnstest.h"
+
 static int
 _setup(void **state) {
 	isc_result_t result;

lib/dns/tests/private_test.c

@@ -31,10 +31,10 @@
 #include <dns/rdataclass.h>
 #include <dns/rdatatype.h>
 
-#include "dnstest.h"
-
 #include <dst/dst.h>
 
+#include "dnstest.h"
+
 static dns_rdatatype_t privatetype = 65534;
 
 static int

lib/dns/tests/rbt_serialize_test.c

@@ -18,9 +18,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <unistd.h>
-
 #include <sys/mman.h>
+#include <unistd.h>
 
 #define UNIT_TESTING
 #include <cmocka.h>
@@ -48,10 +47,10 @@
 #include <dns/rbt.h>
 #include <dns/result.h>
 
-#include "dnstest.h"
-
 #include <dst/dst.h>
 
+#include "dnstest.h"
+
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif /* ifndef MAP_FILE */

lib/dns/tests/rbt_test.c

@@ -51,10 +51,10 @@
 #include <dns/rbt.h>
 #include <dns/result.h>
 
-#include "dnstest.h"
-
 #include <dst/dst.h>
 
+#include "dnstest.h"
+
 typedef struct {
 	dns_rbt_t *rbt;
 	dns_rbt_t *rbt_distances;

lib/dns/tests/rsa_test.c

@@ -26,11 +26,11 @@
 #include <isc/print.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include "../dst_internal.h"
 #include "dnstest.h"
 
-#include <pk11/site.h>
-
 static int
 _setup(void **state) {
 	isc_result_t result;

lib/dns/tests/sigs_test.c

@@ -42,11 +42,11 @@
 #include <dns/types.h>
 #include <dns/zone.h>
 
+#include <dst/dst.h>
+
 #include "../zone_p.h"
 #include "dnstest.h"
 
-#include <dst/dst.h>
-
 static int
 _setup(void **state) {
 	isc_result_t result;

lib/dns/tkey.c

@@ -23,6 +23,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/dnssec.h>
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
@@ -37,11 +39,10 @@
 #include <dns/tkey.h>
 #include <dns/tsig.h>
 
-#include "dst_internal.h"
-
 #include <dst/dst.h>
 #include <dst/gssapi.h>
-#include <pk11/site.h>
+
+#include "dst_internal.h"
 
 #define TEMP_BUFFER_SZ	   8192
 #define TKEY_RANDOM_AMOUNT 16

lib/dns/tsec.c

@@ -12,12 +12,13 @@
 #include <isc/mem.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/result.h>
 #include <dns/tsec.h>
 #include <dns/tsig.h>
 
 #include <dst/dst.h>
-#include <pk11/site.h>
 
 #define DNS_TSEC_MAGIC	  ISC_MAGIC('T', 's', 'e', 'c')
 #define DNS_TSEC_VALID(t) ISC_MAGIC_VALID(t, DNS_TSEC_MAGIC)

lib/dns/tsig.c

@@ -24,6 +24,8 @@
 #include <isc/time.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
 #include <dns/log.h>
@@ -36,10 +38,9 @@
 #include <dns/result.h>
 #include <dns/tsig.h>
 
-#include "tsig_p.h"
-
 #include <dst/result.h>
-#include <pk11/site.h>
+
+#include "tsig_p.h"
 
 #define TSIG_MAGIC	  ISC_MAGIC('T', 'S', 'I', 'G')
 #define VALID_TSIG_KEY(x) ISC_MAGIC_VALID(x, TSIG_MAGIC)

lib/dns/zone.c

@@ -83,10 +83,10 @@
 #include <dns/zoneverify.h>
 #include <dns/zt.h>
 
-#include "zone_p.h"
-
 #include <dst/dst.h>
 
+#include "zone_p.h"
+
 #define ZONE_MAGIC	     ISC_MAGIC('Z', 'O', 'N', 'E')
 #define DNS_ZONE_VALID(zone) ISC_MAGIC_VALID(zone, ZONE_MAGIC)
 

lib/irs/resconf.c

@@ -34,7 +34,6 @@
 
 #ifndef WIN32
 #include <netdb.h>
-
 #include <sys/socket.h>
 #include <sys/types.h>
 #endif /* ifndef WIN32 */

lib/irs/win32/resconf.c

@@ -22,7 +22,6 @@
 #define HAVE_GET_WIN32_NAMESERVERS 1
 
 #include "../resconf.c"
-
 #include <iphlpapi.h>
 
 #define TCPIP_SUBKEY "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"

lib/isc/aes.c

@@ -11,6 +11,9 @@
 
 /*! \file isc/aes.c */
 
+#include <openssl/evp.h>
+#include <openssl/opensslv.h>
+
 #include <isc/aes.h>
 #include <isc/assertions.h>
 #include <isc/platform.h>
@@ -18,9 +21,6 @@
 #include <isc/types.h>
 #include <isc/util.h>
 
-#include <openssl/evp.h>
-#include <openssl/opensslv.h>
-
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #define EVP_CIPHER_CTX_new()   &(_context), EVP_CIPHER_CTX_init(&_context)
 #define EVP_CIPHER_CTX_free(c) RUNTIME_CHECK(EVP_CIPHER_CTX_cleanup(c) == 1)

lib/isc/app.c

@@ -15,14 +15,12 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <unistd.h>
-
 #include <sys/types.h>
+#include <unistd.h>
 
 #ifndef WIN32
 #include <inttypes.h>
 #include <signal.h>
-
 #include <sys/time.h>
 #endif /* WIN32 */
 

lib/isc/entropy.c

@@ -9,14 +9,14 @@
  * information regarding copyright ownership.
  */
 
+#include <openssl/err.h>
+#include <openssl/rand.h>
+
 #include <isc/types.h>
 #include <isc/util.h>
 
 #include "entropy_private.h"
 
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
 void
 isc_entropy_get(void *buf, size_t buflen) {
 	if (RAND_bytes(buf, buflen) < 1) {

lib/isc/hmac.c

@@ -9,6 +9,9 @@
  * information regarding copyright ownership.
  */
 
+#include <openssl/hmac.h>
+#include <openssl/opensslv.h>
+
 #include <isc/assertions.h>
 #include <isc/hmac.h>
 #include <isc/md.h>
@@ -20,9 +23,6 @@
 
 #include "openssl_shim.h"
 
-#include <openssl/hmac.h>
-#include <openssl/opensslv.h>
-
 isc_hmac_t *
 isc_hmac_new(void) {
 	isc_hmac_t *hmac = HMAC_CTX_new();

lib/isc/log.c

@@ -16,6 +16,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/types.h> /* dev_t FreeBSD 2.1 */
 #include <time.h>
 
 #include <isc/dir.h>
@@ -31,8 +32,6 @@
 #include <isc/time.h>
 #include <isc/util.h>
 
-#include <sys/types.h> /* dev_t FreeBSD 2.1 */
-
 #define LCTX_MAGIC	    ISC_MAGIC('L', 'c', 't', 'x')
 #define VALID_CONTEXT(lctx) ISC_MAGIC_VALID(lctx, LCTX_MAGIC)
 

lib/isc/md.c

@@ -11,15 +11,15 @@
 
 #include <stdio.h>
 
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/opensslv.h>
+
 #include <isc/md.h>
 #include <isc/util.h>
 
 #include "openssl_shim.h"
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/opensslv.h>
-
 isc_md_t *
 isc_md_new(void) {
 	isc_md_t *md = EVP_MD_CTX_new();

lib/isc/netmgr/uv-compat.c

@@ -10,7 +10,6 @@
  */
 
 #include "uv-compat.h"
-
 #include <unistd.h>
 
 #include <isc/util.h>
@@ -92,7 +91,6 @@ isc_uv_import(uv_stream_t *stream, isc_uv_stream_info_t *info) {
 #else /* WIN32 */
 /* Adapted from libuv/src/unix/internal.h */
 #include <fcntl.h>
-
 #include <sys/ioctl.h>
 
 static int

lib/isc/openssl_shim.c

@@ -10,7 +10,6 @@
  */
 
 #include "openssl_shim.h"
-
 #include <stdlib.h>
 #include <string.h>