diff --git a/src/soc/intel/baytrail/fadt.c b/src/soc/intel/baytrail/fadt.c
index de89ef1ae0..e4e225e42e 100644
--- a/src/soc/intel/baytrail/fadt.c
+++ b/src/soc/intel/baytrail/fadt.c
@@ -3,7 +3,6 @@
 #include <acpi/acpi.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
-#include "chip.h"
 
 void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c
index 79f95bbf03..6308227a8c 100644
--- a/src/soc/intel/baytrail/pmutil.c
+++ b/src/soc/intel/baytrail/pmutil.c
@@ -7,18 +7,18 @@
 #include <acpi/acpi_pm.h>
 #include <arch/io.h>
 #include <bootmode.h>
+#include <console/console.h>
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <console/console.h>
 #include <halt.h>
 
+#include <security/vboot/vbnv.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
-#include <security/vboot/vbnv.h>
 
 uint16_t get_pmbase(void)
 {
diff --git a/src/soc/intel/braswell/fadt.c b/src/soc/intel/braswell/fadt.c
index d057d217ae..ac1653d339 100644
--- a/src/soc/intel/braswell/fadt.c
+++ b/src/soc/intel/braswell/fadt.c
@@ -4,7 +4,6 @@
 #include <soc/acpi.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
-#include "chip.h"
 
 void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c
index 3efcc7b6de..ea7f0caf2e 100644
--- a/src/soc/intel/braswell/pmutil.c
+++ b/src/soc/intel/braswell/pmutil.c
@@ -6,12 +6,12 @@
 #include <arch/io.h>
 #include <assert.h>
 #include <bootmode.h>
+#include <console/console.h>
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <halt.h>
-#include <console/console.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c
index 44a66123d8..f2151a9bb3 100644
--- a/src/soc/intel/braswell/smihandler.c
+++ b/src/soc/intel/braswell/smihandler.c
@@ -11,12 +11,12 @@
 #include <device/pci_def.h>
 #include <elog.h>
 #include <gpio.h>
+#include <smmstore.h>
 #include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <spi-generic.h>
 #include <stdint.h>
-#include <smmstore.h>
 
 void southbridge_smi_set_eos(void)
 {
diff --git a/src/soc/intel/broadwell/pch/fadt.c b/src/soc/intel/broadwell/pch/fadt.c
index 8b79ec9c58..4e74d58e47 100644
--- a/src/soc/intel/broadwell/pch/fadt.c
+++ b/src/soc/intel/broadwell/pch/fadt.c
@@ -3,7 +3,6 @@
 #include <acpi/acpi.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
-#include "chip.h"
 
 void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
diff --git a/src/soc/intel/broadwell/pch/pmutil.c b/src/soc/intel/broadwell/pch/pmutil.c
index e310416eaa..8fc1670037 100644
--- a/src/soc/intel/broadwell/pch/pmutil.c
+++ b/src/soc/intel/broadwell/pch/pmutil.c
@@ -8,16 +8,16 @@
 #include <acpi/acpi.h>
 #include <arch/io.h>
 #include <bootmode.h>
-#include <device/pci_ops.h>
+#include <console/console.h>
 #include <device/device.h>
+#include <device/pci_ops.h>
 #include <device/pci.h>
 #include <halt.h>
-#include <console/console.h>
+#include <security/vboot/vbnv.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
-#include <security/vboot/vbnv.h>
 #include <stdint.h>
 
 #define GPIO_ALT_GPI_SMI_STS	0x50
diff --git a/src/soc/intel/broadwell/pch/smihandler.c b/src/soc/intel/broadwell/pch/smihandler.c
index 14d08af7af..99906d944c 100644
--- a/src/soc/intel/broadwell/pch/smihandler.c
+++ b/src/soc/intel/broadwell/pch/smihandler.c
@@ -3,25 +3,25 @@
 #include <delay.h>
 #include <types.h>
 #include <arch/io.h>
-#include <device/mmio.h>
-#include <device/pci_ops.h>
 #include <console/console.h>
-#include <cpu/x86/cache.h>
-#include <device/pci_def.h>
-#include <cpu/x86/smm.h>
 #include <cpu/intel/em64t101_save_state.h>
+#include <cpu/x86/cache.h>
+#include <cpu/x86/smm.h>
+#include <device/mmio.h>
+#include <device/pci_def.h>
+#include <device/pci_ops.h>
+#include <drivers/intel/gma/i915_reg.h>
 #include <spi-generic.h>
 #include <elog.h>
 #include <halt.h>
 #include <option.h>
+#include <smmstore.h>
 #include <soc/lpc.h>
 #include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/rcba.h>
 #include <soc/xhci.h>
-#include <drivers/intel/gma/i915_reg.h>
-#include <smmstore.h>
 
 /**
  * @brief Set the EOS bit