8 files changed, 31 insertions, 29 deletions
diff --git a/chip/max32660/clock_chip.c b/chip/max32660/clock_chip.c
index 93a5f862d8..26225401ba 100644
--- a/chip/max32660/clock_chip.c
+++ b/chip/max32660/clock_chip.c
@@ -9,16 +9,16 @@
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
+#include "gcr_regs.h"
 #include "hooks.h"
 #include "hwtimer.h"
+#include "pwrseq_regs.h"
 #include "registers.h"
 #include "system.h"
 #include "timer.h"
+#include "tmr_regs.h"
 #include "util.h"
 #include "watchdog.h"
-#include "tmr_regs.h"
-#include "gcr_regs.h"
-#include "pwrseq_regs.h"
 
 #define MAX32660_SYSTEMCLOCK SYS_CLOCK_HIRC
 
diff --git a/chip/max32660/flash_chip.c b/chip/max32660/flash_chip.c
index eb702799b0..01a26f94b5 100644
--- a/chip/max32660/flash_chip.c
+++ b/chip/max32660/flash_chip.c
@@ -5,16 +5,16 @@
 
 /* MAX32660 Flash Memory Module for Chrome EC */
 
+#include "common.h"
 #include "flash.h"
+#include "flc_regs.h"
+#include "icc_regs.h"
+#include "registers.h"
 #include "switch.h"
 #include "system.h"
 #include "timer.h"
 #include "util.h"
 #include "watchdog.h"
-#include "registers.h"
-#include "common.h"
-#include "icc_regs.h"
-#include "flc_regs.h"
 
 #define CPUTS(outstr) cputs(CC_SYSTEM, outstr)
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
diff --git a/chip/max32660/gpio_chip.c b/chip/max32660/gpio_chip.c
index cc54f9055f..b6deaa9111 100644
--- a/chip/max32660/gpio_chip.c
+++ b/chip/max32660/gpio_chip.c
@@ -6,16 +6,16 @@
 /* MAX32660 GPIO module for Chrome EC */
 
 #include "clock.h"
-#include "console.h"
 #include "common.h"
+#include "console.h"
 #include "gpio.h"
+#include "gpio_regs.h"
 #include "hooks.h"
+#include "registers.h"
 #include "switch.h"
 #include "task.h"
 #include "timer.h"
 #include "util.h"
-#include "registers.h"
-#include "gpio_regs.h"
 
 #define CPRINTF(format, args...) cprintf(CC_GPIO, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_GPIO, format, ##args)
diff --git a/chip/max32660/hwtimer_chip.c b/chip/max32660/hwtimer_chip.c
index a6469ae795..b6c39f4036 100644
--- a/chip/max32660/hwtimer_chip.c
+++ b/chip/max32660/hwtimer_chip.c
@@ -6,15 +6,15 @@
 /* MAX32660 HW Timer module for Chrome EC */
 
 #include "clock.h"
-#include "console.h"
 #include "common.h"
+#include "console.h"
+#include "gcr_regs.h"
 #include "hooks.h"
 #include "hwtimer.h"
+#include "registers.h"
 #include "task.h"
 #include "timer.h"
-#include "registers.h"
 #include "tmr_regs.h"
-#include "gcr_regs.h"
 
 /* Define the rollover timer */
 #define TMR_ROLLOVER MXC_TMR0
diff --git a/chip/max32660/i2c_chip.c b/chip/max32660/i2c_chip.c
index bb116f4d8a..a4fab91199 100644
--- a/chip/max32660/i2c_chip.c
+++ b/chip/max32660/i2c_chip.c
@@ -5,18 +5,19 @@
 
 /* MAX32660 I2C port module for Chrome EC. */
 
-#include <stdint.h>
-#include <stddef.h>
 #include "common.h"
 #include "config_chip.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
+#include "i2c_regs.h"
+#include "registers.h"
 #include "stdbool.h"
 #include "system.h"
 #include "task.h"
-#include "registers.h"
-#include "i2c_regs.h"
+
+#include <stddef.h>
+#include <stdint.h>
 
 /**
  * Byte to use if the EC HOST requested more data
diff --git a/chip/max32660/system_chip.c b/chip/max32660/system_chip.c
index 8679881102..f63e22dc26 100644
--- a/chip/max32660/system_chip.c
+++ b/chip/max32660/system_chip.c
@@ -9,14 +9,14 @@
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
+#include "gcr_regs.h"
 #include "host_command.h"
 #include "panic.h"
+#include "registers.h"
 #include "system.h"
 #include "task.h"
 #include "timer.h"
 #include "util.h"
-#include "registers.h"
-#include "gcr_regs.h"
 
 /* Console output macros */
 #define CPUTS(outstr) cputs(CC_SYSTEM, outstr)
diff --git a/chip/max32660/uart_chip.c b/chip/max32660/uart_chip.c
index 87ba59e629..ec25d9e476 100644
--- a/chip/max32660/uart_chip.c
+++ b/chip/max32660/uart_chip.c
@@ -5,18 +5,19 @@
 
 /* MAX32660 Console UART Module for Chrome EC */
 
-#include <stdint.h>
+#include "common.h"
+#include "gcr_regs.h"
+#include "gpio.h"
+#include "gpio_regs.h"
+#include "registers.h"
 #include "system.h"
 #include "task.h"
-#include "uart.h"
-#include "registers.h"
 #include "tmr_regs.h"
-#include "gpio.h"
-#include "gpio_regs.h"
-#include "common.h"
-#include "gcr_regs.h"
+#include "uart.h"
 #include "uart_regs.h"
 
+#include <stdint.h>
+
 static int done_uart_init_yet;
 
 #ifndef UARTN
diff --git a/chip/max32660/wdt_chip.c b/chip/max32660/wdt_chip.c
index 03cd2bd009..4890c34536 100644
--- a/chip/max32660/wdt_chip.c
+++ b/chip/max32660/wdt_chip.c
@@ -7,14 +7,14 @@
 
 #include "clock.h"
 #include "common.h"
+#include "config.h"
+#include "console.h"
 #include "gpio.h"
 #include "hooks.h"
+#include "registers.h"
 #include "task.h"
 #include "util.h"
 #include "watchdog.h"
-#include "console.h"
-#include "registers.h"
-#include "board.h"
 #include "wdt_regs.h"
 
 #define CPUTS(outstr) cputs(CC_COMMAND, outstr)