diff --git a/src/soc/imgtec/pistachio/bootblock.c b/src/soc/imgtec/pistachio/bootblock.c
index 36bfad3..f16c1bf 100644
--- a/src/soc/imgtec/pistachio/bootblock.c
+++ b/src/soc/imgtec/pistachio/bootblock.c
@@ -18,10 +18,10 @@
  * Foundation, Inc.
  */
 
-#include <stdint.h>
 #include <arch/cpu.h>
 #include <arch/mmu.h>
 #include <assert.h>
+#include <stdint.h>
 #include <symbols.h>
 
 static void bootblock_cpu_init(void)
diff --git a/src/soc/imgtec/pistachio/clocks.c b/src/soc/imgtec/pistachio/clocks.c
index 96d8de8..a2e5b2b 100644
--- a/src/soc/imgtec/pistachio/clocks.c
+++ b/src/soc/imgtec/pistachio/clocks.c
@@ -19,10 +19,10 @@
  */
 
 #include <arch/io.h>
+#include <assert.h>
+#include <delay.h>
 #include <soc/clocks.h>
 #include <timer.h>
-#include <delay.h>
-#include <assert.h>
 
 /* Definitions for PLL enable */
 #define PISTACHIO_CLOCK_SWITCH		0xB8144200
diff --git a/src/soc/imgtec/pistachio/ddr2_init.c b/src/soc/imgtec/pistachio/ddr2_init.c
index f8b4eae..9c94d8b 100644
--- a/src/soc/imgtec/pistachio/ddr2_init.c
+++ b/src/soc/imgtec/pistachio/ddr2_init.c
@@ -18,11 +18,11 @@
  * Foundation, Inc.
  */
 
-#include <stdint.h>
 #include <arch/cpu.h>
-#include <delay.h>
 #include <arch/io.h>
+#include <delay.h>
 #include <soc/ddr_init.h>
+#include <stdint.h>
 #include <timer.h>
 
 #define MAX_WAIT_MICROS			100000
diff --git a/src/soc/imgtec/pistachio/include/soc/spi.h b/src/soc/imgtec/pistachio/include/soc/spi.h
index 91d6d55..00d1aec 100644
--- a/src/soc/imgtec/pistachio/include/soc/spi.h
+++ b/src/soc/imgtec/pistachio/include/soc/spi.h
@@ -17,8 +17,8 @@
 #ifndef __SOC_IMGTEC_DANUBE_SPI_H__
 #define __SOC_IMGTEC_DANUBE_SPI_H__
 
-#include <arch/types.h>
 #include <arch/io.h>
+#include <arch/types.h>
 
 #define spi_read_reg_field(regval, field)		\
 (							\
diff --git a/src/soc/imgtec/pistachio/monotonic_timer.c b/src/soc/imgtec/pistachio/monotonic_timer.c
index d56cae5..4f3aba9 100644
--- a/src/soc/imgtec/pistachio/monotonic_timer.c
+++ b/src/soc/imgtec/pistachio/monotonic_timer.c
@@ -17,11 +17,11 @@
  * Foundation, Inc.
  */
 
+#include <arch/cpu.h>
+#include <soc/cpu.h>
 #include <stdint.h>
 #include <timer.h>
 #include <timestamp.h>
-#include <arch/cpu.h>
-#include <soc/cpu.h>
 
 #define PISTACHIO_CLOCK_SWITCH		0xB8144200
 #define MIPS_EXTERN_PLL_BYPASS_MASK	0x00000002
diff --git a/src/soc/imgtec/pistachio/romstage.c b/src/soc/imgtec/pistachio/romstage.c
index d08be33..9467d87 100644
--- a/src/soc/imgtec/pistachio/romstage.c
+++ b/src/soc/imgtec/pistachio/romstage.c
@@ -19,9 +19,9 @@
  */
 
 #include <cbmem.h>
-#include <program_loading.h>
 #include <console/console.h>
 #include <halt.h>
+#include <program_loading.h>
 #include <soc/ddr_init.h>
 
 void main(void)
diff --git a/src/soc/imgtec/pistachio/spi.c b/src/soc/imgtec/pistachio/spi.c
index 3cae6af..f38607c 100644
--- a/src/soc/imgtec/pistachio/spi.c
+++ b/src/soc/imgtec/pistachio/spi.c
@@ -13,13 +13,13 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
-#include <stdlib.h>
-#include <timer.h>
 #include <soc/cpu.h>
 #include <soc/spi.h>
-#include <spi-generic.h>
 #include <spi_flash.h>
+#include <spi-generic.h>
+#include <stdlib.h>
+#include <string.h>
+#include <timer.h>
 
 #if !CONFIG_SPI_ATOMIC_SEQUENCING
 #error "Unsupported SPI driver API"