diff --git a/hw/ip/aes/pre_dv/aes_sbox_tb/cpp/aes_sbox_tb.cc b/hw/ip/aes/pre_dv/aes_sbox_tb/cpp/aes_sbox_tb.cc
index b6841e9..c34629d 100644
--- a/hw/ip/aes/pre_dv/aes_sbox_tb/cpp/aes_sbox_tb.cc
+++ b/hw/ip/aes/pre_dv/aes_sbox_tb/cpp/aes_sbox_tb.cc
@@ -6,9 +6,9 @@
 #include "verilated_toplevel.h"
 #include "verilator_sim_ctrl.h"
 
-#include <signal.h>
 #include <functional>
 #include <iostream>
+#include <signal.h>
 
 #include "sim_ctrl_extension.h"
 
diff --git a/hw/ip/prim/pre_dv/prim_sync_reqack/cpp/prim_sync_reqack_tb.cc b/hw/ip/prim/pre_dv/prim_sync_reqack/cpp/prim_sync_reqack_tb.cc
index 4b93a4c..e575d33 100644
--- a/hw/ip/prim/pre_dv/prim_sync_reqack/cpp/prim_sync_reqack_tb.cc
+++ b/hw/ip/prim/pre_dv/prim_sync_reqack/cpp/prim_sync_reqack_tb.cc
@@ -6,9 +6,9 @@
 #include "verilated_toplevel.h"
 #include "verilator_sim_ctrl.h"
 
-#include <signal.h>
 #include <functional>
 #include <iostream>
+#include <signal.h>
 
 #include "sim_ctrl_extension.h"
 
diff --git a/sw/device/lib/dif/dif_gpio.c b/sw/device/lib/dif/dif_gpio.c
index 41751eb..832c735 100644
--- a/sw/device/lib/dif/dif_gpio.c
+++ b/sw/device/lib/dif/dif_gpio.c
@@ -4,8 +4,8 @@
 
 #include "sw/device/lib/dif/dif_gpio.h"
 
-#include "gpio_regs.h"  // Generated.
 #include "sw/device/lib/common.h"
+#include "gpio_regs.h"  // Generated.
 
 /**
  * Gives the mask that corresponds to the given bit index.
diff --git a/sw/device/lib/dif/dif_hmac.h b/sw/device/lib/dif/dif_hmac.h
index e6c2e94..237cf7c 100644
--- a/sw/device/lib/dif/dif_hmac.h
+++ b/sw/device/lib/dif/dif_hmac.h
@@ -10,9 +10,9 @@
  * @brief <a href="/hw/ip/hmac/doc/">HMAC</a> Device Interface Functions
  */
 
-#include "sw/device/lib/base/mmio.h"
 #include <stddef.h>
 #include <stdint.h>
+#include "sw/device/lib/base/mmio.h"
 
 /**
  * HMAC interrupt configuration.
diff --git a/sw/device/lib/dif/dif_plic.c b/sw/device/lib/dif/dif_plic.c
index ff54873..c7a0e5d 100644
--- a/sw/device/lib/dif/dif_plic.c
+++ b/sw/device/lib/dif/dif_plic.c
@@ -8,8 +8,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rv_plic_regs.h"  // Generated.
 #include "sw/device/lib/base/mmio.h"
+#include "rv_plic_regs.h"  // Generated.
 
 // If either of these static assertions fail, then the assumptions in this DIF
 // implementation should be revisited. In particular, `plic_target_reg_offsets`
diff --git a/sw/device/lib/dif/dif_spi_device.c b/sw/device/lib/dif/dif_spi_device.c
index 3422839..c97ba8a 100644
--- a/sw/device/lib/dif/dif_spi_device.c
+++ b/sw/device/lib/dif/dif_spi_device.c
@@ -4,9 +4,9 @@
 
 #include "sw/device/lib/dif/dif_spi_device.h"
 
-#include "spi_device_regs.h"  // Generated.
 #include "sw/device/lib/base/bitfield.h"
 #include "sw/device/lib/base/memory.h"
+#include "spi_device_regs.h"  // Generated.
 
 const uint16_t kDifSpiDeviceBufferLen = SPI_DEVICE_BUFFER_SIZE_BYTES;
 
diff --git a/sw/device/lib/dif/dif_usbdev.h b/sw/device/lib/dif/dif_usbdev.h
index 06e4d0b..99d8185 100644
--- a/sw/device/lib/dif/dif_usbdev.h
+++ b/sw/device/lib/dif/dif_usbdev.h
@@ -10,10 +10,10 @@
  * @brief <a href="/hw/ip/usbdev/doc/">USB Device</a> Device Interface Functions
  */
 
-#include "sw/device/lib/base/mmio.h"
-#include "sw/device/lib/dif/dif_warn_unused_result.h"
 #include <stddef.h>
 #include <stdint.h>
+#include "sw/device/lib/base/mmio.h"
+#include "sw/device/lib/dif/dif_warn_unused_result.h"
 
 /**
  * Hardware constants.
diff --git a/sw/device/lib/pinmux.c b/sw/device/lib/pinmux.c
index ee7b37a..f29251a 100644
--- a/sw/device/lib/pinmux.c
+++ b/sw/device/lib/pinmux.c
@@ -4,8 +4,8 @@
 
 #include "sw/device/lib/pinmux.h"
 
-#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
 #include "sw/device/lib/common.h"
+#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
 
 #include "pinmux_regs.h"  // Generated.