8 files changed, 13 insertions, 14 deletions
diff --git a/chip/it83xx/adc.c b/chip/it83xx/adc.c
index c666fc4e88..9f9fa27f41 100644
--- a/chip/it83xx/adc.c
+++ b/chip/it83xx/adc.c
@@ -7,8 +7,8 @@
 
 #include "adc.h"
 #include "clock.h"
-#include "common.h"
 #include "console.h"
+#include "common.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "registers.h"
diff --git a/chip/it83xx/adc_chip.h b/chip/it83xx/adc_chip.h
index 3804a684e5..99e84624e0 100644
--- a/chip/it83xx/adc_chip.h
+++ b/chip/it83xx/adc_chip.h
@@ -8,10 +8,10 @@
 #ifndef __CROS_EC_ADC_CHIP_H
 #define __CROS_EC_ADC_CHIP_H
 
-#include "common.h"
-
 #include <stdint.h>
 
+#include "common.h"
+
 /*
  * Maximum time we allow for an ADC conversion.
  * NOTE:
diff --git a/chip/it83xx/flash.c b/chip/it83xx/flash.c
index fa8ab65292..25aefa2f66 100644
--- a/chip/it83xx/flash.c
+++ b/chip/it83xx/flash.c
@@ -9,13 +9,13 @@
 #include "flash_chip.h"
 #include "host_command.h"
 #include "intc.h"
-#include "registers.h"
-#include "shared_mem.h"
 #include "system.h"
-#include "task.h"
-#include "uart.h"
 #include "util.h"
 #include "watchdog.h"
+#include "registers.h"
+#include "task.h"
+#include "shared_mem.h"
+#include "uart.h"
 
 #define FLASH_DMA_START ((uint32_t)&__flash_dma_start)
 #define FLASH_DMA_CODE __attribute__((section(".flash_direct_map")))
diff --git a/chip/it83xx/hwtimer.c b/chip/it83xx/hwtimer.c
index 7a46f52773..b9add82b5a 100644
--- a/chip/it83xx/hwtimer.c
+++ b/chip/it83xx/hwtimer.c
@@ -5,8 +5,8 @@
 
 /* Hardware timers driver */
 
-#include "common.h"
 #include "cpu.h"
+#include "common.h"
 #include "hooks.h"
 #include "hwtimer.h"
 #include "hwtimer_chip.h"
diff --git a/chip/it83xx/i2c_peripheral.c b/chip/it83xx/i2c_peripheral.c
index dfb139514f..80fea907fd 100644
--- a/chip/it83xx/i2c_peripheral.c
+++ b/chip/it83xx/i2c_peripheral.c
@@ -12,10 +12,9 @@
 #include "i2c_peripheral.h"
 #include "printf.h"
 #include "registers.h"
-#include "task.h"
-
 #include <stddef.h>
 #include <string.h>
+#include "task.h"
 
 /* Console output macros */
 #define CPRINTS(format, args...) cprints(CC_I2C, format, ##args)
diff --git a/chip/it83xx/keyboard_raw.c b/chip/it83xx/keyboard_raw.c
index 9123a6e5e8..0d2f048deb 100644
--- a/chip/it83xx/keyboard_raw.c
+++ b/chip/it83xx/keyboard_raw.c
@@ -4,11 +4,11 @@
  */
 
 #include "common.h"
-#include "irq_chip.h"
 #include "keyboard_raw.h"
 #include "keyboard_scan.h"
 #include "registers.h"
 #include "task.h"
+#include "irq_chip.h"
 
 #define KSOH_PIN_MASK (((1 << (KEYBOARD_COLS_MAX - 8)) - 1) & 0xff)
 
diff --git a/chip/it83xx/peci.c b/chip/it83xx/peci.c
index ee94f2baac..e5f172ce80 100644
--- a/chip/it83xx/peci.c
+++ b/chip/it83xx/peci.c
@@ -10,9 +10,9 @@
 #include "hooks.h"
 #include "peci.h"
 #include "registers.h"
-#include "task.h"
-#include "timer.h"
 #include "util.h"
+#include "timer.h"
+#include "task.h"
 
 enum peci_status {
 	PECI_STATUS_NO_ERR = 0x00,
diff --git a/chip/it83xx/pwm.c b/chip/it83xx/pwm.c
index 3d0d4eaeb6..07165dea77 100644
--- a/chip/it83xx/pwm.c
+++ b/chip/it83xx/pwm.c
@@ -8,11 +8,11 @@
 #include "clock.h"
 #include "gpio.h"
 #include "hooks.h"
-#include "math_util.h"
 #include "pwm.h"
 #include "pwm_chip.h"
 #include "registers.h"
 #include "util.h"
+#include "math_util.h"
 
 #define PWM_CTRX_MIN 100
 #define PWM_EC_FREQ 8000000