diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index 8f0681aa38..ee938a5973 100644
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -20,9 +20,10 @@
 
 #include <stdbool.h>
 
+#include <isccc/types.h>
+
 #include <isccfg/aclconf.h>
 
-#include <isccc/types.h>
 #include <named/types.h>
 
 #define NAMED_CONTROL_PORT 953
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 40b37143bc..4f64c13a13 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -26,10 +26,11 @@
 #include <dns/acl.h>
 #include <dns/zone.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/aclconf.h>
 #include <isccfg/cfg.h>
 
-#include <dst/dst.h>
 #include <named/fuzz.h>
 #include <named/types.h>
 
diff --git a/bin/named/include/named/statschannel.h b/bin/named/include/named/statschannel.h
index 8240dc12d6..8cce67083a 100644
--- a/bin/named/include/named/statschannel.h
+++ b/bin/named/include/named/statschannel.h
@@ -18,9 +18,10 @@
  * The statistics channels built-in the name server.
  */
 
+#include <isccc/types.h>
+
 #include <isccfg/aclconf.h>
 
-#include <isccc/types.h>
 #include <named/types.h>
 
 #define NAMED_STATSCHANNEL_HTTPPORT 80
diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h
index 0bc092aead..7acdbb19ca 100644
--- a/contrib/dlz/modules/include/dlz_minimal.h
+++ b/contrib/dlz/modules/include/dlz_minimal.h
@@ -25,13 +25,12 @@
 
 #pragma once
 
-#include <inttypes.h>
-#include <stdbool.h>
-#include <stdlib.h>
-
 #include <arpa/inet.h>
+#include <inttypes.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h
index 48718232cd..c99920cb77 100644
--- a/lib/dns/include/dns/librpz.h
+++ b/lib/dns/include/dns/librpz.h
@@ -36,13 +36,12 @@
 
 #pragma once
 
+#include <arpa/nameser.h>
 #include <inttypes.h>
+#include <netinet/in.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
-
-#include <arpa/nameser.h>
-#include <netinet/in.h>
 #include <sys/types.h>
 
 /*
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 34a3f2e6eb..83ea6bb406 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -46,6 +46,7 @@
  */
 
 #include <inttypes.h>
+#include <netinet/in.h>
 #include <stdbool.h>
 
 #include <isc/lang.h>
@@ -58,8 +59,6 @@
 #include <dns/fixedname.h>
 #include <dns/types.h>
 
-#include <netinet/in.h>
-
 #undef DNS_RESOLVER_TRACE
 
 ISC_LANG_BEGINDECLS
diff --git a/lib/isc/include/isc/dir.h b/lib/isc/include/isc/dir.h
index 90c327ecb4..51db17f75a 100644
--- a/lib/isc/include/isc/dir.h
+++ b/lib/isc/include/isc/dir.h
@@ -17,12 +17,11 @@
 
 #include <dirent.h>
 #include <limits.h>
+#include <sys/types.h> /* Required on some systems. */
 
 #include <isc/lang.h>
 #include <isc/result.h>
 
-#include <sys/types.h> /* Required on some systems. */
-
 #ifndef NAME_MAX
 #define NAME_MAX 256
 #endif
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 73aeaf8265..61365a32d2 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -17,12 +17,11 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <sys/stat.h>
 
 #include <isc/lang.h>
 #include <isc/types.h>
 
-#include <sys/stat.h>
-
 ISC_LANG_BEGINDECLS
 
 isc_result_t
diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index 1a3ce63e05..320c5f682d 100644
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -65,17 +65,16 @@
 /***
  *** Imports.
  ***/
-#include <inttypes.h>
-
-#include <isc/lang.h>
-#include <isc/types.h>
-
 #include <arpa/inet.h> /* Contractual promise. */
+#include <inttypes.h>
 #include <net/if.h>
 #include <netinet/in.h> /* Contractual promise. */
 #include <sys/socket.h> /* Contractual promise. */
 #include <sys/types.h>
 
+#include <isc/lang.h>
+#include <isc/types.h>
+
 #ifndef IN6ADDR_LOOPBACK_INIT
 #ifdef s6_addr
 /*% IPv6 address loopback init */
diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index 112051f9f9..e2d0613ed6 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -17,14 +17,13 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
+#include <sys/types.h>
+#include <sys/un.h>
 
 #include <isc/lang.h>
 #include <isc/net.h>
 #include <isc/types.h>
 
-#include <sys/types.h>
-#include <sys/un.h>
-
 ISC_LANG_BEGINDECLS
 
 /*
diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h
index 9201dee880..ddec791437 100644
--- a/lib/isc/include/isc/netmgr.h
+++ b/lib/isc/include/isc/netmgr.h
@@ -13,6 +13,8 @@
 
 #pragma once
 
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/mem.h>
@@ -21,9 +23,6 @@
 #include <isc/tls.h>
 #include <isc/types.h>
 
-#include <sys/socket.h>
-#include <sys/types.h>
-
 #undef ISC_NETMGR_TRACE
 
 #if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 9f3986b01f..5d86d49895 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -16,13 +16,12 @@
 /*! \file isc/sockaddr.h */
 
 #include <stdbool.h>
+#include <sys/un.h>
 
 #include <isc/lang.h>
 #include <isc/net.h>
 #include <isc/types.h>
 
-#include <sys/un.h>
-
 /*
  * Any updates to this structure should also be applied in
  * contrib/modules/dlz/dlz_minmal.h.
diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h
index f597276756..20fe17b7db 100644
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -38,6 +38,7 @@
 #include <isc/lang.h>
 
 #include <dst/dst.h>
+
 #include <isccc/types.h>
 
 ISC_LANG_BEGINDECLS