diff --git a/fabrics.c b/fabrics.c
index 0d477e5cb5..67fac48c29 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -19,25 +19,26 @@
  * Fabrics specification standard.
  */
 
+#include <dirent.h>
 #include <errno.h>
-#include <getopt.h>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <dirent.h>
+#include <getopt.h>
 #include <inttypes.h>
 #include <libgen.h>
-#include <sys/stat.h>
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <time.h>
+#include <unistd.h>
 
-#include <sys/types.h>
 #include <linux/types.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <libnvme.h>
 
 #include "common.h"
diff --git a/libnvme/examples/discover-loop.c b/libnvme/examples/discover-loop.c
index f4d7d80b57..a41df92b43 100644
--- a/libnvme/examples/discover-loop.c
+++ b/libnvme/examples/discover-loop.c
@@ -14,14 +14,15 @@
  */
 #define __SANE_USERSPACE_TYPES__
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <libnvme.h>
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
 static void print_discover_log(struct nvmf_discovery_log *log)
 {
 	int i, numrec = le64_to_cpu(log->numrec);
diff --git a/libnvme/examples/mi-conf.c b/libnvme/examples/mi-conf.c
index f834bcce3a..03b74639d7 100644
--- a/libnvme/examples/mi-conf.c
+++ b/libnvme/examples/mi-conf.c
@@ -18,13 +18,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libnvme-mi.h>
-
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
 #include <dbus/dbus.h>
 
+#include <libnvme-mi.h>
+
 #define MCTP_DBUS_NAME "au.com.codeconstruct.MCTP1"
 #define MCTP_DBUS_PATH "/au/com/codeconstruct/mctp1"
 #define MCTP_DBUS_EP_IFACE "au.com.codeconstruct.MCTP.Endpoint1"
diff --git a/libnvme/examples/mi-mctp-ae.c b/libnvme/examples/mi-mctp-ae.c
index 5eeecf6da5..e35ffebc75 100644
--- a/libnvme/examples/mi-mctp-ae.c
+++ b/libnvme/examples/mi-mctp-ae.c
@@ -10,19 +10,20 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
+#include <poll.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h> // for usleep
 
-#include <libnvme-mi.h>
-#include <poll.h>
+#include <sys/select.h>
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
-#include <sys/select.h>
+
+#include <libnvme-mi.h>
 
 struct app_userdata {
 	uint32_t count;
diff --git a/libnvme/examples/mi-mctp-csi-test.c b/libnvme/examples/mi-mctp-csi-test.c
index a7ca2b7dca..57602fe049 100644
--- a/libnvme/examples/mi-mctp-csi-test.c
+++ b/libnvme/examples/mi-mctp-csi-test.c
@@ -11,17 +11,17 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <pthread.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <pthread.h>
-
-#include <libnvme-mi.h>
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
+#include <libnvme-mi.h>
+
 void fhexdump(FILE *fp, const unsigned char *buf, int len)
 {
 	const int row_len = 16;
diff --git a/libnvme/examples/mi-mctp.c b/libnvme/examples/mi-mctp.c
index 042e58e663..5aa4831095 100644
--- a/libnvme/examples/mi-mctp.c
+++ b/libnvme/examples/mi-mctp.c
@@ -13,16 +13,16 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 
-#include <libnvme-mi.h>
-
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
+#include <libnvme-mi.h>
+
 static void show_port_pcie(struct nvme_mi_read_port_info *port)
 {
 	printf("    PCIe max payload: 0x%x\n", 0x80 << port->pcie.mps);
diff --git a/libnvme/examples/telemetry-listen.c b/libnvme/examples/telemetry-listen.c
index 2029da5848..931d95d99d 100644
--- a/libnvme/examples/telemetry-listen.c
+++ b/libnvme/examples/telemetry-listen.c
@@ -11,19 +11,22 @@
  * is observed with controller telemetry data, read the log and save it to a
  * file in /var/log/ with the device's unique name and epoch timestamp.
  */
-#include "nvme/tree.h"
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <time.h>
-#include <libnvme.h>
+#include <unistd.h>
+
 #include <sys/stat.h>
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
+#include "nvme/tree.h"
+
 struct events {
 	nvme_ctrl_t c;
 	int uevent_fd;
diff --git a/libnvme/src/nvme/base64.c b/libnvme/src/nvme/base64.c
index c46209707d..815d6869d7 100644
--- a/libnvme/src/nvme/base64.c
+++ b/libnvme/src/nvme/base64.c
@@ -7,10 +7,9 @@
  * Author: Hannes Reinecke <hare@suse.de>
  */
 
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
-#include <errno.h>
-#include <sys/types.h>
 
 static const char base64_table[65] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/libnvme/src/nvme/cleanup.h b/libnvme/src/nvme/cleanup.h
index a20cc26ec8..ac3461c655 100644
--- a/libnvme/src/nvme/cleanup.h
+++ b/libnvme/src/nvme/cleanup.h
@@ -3,12 +3,13 @@
 #define __CLEANUP_H
 
 #include <dirent.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
+
 #include <sys/socket.h>
-#include <netdb.h>
+#include <sys/types.h>
 
 #include "fabrics.h"
 
diff --git a/libnvme/src/nvme/cmds.h b/libnvme/src/nvme/cmds.h
index ef0a4fcde7..22b1fed236 100644
--- a/libnvme/src/nvme/cmds.h
+++ b/libnvme/src/nvme/cmds.h
@@ -10,13 +10,13 @@
 
 #pragma once
 
+#include <endian.h>
+#include <errno.h>
+#include <string.h>
+
 #include <nvme/ioctl.h>
 #include <nvme/types.h>
 
-#include <string.h>
-#include <errno.h>
-#include <endian.h>
-
 enum nvme_cmd_dword_fields {
 	NVME_DEVICE_SELF_TEST_CDW10_STC_SHIFT			= 0,
 	NVME_DEVICE_SELF_TEST_CDW10_STC_MASK			= 0xf,
diff --git a/libnvme/src/nvme/crc32.h b/libnvme/src/nvme/crc32.h
index c53eff181f..e811421c71 100644
--- a/libnvme/src/nvme/crc32.h
+++ b/libnvme/src/nvme/crc32.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 uint32_t crc32(uint32_t crc, const void *buf, size_t len);
diff --git a/libnvme/src/nvme/fabrics.c b/libnvme/src/nvme/fabrics.c
index 5f331cd159..2315a1c638 100644
--- a/libnvme/src/nvme/fabrics.c
+++ b/libnvme/src/nvme/fabrics.c
@@ -7,29 +7,29 @@
  * 	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <fnmatch.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fnmatch.h>
-#include <dirent.h>
-#include <inttypes.h>
 
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netdb.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <net/if.h>
 
+#include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 #include <ccan/list/list.h>
-#include <ccan/array_size/array_size.h>
 #include <ccan/str/str.h>
 
 #include <libnvme.h>
diff --git a/libnvme/src/nvme/filters.c b/libnvme/src/nvme/filters.c
index e2f50e3137..de6915ed86 100644
--- a/libnvme/src/nvme/filters.c
+++ b/libnvme/src/nvme/filters.c
@@ -6,9 +6,9 @@
  * Authors: Keith Busch <keith.busch@wdc.com>
  * 	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
+#include <dirent.h>
 #include <stdio.h>
 #include <string.h>
-#include <dirent.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/src/nvme/generate-accessors.c b/libnvme/src/nvme/generate-accessors.c
index d3ef1485ef..8f51637655 100644
--- a/libnvme/src/nvme/generate-accessors.c
+++ b/libnvme/src/nvme/generate-accessors.c
@@ -27,21 +27,20 @@
  *   ./generate-accessors private.h
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <getopt.h>
+#include <glob.h>
+#include <libgen.h>
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
-#include <getopt.h>
-#include <glob.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <libgen.h>
-#include <stdio.h>
-#include <ctype.h>
 
 #ifdef NVME_HAVE_SENDFILE
 #include <sys/sendfile.h>
diff --git a/libnvme/src/nvme/ioctl.c b/libnvme/src/nvme/ioctl.c
index 88902a50a8..324bf7c569 100644
--- a/libnvme/src/nvme/ioctl.c
+++ b/libnvme/src/nvme/ioctl.c
@@ -8,22 +8,21 @@
  */
 #include <errno.h>
 #include <fcntl.h>
-#ifdef CONFIG_LIBURING
-#include <liburing.h>
-#endif
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <inttypes.h>
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+
+#ifdef CONFIG_LIBURING
+#include <liburing.h>
+#endif
 
 #include <ccan/build_assert/build_assert.h>
-#include <ccan/minmax/minmax.h>
 #include <ccan/endian/endian.h>
+#include <ccan/minmax/minmax.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/src/nvme/json.c b/libnvme/src/nvme/json.c
index 84d0b94d6c..2ef04a7930 100644
--- a/libnvme/src/nvme/json.c
+++ b/libnvme/src/nvme/json.c
@@ -6,9 +6,9 @@
  * Authors: Hannes Reinecke <hare@suse.de>
  */
 
+#include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include <json.h>
 
diff --git a/libnvme/src/nvme/lib.c b/libnvme/src/nvme/lib.c
index 0a2f76f347..856c2226da 100644
--- a/libnvme/src/nvme/lib.c
+++ b/libnvme/src/nvme/lib.c
@@ -7,16 +7,17 @@
  *	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
 
+#include <fcntl.h>
+#include <libgen.h>
+#include <strings.h>
+
+#include <sys/ioctl.h>
+
 #include <libnvme.h>
 
 #include "cleanup.h"
 #include "private.h"
 
-#include <libgen.h>
-#include <strings.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
 static bool nvme_mi_probe_enabled_default(void)
 {
 	char *val;
diff --git a/libnvme/src/nvme/lib.h b/libnvme/src/nvme/lib.h
index eeb6444fcf..6efc245d9b 100644
--- a/libnvme/src/nvme/lib.h
+++ b/libnvme/src/nvme/lib.h
@@ -8,8 +8,8 @@
  */
 #pragma once
 
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <syslog.h>
 
 #include <nvme/lib-types.h>
diff --git a/libnvme/src/nvme/linux.c b/libnvme/src/nvme/linux.c
index 6dfaf10d43..52416bef37 100644
--- a/libnvme/src/nvme/linux.c
+++ b/libnvme/src/nvme/linux.c
@@ -7,21 +7,23 @@
  * 	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-
+#include <fcntl.h>
 #ifndef _GNU_SOURCE
 #include <libgen.h>
 #endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
+#include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 
-#include <sys/ioctl.h>
+#ifndef _GNU_SOURCE
+#include <libgen.h>
+#endif
 
 #ifdef CONFIG_OPENSSL
 #include <openssl/evp.h>
diff --git a/libnvme/src/nvme/linux.h b/libnvme/src/nvme/linux.h
index 9070cbcda7..7c947f0fbf 100644
--- a/libnvme/src/nvme/linux.h
+++ b/libnvme/src/nvme/linux.h
@@ -8,8 +8,8 @@
  */
 #pragma once
 
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 #include <nvme/lib-types.h>
 
diff --git a/libnvme/src/nvme/log.c b/libnvme/src/nvme/log.c
index 193e1293ee..56187574ac 100644
--- a/libnvme/src/nvme/log.c
+++ b/libnvme/src/nvme/log.c
@@ -8,13 +8,12 @@
  * This file implements basic logging functionality.
  */
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <syslog.h>
-#include <unistd.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/src/nvme/mi-mctp.c b/libnvme/src/nvme/mi-mctp.c
index 653b60d709..b87b19c859 100644
--- a/libnvme/src/nvme/mi-mctp.c
+++ b/libnvme/src/nvme/mi-mctp.c
@@ -7,17 +7,17 @@
  */
 
 #include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <poll.h>
-#include <fcntl.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <sys/ioctl.h>
 
 #if HAVE_LINUX_MCTP_H
 #include <linux/mctp.h>
diff --git a/libnvme/src/nvme/mi.c b/libnvme/src/nvme/mi.c
index effb703701..f023428e67 100644
--- a/libnvme/src/nvme/mi.c
+++ b/libnvme/src/nvme/mi.c
@@ -7,15 +7,14 @@
  */
 
 #include <errno.h>
-#include <stdlib.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <ccan/array_size/array_size.h>
-#include <ccan/minmax/minmax.h>
 #include <ccan/endian/endian.h>
+#include <ccan/minmax/minmax.h>
 
 #include <libnvme.h>
 #include <libnvme-mi.h>
diff --git a/libnvme/src/nvme/nbft.c b/libnvme/src/nvme/nbft.c
index a9d9321c1f..9dd0fb676b 100644
--- a/libnvme/src/nvme/nbft.c
+++ b/libnvme/src/nvme/nbft.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 
 #include <arpa/inet.h>
+
 #include <ccan/endian/endian.h>
 
 #include <libnvme.h>
diff --git a/libnvme/src/nvme/nbft.h b/libnvme/src/nvme/nbft.h
index 79ae801446..f14331ac72 100644
--- a/libnvme/src/nvme/nbft.h
+++ b/libnvme/src/nvme/nbft.h
@@ -9,9 +9,9 @@
 #pragma once
 
 #include <stdbool.h>
-#include <sys/types.h>
 
 #include <linux/types.h>
+#include <sys/types.h>
 
 #include <nvme/lib-types.h>
 
diff --git a/libnvme/src/nvme/no-json.c b/libnvme/src/nvme/no-json.c
index 0dc36cf694..2315b729e9 100644
--- a/libnvme/src/nvme/no-json.c
+++ b/libnvme/src/nvme/no-json.c
@@ -6,10 +6,10 @@
  * Authors: Daniel Wagner <dwagner@suse.de>
  */
 
-#include <libnvme.h>
-
 #include <errno.h>
 
+#include <libnvme.h>
+
 int json_read_config(struct nvme_global_ctx *ctx, const char *config_file)
 {
 	return -ENOTSUP;
diff --git a/libnvme/src/nvme/private.h b/libnvme/src/nvme/private.h
index 7f82769b3f..a85c5c177d 100644
--- a/libnvme/src/nvme/private.h
+++ b/libnvme/src/nvme/private.h
@@ -7,13 +7,15 @@
  */
 #pragma once
 
-#include <ccan/list/list.h>
+#include <ifaddrs.h>
 #include <poll.h>
+
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/ioctl.h>
-#include <ifaddrs.h>
+
+#include <ccan/list/list.h>
 
 #include <nvme/fabrics.h>
 #include <nvme/mi.h>
diff --git a/libnvme/src/nvme/tree.c b/libnvme/src/nvme/tree.c
index dcc540fb89..079ccd209c 100644
--- a/libnvme/src/nvme/tree.c
+++ b/libnvme/src/nvme/tree.c
@@ -8,19 +8,19 @@
  */
 #include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <ifaddrs.h>
+#include <libgen.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <libgen.h>
 #include <unistd.h>
-#include <ifaddrs.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include <ccan/endian/endian.h>
 #include <ccan/list/list.h>
diff --git a/libnvme/src/nvme/util.c b/libnvme/src/nvme/util.c
index ed2e239648..d60667d337 100644
--- a/libnvme/src/nvme/util.c
+++ b/libnvme/src/nvme/util.c
@@ -7,23 +7,23 @@
  * 	    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <malloc.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/param.h>
-#include <sys/types.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <unistd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
-#include <ccan/minmax/minmax.h>
 #include <ccan/endian/endian.h>
+#include <ccan/minmax/minmax.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/test/config/config-dump.c b/libnvme/test/config/config-dump.c
index 1adc3348a1..0c68195d62 100644
--- a/libnvme/test/config/config-dump.c
+++ b/libnvme/test/config/config-dump.c
@@ -4,11 +4,11 @@
  * Copyright (c) 2024 Daniel Wagner, SUSE LLC
  */
 
-#include <string.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/test/config/hostnqn-order.c b/libnvme/test/config/hostnqn-order.c
index 52d1ae4166..7500b96675 100644
--- a/libnvme/test/config/hostnqn-order.c
+++ b/libnvme/test/config/hostnqn-order.c
@@ -4,10 +4,10 @@
  * Copyright (c) 2024 Daniel Wagner, SUSE LLC
  */
 
-#include <string.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <string.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/test/config/psk-json.c b/libnvme/test/config/psk-json.c
index 35fc67ee4a..b83ebfb32a 100644
--- a/libnvme/test/config/psk-json.c
+++ b/libnvme/test/config/psk-json.c
@@ -4,16 +4,17 @@
  * Copyright (c) 2024 Daniel Wagner, SUSE LLC
  */
 
-#include "nvme/linux.h"
-#include "nvme/tree.h"
-#include <string.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include <libnvme.h>
 
+#include "nvme/linux.h"
+#include "nvme/tree.h"
+
 static bool import_export_key(struct nvme_global_ctx *ctx, nvme_ctrl_t c)
 {
 	unsigned char version, hmac, *key;
diff --git a/libnvme/test/hkdf_add1.c b/libnvme/test/hkdf_add1.c
index ceb0ac9df1..1c89995452 100644
--- a/libnvme/test/hkdf_add1.c
+++ b/libnvme/test/hkdf_add1.c
@@ -6,13 +6,14 @@
  * Authors: Daniel Wagner <wagi@kernel.org>
  */
 
+#include <stdio.h>
+#include <string.h>
+
 #include <openssl/core_names.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/kdf.h>
 #include <openssl/params.h>
-#include <stdio.h>
-#include <string.h>
 
 #define SHA256_LEN 32
 
diff --git a/libnvme/test/ioctl/misc.c b/libnvme/test/ioctl/misc.c
index 3045267c62..66994d45dc 100644
--- a/libnvme/test/ioctl/misc.c
+++ b/libnvme/test/ioctl/misc.c
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
+#include <inttypes.h>
+#include <string.h>
+
 #include <libnvme.h>
 
 #include "mock.h"
 #include "util.h"
 
-#include <string.h>
-#include <inttypes.h>
-
 #define TEST_FD 0xFD
 #define TEST_NSID 0x12345678
 #define TEST_CSI NVME_CSI_KV
diff --git a/libnvme/test/ioctl/mock.c b/libnvme/test/ioctl/mock.c
index baa87de4e7..cf03e2d28f 100644
--- a/libnvme/test/ioctl/mock.c
+++ b/libnvme/test/ioctl/mock.c
@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
+#include <dlfcn.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <string.h>
+
 #include <sys/ioctl.h>
-#include <dlfcn.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/test/ioctl/zns.c b/libnvme/test/ioctl/zns.c
index 6214543d19..b5cf859f96 100644
--- a/libnvme/test/ioctl/zns.c
+++ b/libnvme/test/ioctl/zns.c
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
+#include <inttypes.h>
+
 #include <libnvme.h>
 
 #include "mock.h"
 #include "util.h"
 
-#include <inttypes.h>
-
 #define TEST_FD 0xFD
 #define TEST_NSID 0x12345678
 #define TEST_SLBA 0xffffffff12345678
diff --git a/libnvme/test/mi-mctp.c b/libnvme/test/mi-mctp.c
index 87d8bb69e0..c666b0119d 100644
--- a/libnvme/test/mi-mctp.c
+++ b/libnvme/test/mi-mctp.c
@@ -8,12 +8,19 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/socket.h>
+
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#if HAVE_LINUX_MCTP_H
+#include <linux/mctp.h>
+#else
+#include "nvme/mi-mctp-compat.h"
+#endif
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
@@ -25,12 +32,6 @@
 
 #include "utils.h"
 
-#if HAVE_LINUX_MCTP_H
-#include <linux/mctp.h>
-#else
-#include "nvme/mi-mctp-compat.h"
-#endif
-
 /* 4096 byte max MCTP message, plus space for header data */
 #define MAX_BUFSIZ 8192
 
diff --git a/libnvme/test/mi.c b/libnvme/test/mi.c
index 918200317d..3a890bc716 100644
--- a/libnvme/test/mi.c
+++ b/libnvme/test/mi.c
@@ -6,8 +6,8 @@
 
 #undef NDEBUG
 #include <assert.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include <ccan/array_size/array_size.h>
diff --git a/libnvme/test/mock-ifaddrs.c b/libnvme/test/mock-ifaddrs.c
index 87a2e500df..ea3f32bb2d 100644
--- a/libnvme/test/mock-ifaddrs.c
+++ b/libnvme/test/mock-ifaddrs.c
@@ -3,15 +3,16 @@
  * This file is part of libnvme.
  * Copyright (c) 2023 Martin Belanger, Dell Technologies Inc.
  */
-#include <sys/types.h>
 #include <ifaddrs.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
-#include <netinet/in.h>
-#include <net/if.h>
+
 #include <arpa/inet.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <sys/types.h>
 
 struct ifaddrs_storage {
 	struct ifaddrs ifa;
diff --git a/libnvme/test/nbft/nbft-dump.c b/libnvme/test/nbft/nbft-dump.c
index 23b8c213a3..d170cf1ec9 100644
--- a/libnvme/test/nbft/nbft-dump.c
+++ b/libnvme/test/nbft/nbft-dump.c
@@ -4,11 +4,11 @@
  * Copyright (c) 2023 Red Hat Inc.
  */
 
-#include <stdlib.h>
+#include <inttypes.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <inttypes.h>
 
 #include <libnvme.h>
 
diff --git a/libnvme/test/psk.c b/libnvme/test/psk.c
index 125a7cc9a3..7dd810f38a 100644
--- a/libnvme/test/psk.c
+++ b/libnvme/test/psk.c
@@ -4,9 +4,9 @@
  * Copyright (c) 2024 Daniel Wagner, SUSE Software Solutions
  */
 
-#include <string.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <ccan/array_size/array_size.h>
 
diff --git a/libnvme/test/register.c b/libnvme/test/register.c
index 1fb692b83c..72d04752e7 100644
--- a/libnvme/test/register.c
+++ b/libnvme/test/register.c
@@ -15,16 +15,17 @@
 
 #include <fcntl.h>
 #include <inttypes.h>
-#include <libnvme.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <unistd.h>
 
 #include <sys/mman.h>
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
 static inline uint32_t nvme_mmio_read32(volatile void *addr)
 {
         uint32_t *p = (__le32 *)addr;
diff --git a/libnvme/test/test-util.c b/libnvme/test/test-util.c
index c7b661ee35..997d72d13e 100644
--- a/libnvme/test/test-util.c
+++ b/libnvme/test/test-util.c
@@ -14,10 +14,10 @@
  * the libnvme.so.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
 #include <netdb.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <libnvme.h>
diff --git a/libnvme/test/test.c b/libnvme/test/test.c
index 96d9272035..6d8f9c3401 100644
--- a/libnvme/test/test.c
+++ b/libnvme/test/test.c
@@ -15,19 +15,18 @@
  * program exists successfully; an ungraceful exit means a bug exists
  * somewhere.
  */
-#include <libnvme.h>
-
-#include "nvme/private.h"
-
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include <inttypes.h>
-#include <libnvme.h>
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
+#include "nvme/private.h"
+
 static bool nvme_match_subsysnqn_filter(nvme_subsystem_t s,
 		nvme_ctrl_t c, nvme_ns_t ns, void *f_args)
 {
diff --git a/libnvme/test/tree.c b/libnvme/test/tree.c
index a0ad0a5ad7..db10f2af0f 100644
--- a/libnvme/test/tree.c
+++ b/libnvme/test/tree.c
@@ -5,9 +5,9 @@
  */
 
 #include <assert.h>
-#include <string.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 #include <arpa/inet.h>
 
 #include <ccan/array_size/array_size.h>
diff --git a/libnvme/test/uriparser.c b/libnvme/test/uriparser.c
index ae3bd87e96..9d5723b965 100644
--- a/libnvme/test/uriparser.c
+++ b/libnvme/test/uriparser.c
@@ -5,9 +5,9 @@
  */
 
 #include <assert.h>
-#include <string.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <ccan/array_size/array_size.h>
 
diff --git a/libnvme/test/uuid.c b/libnvme/test/uuid.c
index 9146453193..9a2bbc659c 100644
--- a/libnvme/test/uuid.c
+++ b/libnvme/test/uuid.c
@@ -4,8 +4,8 @@
  * Copyright (c) 2022 Daniel Wagner, SUSE Software Solutions
  */
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <ccan/array_size/array_size.h>
 
diff --git a/libnvme/test/zns.c b/libnvme/test/zns.c
index 82d81a5e7f..79051a10fc 100644
--- a/libnvme/test/zns.c
+++ b/libnvme/test/zns.c
@@ -9,19 +9,18 @@
 /*
  * Search out for ZNS type namespaces, and if found, report their properties.
  */
-#include <libnvme.h>
-
-#include "nvme/private.h"
-
-#include <stdio.h>
-#include <string.h>
+#include <inttypes.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <libnvme.h>
-#include <inttypes.h>
+#include <string.h>
 
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
+#include "nvme/private.h"
+
 static void show_zns_properties(nvme_ns_t n)
 {
 	struct nvme_transport_handle *hdl;
diff --git a/logging.c b/logging.c
index 9ed65d17f0..556d383893 100644
--- a/logging.c
+++ b/logging.c
@@ -1,20 +1,22 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <errno.h>
 #include <inttypes.h>
 #include <signal.h>
 #include <stdint.h>
 #include <string.h>
-#include <errno.h>
+
+#include <linux/types.h>
+
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <sys/time.h>
-#include <linux/types.h>
+
+#include <ccan/endian/endian.h>
 
 #include <libnvme.h>
 #include <libnvme-mi.h>
 
-#include <ccan/endian/endian.h>
-
 #include "logging.h"
 #include "util/sighdl.h"
 #include "nvme-print.h"
diff --git a/nvme-models.c b/nvme-models.c
index 84ede6eaaf..eafbb629f1 100644
--- a/nvme-models.c
+++ b/nvme-models.c
@@ -1,13 +1,14 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <errno.h>
+#include <fcntl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
 #include "nvme-models.h"
 #include "nvme.h"
 
diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 456bb4c40b..83f89e1e94 100644
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -2,8 +2,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/nvme-print.c b/nvme-print.c
index 5b13ab68ce..92de312aec 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <assert.h>
 #include <errno.h>
+#include <locale.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
+
 #include <sys/stat.h>
-#include <locale.h>
 
 #include <libnvme.h>
 
diff --git a/nvme-print.h b/nvme-print.h
index 3d80227e76..0d976215d1 100644
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -2,13 +2,14 @@
 #ifndef NVME_PRINT_H
 #define NVME_PRINT_H
 
-#include "nvme.h"
-#include "types.h"
-#include "util/table.h"
 #include <inttypes.h>
 
 #include <ccan/list/list.h>
 
+#include "nvme.h"
+#include "types.h"
+#include "util/table.h"
+
 typedef struct nvme_effects_log_node {
 	struct nvme_cmd_effects_log effects; /* needs to be first member because of alignment requirement. */
 	enum nvme_csi csi;
diff --git a/nvme-rpmb.c b/nvme-rpmb.c
index 9583dbf0a1..ee56b414a8 100644
--- a/nvme-rpmb.c
+++ b/nvme-rpmb.c
@@ -15,19 +15,21 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * nvme-rpmb.c - Implementation of NVMe RPMB support commands in Nvme
  */
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <errno.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/socket.h>
+#include <unistd.h>
+
 #include <linux/if_alg.h>
 #include <linux/socket.h>
-#include <limits.h>
+
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include <libnvme.h>
 
diff --git a/nvme.c b/nvme.c
index bcccfe7f29..11a2ef0290 100644
--- a/nvme.c
+++ b/nvme.c
@@ -24,31 +24,27 @@
 /**
  * This program uses NVMe IOCTLs to run native nvme commands to a device.
  */
-#include "nvme/tree.h"
-#include "nvme/types.h"
-#include "util/cleanup.h"
+#include <dirent.h>
 #include <errno.h>
-#include <getopt.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <inttypes.h>
+#include <libgen.h>
 #include <locale.h>
-#include <stdio.h>
+#include <math.h>
+#include <signal.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <math.h>
-#include <dirent.h>
-#include <libgen.h>
-#include <signal.h>
 
 #include <linux/fs.h>
 
+#include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
-
+#include <sys/types.h>
 
 #if HAVE_SYS_RANDOM
 	#include <sys/random.h>
@@ -59,10 +55,13 @@
 #include "common.h"
 #include "nvme.h"
 #include "nvme-print.h"
+#include "nvme/tree.h"
+#include "nvme/types.h"
 #include "plugin.h"
+#include "util/argconfig.h"
 #include "util/base64.h"
+#include "util/cleanup.h"
 #include "util/crc32.h"
-#include "util/argconfig.h"
 #include "util/suffix.h"
 #include "logging.h"
 #include "util/sighdl.h"
diff --git a/nvme.h b/nvme.h
index afeda1348c..7881430d56 100644
--- a/nvme.h
+++ b/nvme.h
@@ -17,12 +17,13 @@
 #define _NVME_H
 
 #include <dirent.h>
+#include <endian.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <endian.h>
-#include <sys/time.h>
+
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <libnvme-mi.h>
 
diff --git a/plugin.c b/plugin.c
index 0406bd0246..d0e6ef57f7 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,11 +4,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <libnvme.h>
+
 #include "plugin.h"
 #include "util/argconfig.h"
 
-#include <libnvme.h>
-
 static int version_cmd(struct plugin *plugin)
 {
 	struct program *prog = plugin->parent;
diff --git a/plugins/feat/feat-nvme.c b/plugins/feat/feat-nvme.c
index 3d4af81af2..d38e2e4ed8 100644
--- a/plugins/feat/feat-nvme.c
+++ b/plugins/feat/feat-nvme.c
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <errno.h>
 #include <fcntl.h>
+
+#include "common.h"
 #include "nvme.h"
-#include "plugin.h"
 #include "nvme-print.h"
-#include "common.h"
+#include "plugin.h"
 
 #define CREATE_CMD
 #include "feat-nvme.h"
diff --git a/plugins/lm/lm-nvme.c b/plugins/lm/lm-nvme.c
index b4b565cda4..e430e202ca 100644
--- a/plugins/lm/lm-nvme.c
+++ b/plugins/lm/lm-nvme.c
@@ -6,22 +6,24 @@
  */
 
 #include <assert.h>
-#include <fcntl.h>
+#include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
-#include <linux/fs.h>
-#include <inttypes.h>
+
 #include <asm/byteorder.h>
+#include <linux/fs.h>
+
 #include <sys/mman.h>
 #include <sys/shm.h>
-#include <sys/sysinfo.h>
 #include <sys/stat.h>
+#include <sys/sysinfo.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <time.h>
 
 #include <libnvme.h>
 
diff --git a/plugins/lm/lm-print-stdout.c b/plugins/lm/lm-print-stdout.c
index 44951990d0..ed2cc6cb48 100644
--- a/plugins/lm/lm-print-stdout.c
+++ b/plugins/lm/lm-print-stdout.c
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "lm-print.h"
-
 #include <inttypes.h>
 
 #include "common.h"
+#include "lm-print.h"
 #include "util/types.h"
 
 static struct lm_print_ops stdout_print_ops;
diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
index 1d74b459a6..521ae3d830 100644
--- a/plugins/micron/micron-nvme.c
+++ b/plugins/micron/micron-nvme.c
@@ -9,31 +9,31 @@
  *			Sivaprasad Gutha <sivaprasadg@micron.com>
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include <inttypes.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
+#include <inttypes.h>
 #include <libgen.h>
+#include <limits.h>
 #include <stddef.h>
-#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include <libnvme.h>
 
 #include "common.h"
-#include "nvme.h"
-#include <limits.h>
 #include "linux/types.h"
+#include "nvme.h"
 #include "nvme-print.h"
 #include "util/cleanup.h"
-#include "util/utils.h"
 #include "util/types.h"
+#include "util/utils.h"
 
 #define CREATE_CMD
 #include "micron-nvme.h"
diff --git a/plugins/ocp/ocp-fw-activation-history.c b/plugins/ocp/ocp-fw-activation-history.c
index f7a2707bc2..aed8f3c8c8 100644
--- a/plugins/ocp/ocp-fw-activation-history.c
+++ b/plugins/ocp/ocp-fw-activation-history.c
@@ -5,17 +5,15 @@
  * Author: karl.dedow@solidigm.com
  */
 
-#include "ocp-fw-activation-history.h"
-
 #include <errno.h>
 #include <stdio.h>
 
 #include "common.h"
 #include "nvme-print.h"
-
+#include "ocp-fw-activation-history.h"
 #include "ocp-nvme.h"
-#include "ocp-utils.h"
 #include "ocp-print.h"
+#include "ocp-utils.h"
 
 static const unsigned char ocp_fw_activation_history_guid[GUID_LEN] = {
 	0x6D, 0x79, 0x9a, 0x76,
diff --git a/plugins/ocp/ocp-smart-extended-log.c b/plugins/ocp/ocp-smart-extended-log.c
index 8ff0c5aafc..0c9c28cac3 100644
--- a/plugins/ocp/ocp-smart-extended-log.c
+++ b/plugins/ocp/ocp-smart-extended-log.c
@@ -6,14 +6,14 @@
  *          Venkat Ramesh <venkatraghavan@fb.com>
  */
 
-#include "ocp-smart-extended-log.h"
-
 #include <errno.h>
 #include <stdio.h>
 
 #include "common.h"
 #include "nvme-print.h"
+#include "ocp-nvme.h"
 #include "ocp-print.h"
+#include "ocp-smart-extended-log.h"
 #include "ocp-utils.h"
 
 /* C0 SCAO Log Page */
diff --git a/plugins/ocp/ocp-utils.c b/plugins/ocp/ocp-utils.c
index c9fad63be7..08401bb73e 100644
--- a/plugins/ocp/ocp-utils.c
+++ b/plugins/ocp/ocp-utils.c
@@ -5,12 +5,15 @@
  * Author: leonardo.da.cunha@solidigm.com
  */
 
-#include <unistd.h>
 #include <errno.h>
-#include "util/types.h"
+#include <unistd.h>
+
+#include <linux/types.h>
+
 #include "ocp-nvme.h"
 #include "ocp-utils.h"
 #include "types.h"
+#include "util/types.h"
 
 const unsigned char ocp_uuid[NVME_UUID_LEN] = {
 	0xc1, 0x94, 0xd5, 0x5b, 0xe0, 0x94, 0x47, 0x94, 0xa2, 0x1d,
diff --git a/plugins/sandisk/sandisk-utils.h b/plugins/sandisk/sandisk-utils.h
index 9a23bd3408..4b4703bf18 100644
--- a/plugins/sandisk/sandisk-utils.h
+++ b/plugins/sandisk/sandisk-utils.h
@@ -6,21 +6,20 @@
  *           Brandon Paupore <brandon.paupore@sandisk.com>
  */
 
-#include <stdio.h>
+#include <assert.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdarg.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-#include <stdbool.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
 /* Device Config */
 #define SNDK_NVME_WDC_VID                   0x1b96
 #define SNDK_NVME_SNDK_VID                  0x15b7
diff --git a/plugins/seagate/seagate-nvme.c b/plugins/seagate/seagate-nvme.c
index 02c7a68bc8..467d15bbbe 100644
--- a/plugins/seagate/seagate-nvme.c
+++ b/plugins/seagate/seagate-nvme.c
@@ -23,23 +23,25 @@
  */
 
 
-#include <fcntl.h>
+#include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
-#include <inttypes.h>
+
 #include <sys/stat.h>
-#include <ctype.h>
+
 #include <libnvme.h>
 
 #include "common.h"
-#include "nvme.h"
-#include "plugin.h"
 #include "linux/types.h"
+#include "nvme.h"
 #include "nvme-print.h"
-#include <time.h>
+#include "plugin.h"
 
 #define CREATE_CMD
 
diff --git a/plugins/sed/sed.c b/plugins/sed/sed.c
index 5a3d828f82..fee0636362 100644
--- a/plugins/sed/sed.c
+++ b/plugins/sed/sed.c
@@ -1,12 +1,15 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include <fcntl.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdbool.h>
-#include <inttypes.h>
+
 #include <linux/fs.h>
+#include <linux/sed-opal.h>
+
 #include <sys/stat.h>
 
 #include <libnvme.h>
@@ -15,7 +18,6 @@
 #include "nvme.h"
 #include "nvme-print.h"
 #include "sedopal_cmd.h"
-#include <linux/sed-opal.h>
 
 #define CREATE_CMD
 #include "sed.h"
diff --git a/plugins/sed/sed.h b/plugins/sed/sed.h
index 1618272cb8..d349540d2b 100644
--- a/plugins/sed/sed.h
+++ b/plugins/sed/sed.h
@@ -2,9 +2,10 @@
 #undef CMD_INC_FILE
 #define CMD_INC_FILE plugins/sed/sed
 
-#include "cmd.h"
 #include <linux/sed-opal.h>
 
+#include "cmd.h"
+
 PLUGIN(NAME("sed", "SED Opal Command Set", NVME_VERSION),
 	COMMAND_LIST(
 		ENTRY("discover", "Discover SED Opal Locking Features", sed_opal_discover, "1")
diff --git a/plugins/solidigm/solidigm-log-page-dir.c b/plugins/solidigm/solidigm-log-page-dir.c
index aed7ffdac7..9132dae2af 100644
--- a/plugins/solidigm/solidigm-log-page-dir.c
+++ b/plugins/solidigm/solidigm-log-page-dir.c
@@ -5,17 +5,15 @@
  * Author: karl.dedow@solidigm.com
  */
 
-#include "solidigm-log-page-dir.h"
-
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #include "common.h"
 #include "nvme-print.h"
-
 #include "plugins/ocp/ocp-nvme.h"
 #include "plugins/ocp/ocp-utils.h"
+#include "solidigm-log-page-dir.h"
 #include "solidigm-util.h"
 
 #define MIN_VENDOR_LID 0xC0
diff --git a/plugins/solidigm/solidigm-telemetry/config.c b/plugins/solidigm/solidigm-telemetry/config.c
index 3b27d27390..9bdfff62a2 100644
--- a/plugins/solidigm/solidigm-telemetry/config.c
+++ b/plugins/solidigm/solidigm-telemetry/config.c
@@ -5,10 +5,13 @@
  * Author: leonardo.da.cunha@solidigm.com
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <json.h>
+
 #include "config.h"
 
 #define NOT_FOUND "NOT_FOUND"
diff --git a/plugins/solidigm/solidigm-telemetry/data-area.c b/plugins/solidigm/solidigm-telemetry/data-area.c
index a36a0c79b0..aa70f96c69 100644
--- a/plugins/solidigm/solidigm-telemetry/data-area.c
+++ b/plugins/solidigm/solidigm-telemetry/data-area.c
@@ -5,15 +5,16 @@
  * Author: leonardo.da.cunha@solidigm.com
  */
 
-#include "common.h"
-#include "header.h"
+#include <ctype.h>
+
 #include "cod.h"
-#include "data-area.h"
+#include "common.h"
 #include "config.h"
+#include "data-area.h"
+#include "header.h"
 #include "nlog.h"
-#include "skht.h"
 #include "side-trace.h"
-#include <ctype.h>
+#include "skht.h"
 
 #define SIGNED_int_PREFIX "int"
 #define SIGNED_INT_PREFIX "INT"
diff --git a/plugins/solidigm/solidigm-telemetry/debug-info.c b/plugins/solidigm/solidigm-telemetry/debug-info.c
index 2838a4ba9a..4ebb5e68d4 100644
--- a/plugins/solidigm/solidigm-telemetry/debug-info.c
+++ b/plugins/solidigm/solidigm-telemetry/debug-info.c
@@ -5,15 +5,16 @@
  * Author: leonardo.da.cunha@solidigm.com
  */
 
-#include "debug-info.h"
+#include <string.h>
+
 #include "common.h"
 #include "config.h"
 #include "data-area.h"
+#include "debug-info.h"
 #include "skht.h"
 #include "tracker.h"
 #include "uart-log.h"
 #include "util/json.h"
-#include <string.h>
 
 #define DEBUG_INFO_SIGNATURE 0x54321234 /* "ST21" */
 #define MAX_DEBUG_INFO_CORES 255
diff --git a/plugins/solidigm/solidigm-telemetry/nlog.c b/plugins/solidigm/solidigm-telemetry/nlog.c
index b5ad9b78bd..f6af75b3de 100644
--- a/plugins/solidigm/solidigm-telemetry/nlog.c
+++ b/plugins/solidigm/solidigm-telemetry/nlog.c
@@ -5,10 +5,11 @@
  * Author: leonardo.da.cunha@solidigm.com
  */
 
-#include "nlog.h"
-#include "config.h"
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
+
+#include "config.h"
+#include "nlog.h"
 
 #define LOG_ENTRY_HEADER_SIZE 1
 #define LOG_ENTRY_TIMESTAMP_SIZE 2
diff --git a/plugins/solidigm/solidigm-telemetry/side-trace.c b/plugins/solidigm/solidigm-telemetry/side-trace.c
index c289e33d81..7faea4f6d2 100644
--- a/plugins/solidigm/solidigm-telemetry/side-trace.c
+++ b/plugins/solidigm/solidigm-telemetry/side-trace.c
@@ -5,14 +5,15 @@
  * Author: leonardo.da.cunha@solidigm.com
  */
 
+#include <ctype.h>
+#include <string.h>
+
 #include "common.h"
-#include "telemetry-log.h"
-#include "side-trace.h"
+#include "config.h"
 #include "data-area.h"
 #include "header.h"
-#include "config.h"
-#include <ctype.h>
-#include <string.h>
+#include "side-trace.h"
+#include "telemetry-log.h"
 
 #define NUM_BITS_IN_BYTE 8
 #define SIDETRACE_BLOCK_SIZE 256
diff --git a/plugins/solidigm/solidigm-telemetry/telemetry-log.h b/plugins/solidigm/solidigm-telemetry/telemetry-log.h
index 7da5547382..ad87e0e78c 100644
--- a/plugins/solidigm/solidigm-telemetry/telemetry-log.h
+++ b/plugins/solidigm/solidigm-telemetry/telemetry-log.h
@@ -8,11 +8,12 @@
 #ifndef _SOLIDIGM_TELEMETRY_LOG_H
 #define _SOLIDIGM_TELEMETRY_LOG_H
 
+#include <assert.h>
+#include <stdbool.h>
+
 #include <libnvme.h>
 
 #include "util/json.h"
-#include <assert.h>
-#include <stdbool.h>
 
 #if !defined __cplusplus
 #define static_assert _Static_assert
diff --git a/plugins/solidigm/solidigm-telemetry/uart-log.c b/plugins/solidigm/solidigm-telemetry/uart-log.c
index 603157ad48..e80c7d8c11 100644
--- a/plugins/solidigm/solidigm-telemetry/uart-log.c
+++ b/plugins/solidigm/solidigm-telemetry/uart-log.c
@@ -5,14 +5,15 @@
  * Author: leonardo.da.cunha@solidigm.com
  */
 
-#include "uart-log.h"
+#include <stdio.h>
+#include <string.h>
+
 #include "common.h"
 #include "config.h"
 #include "data-area.h"
 #include "skht.h"
+#include "uart-log.h"
 #include "util/json.h"
-#include <stdio.h>
-#include <string.h>
 
 static bool parse_uart_entry(struct telemetry_log *tl, uint64_t entry_offset_bit,
 			      struct json_object *uart_array)
diff --git a/plugins/solidigm/solidigm-workload-tracker.c b/plugins/solidigm/solidigm-workload-tracker.c
index 324755b1ff..952cd0431b 100644
--- a/plugins/solidigm/solidigm-workload-tracker.c
+++ b/plugins/solidigm/solidigm-workload-tracker.c
@@ -5,11 +5,12 @@
  * Authors: leonardo.da.cunha@solidigm.com
  */
 
-#include "common.h"
-#include "nvme-print.h"
 #include <errno.h>
 #include <time.h>
 
+#include "common.h"
+#include "nvme-print.h"
+
 #define LID 0xf9
 #define FID 0xf1
 #define WLT2US 25
diff --git a/plugins/wdc/wdc-utils.h b/plugins/wdc/wdc-utils.h
index 1ea1ec49cc..6b87891543 100644
--- a/plugins/wdc/wdc-utils.h
+++ b/plugins/wdc/wdc-utils.h
@@ -20,21 +20,20 @@
  *   Author: Jeff Lien <jeff.lien@wdc.com>,
  */
 
-#include <stdio.h>
+#include <assert.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdarg.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-#include <stdbool.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
 /* Create Dir Command Status */
 #define WDC_STATUS_SUCCESS                		  			0
 #define WDC_STATUS_FAILURE   					 			-1
diff --git a/plugins/ymtc/ymtc-nvme.h b/plugins/ymtc/ymtc-nvme.h
index df5d598feb..8d193dc10d 100644
--- a/plugins/ymtc/ymtc-nvme.h
+++ b/plugins/ymtc/ymtc-nvme.h
@@ -5,13 +5,14 @@
 #if !defined(YMTC_NVME) || defined(CMD_HEADER_MULTI_READ)
 #define YMTC_NVME
 
-#include "cmd.h"
-#include "common.h"
-
 #include <ctype.h>
 #include <unistd.h>
-#include <sys/types.h>
+
 #include <sys/stat.h>
+#include <sys/types.h>
+
+#include "cmd.h"
+#include "common.h"
 
 PLUGIN(NAME("ymtc", "Ymtc vendor specific extensions", NVME_VERSION),
     COMMAND_LIST(
diff --git a/unit/test-argconfig-parse.c b/unit/test-argconfig-parse.c
index cecad9b9b3..29ab6907a8 100644
--- a/unit/test-argconfig-parse.c
+++ b/unit/test-argconfig-parse.c
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "../util/argconfig.h"
 #include "../util/cleanup.h"
diff --git a/unit/test-suffix-binary-parse.c b/unit/test-suffix-binary-parse.c
index 5f6ac4a896..f6da72161b 100644
--- a/unit/test-suffix-binary-parse.c
+++ b/unit/test-suffix-binary-parse.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <string.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <string.h>
 
 #include "../util/suffix.h"
 #include "../util/types.h"
diff --git a/unit/test-suffix-si-parse.c b/unit/test-suffix-si-parse.c
index 54cff0e644..b33352ab1a 100644
--- a/unit/test-suffix-si-parse.c
+++ b/unit/test-suffix-si-parse.c
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "../util/suffix.h"
 #include "../util/types.h"
diff --git a/unit/test-uint128-si.c b/unit/test-uint128-si.c
index cc13450c45..76cebcf3f5 100644
--- a/unit/test-uint128-si.c
+++ b/unit/test-uint128-si.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "../util/types.h"
 
diff --git a/unit/test-uint128.c b/unit/test-uint128.c
index f7bc6f6445..0a1f7d3259 100644
--- a/unit/test-uint128.c
+++ b/unit/test-uint128.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <string.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <locale.h>
+#include <string.h>
 
 #include "../util/types.h"
 
diff --git a/util/argconfig.c b/util/argconfig.c
index d3e121164b..dded73c876 100644
--- a/util/argconfig.c
+++ b/util/argconfig.c
@@ -29,20 +29,20 @@
  *
  */
 
-#include "argconfig.h"
-#include "cleanup.h"
-#include "suffix.h"
-
 #include <errno.h>
-#include <inttypes.h>
 #include <getopt.h>
+#include <inttypes.h>
 #include <limits.h>
+#include <locale.h>
+#include <stdbool.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <stdbool.h>
-#include <locale.h>
+
+#include "argconfig.h"
+#include "cleanup.h"
+#include "suffix.h"
 
 const char *nvme_strerror(int errnum);
 
diff --git a/util/argconfig.h b/util/argconfig.h
index 44d2e4e6ab..2bbd567628 100644
--- a/util/argconfig.h
+++ b/util/argconfig.h
@@ -34,12 +34,12 @@
 #ifndef argconfig_H
 #define argconfig_H
 
-#include <string.h>
 #include <getopt.h>
-#include <stdarg.h>
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdarg.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <linux/types.h>
 
diff --git a/util/base64.c b/util/base64.c
index 0e89f2e9df..9fc35ec46b 100644
--- a/util/base64.c
+++ b/util/base64.c
@@ -20,10 +20,11 @@
  * MA  02110-1301, USA.
  */
 
+#include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
+
 #include <sys/types.h>
 
 static const char base64_table[65] =
diff --git a/util/cleanup.h b/util/cleanup.h
index 634b3089d2..891490512a 100644
--- a/util/cleanup.h
+++ b/util/cleanup.h
@@ -2,8 +2,8 @@
 #ifndef __CLEANUP_H
 #define __CLEANUP_H
 
-#include <unistd.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include <libnvme.h>
 
diff --git a/util/crc32.h b/util/crc32.h
index e48c97da8e..43113cf391 100644
--- a/util/crc32.h
+++ b/util/crc32.h
@@ -3,8 +3,8 @@
 #ifndef crc32_H
 #define crc32_H
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 uint32_t crc32(uint32_t crc, unsigned char *buf, size_t len);
 
diff --git a/util/suffix.c b/util/suffix.c
index f010f3b6a9..019a12b200 100644
--- a/util/suffix.c
+++ b/util/suffix.c
@@ -30,17 +30,17 @@
  *
  */
 
-#include "suffix.h"
-#include "common.h"
-
-#include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
 #include <locale.h>
+#include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
+
+#include "suffix.h"
+#include "common.h"
 
 static struct si_suffix {
 	long double magnitude;