tegra124: Change all SoC headers to <soc/headername.h> system

This patch aligns tegra124 to the new SoC header include scheme.
Also alphabetized headers in affected files since we touch them anyway.

BUG=None
TEST=Tested with whole series. Compiled Nyan, Nyan_Big and Nyan_Blaze.

Change-Id: Ia82ab86b2af903690cc6c9d310f7bdda3425ea7c
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 4d23774e071ec22781991ff20fbf63802f620c88
Original-Change-Id: Ia126cff8590117788d1872e50608c257d2659c1f
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/224504
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9326
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

72 files changed, 180 insertions, 179 deletions

diff --git a/src/mainboard/google/nyan/boardid.c b/src/mainboard/google/nyan/boardid.c
index a5ec61fa64..4628cb60e0 100644
--- a/src/mainboard/google/nyan/boardid.c
+++ b/src/mainboard/google/nyan/boardid.c
@@ -17,10 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/console.h>
-#include <soc/nvidia/tegra124/gpio.h>
-
 #include <boardid.h>
+#include <console/console.h>
+#include <soc/gpio.h>
 
 uint8_t board_id(void)
 {
diff --git a/src/mainboard/google/nyan/bootblock.c b/src/mainboard/google/nyan/bootblock.c
index 2b033a6f48..1f23d43dd3 100644
--- a/src/mainboard/google/nyan/bootblock.c
+++ b/src/mainboard/google/nyan/bootblock.c
@@ -22,12 +22,12 @@
 #include <console/console.h>
 #include <device/i2c.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
+#include <soc/gpio.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/pinmux.h>
-#include <soc/nvidia/tegra124/spi.h>	/* FIXME: move back to soc code? */
+#include <soc/pinmux.h>
+#include <soc/spi.h>	/* FIXME: move back to soc code? */
 
 #include "pmic.h"
 
diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index c4d98b7e30..1210f75ad9 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -18,13 +18,13 @@
  */
 
 #include <boot/coreboot_tables.h>
+#include <bootmode.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
+#include <soc/gpio.h>
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include <bootmode.h>
-#include <soc/nvidia/tegra124/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/nyan/early_configs.c b/src/mainboard/google/nyan/early_configs.c
index c1f5f9b2f6..046e2bd419 100644
--- a/src/mainboard/google/nyan/early_configs.c
+++ b/src/mainboard/google/nyan/early_configs.c
@@ -19,9 +19,9 @@
 
 #include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/early_configs.h>
+#include <soc/gpio.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/early_configs.h>
 
 static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE;
 
diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index e52db83d18..f4aa93adc2 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -23,13 +23,13 @@
 #include <boot/coreboot_tables.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/clk_rst.h>
+#include <soc/gpio.h>
+#include <soc/mc.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/mc.h>
-#include <soc/nvidia/tegra124/pmc.h>
-#include <soc/nvidia/tegra124/spi.h>
 #include <soc/nvidia/tegra/usb.h>
+#include <soc/pmc.h>
+#include <soc/spi.h>
 #include <symbols.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/nyan/memlayout.ld b/src/mainboard/google/nyan/memlayout.ld
index 33ce6446ad..ead7f47838 100644
--- a/src/mainboard/google/nyan/memlayout.ld
+++ b/src/mainboard/google/nyan/memlayout.ld
@@ -1 +1 @@
-#include <soc/nvidia/tegra124/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c
index b2908712d5..cfafff1d77 100644
--- a/src/mainboard/google/nyan/pmic.c
+++ b/src/mainboard/google/nyan/pmic.c
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <boardid.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/i2c.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <reset.h>
 
-#include <boardid.h>
 #include "pmic.h"
-#include <reset.h>
 
 enum {
 	AS3722_I2C_ADDR = 0x40
diff --git a/src/mainboard/google/nyan/reset.c b/src/mainboard/google/nyan/reset.c
index 05cca2777e..de096c6520 100644
--- a/src/mainboard/google/nyan/reset.c
+++ b/src/mainboard/google/nyan/reset.c
@@ -18,7 +18,7 @@
  */
 
 #include <arch/io.h>
-#include <soc/nvidia/tegra124/gpio.h>
+#include <soc/gpio.h>
 #include <reset.h>
 
 void hard_reset(void)
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index f2077bbb27..83d2eeffea 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -27,20 +27,21 @@
 #include <reset.h>
 #include <program_loading.h>
 #include <romstage_handoff.h>
-#include <vendorcode/google/chromeos/chromeos.h>
-#include "sdram_configs.h"
-#include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/cache.h>
-#include <soc/nvidia/tegra124/chip.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/early_configs.h>
-#include <soc/nvidia/tegra124/power.h>
-#include <soc/nvidia/tegra124/sdram.h>
 #include <soc/addressmap.h>
+#include <soc/cache.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
 #include <soc/display.h>
+#include <soc/early_configs.h>
+#include <soc/nvidia/tegra/i2c.h>
+#include <soc/nvidia/tegra124/chip.h>
+#include <soc/power.h>
+#include <soc/sdram.h>
 #include <symbols.h>
 #include <timestamp.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
+#include "sdram_configs.h"
 
 static void __attribute__((noinline)) romstage(void)
 {
diff --git a/src/mainboard/google/nyan/sdram_configs.c b/src/mainboard/google/nyan/sdram_configs.c
index 3b774b2722..d99f6bd833 100644
--- a/src/mainboard/google/nyan/sdram_configs.c
+++ b/src/mainboard/google/nyan/sdram_configs.c
@@ -18,7 +18,8 @@
  */
 
 #include <console/console.h>
-#include <soc/nvidia/tegra124/sdram.h>
+#include <soc/sdram.h>
+
 #include "sdram_configs.h"
 
 static struct sdram_params sdram_configs[] = {
diff --git a/src/mainboard/google/nyan/sdram_configs.h b/src/mainboard/google/nyan/sdram_configs.h
index e0ea1e285e..4a5ae68f4a 100644
--- a/src/mainboard/google/nyan/sdram_configs.h
+++ b/src/mainboard/google/nyan/sdram_configs.h
@@ -20,7 +20,7 @@
 #ifndef __MAINBOARD_GOOGLE_NYAN_SDRAM_CONFIG_H__
 #define __MAINBOARD_GOOGLE_NYAN_SDRAM_CONFIG_H__
 
-#include <soc/nvidia/tegra124/sdram_param.h>
+#include <soc/sdram_param.h>
 
 /* Loads SDRAM configurations for current system. */
 const struct sdram_params *get_sdram_config(void);
diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c
index 3a22dede45..335da87a50 100644
--- a/src/mainboard/google/nyan_big/boardid.c
+++ b/src/mainboard/google/nyan_big/boardid.c
@@ -17,12 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <boardid.h>
 #include <console/console.h>
-#include <soc/nvidia/tegra124/gpio.h>
+#include <soc/gpio.h>
 #include <stdlib.h>
 
-#include <boardid.h>
-
 uint8_t board_id(void)
 {
 	static int id = -1;
diff --git a/src/mainboard/google/nyan_big/bootblock.c b/src/mainboard/google/nyan_big/bootblock.c
index 05bb1c94c0..b24862e8b9 100644
--- a/src/mainboard/google/nyan_big/bootblock.c
+++ b/src/mainboard/google/nyan_big/bootblock.c
@@ -22,12 +22,12 @@
 #include <console/console.h>
 #include <device/i2c.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
+#include <soc/gpio.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/pinmux.h>
-#include <soc/nvidia/tegra124/spi.h>	/* FIXME: move back to soc code? */
+#include <soc/pinmux.h>
+#include <soc/spi.h>	/* FIXME: move back to soc code? */
 
 #include "pmic.h"
 
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index 054abf6edb..28da0538f1 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -18,13 +18,13 @@
  */
 
 #include <boot/coreboot_tables.h>
+#include <bootmode.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
+#include <soc/gpio.h>
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include <bootmode.h>
-#include <soc/nvidia/tegra124/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/nyan_big/early_configs.c b/src/mainboard/google/nyan_big/early_configs.c
index c1f5f9b2f6..046e2bd419 100644
--- a/src/mainboard/google/nyan_big/early_configs.c
+++ b/src/mainboard/google/nyan_big/early_configs.c
@@ -19,9 +19,9 @@
 
 #include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/early_configs.h>
+#include <soc/gpio.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/early_configs.h>
 
 static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE;
 
diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index 05f6faeef1..63d9d5c93e 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -18,17 +18,17 @@
  */
 
 #include <arch/io.h>
+#include <boot/coreboot_tables.h>
 #include <device/device.h>
 #include <elog.h>
-#include <boot/coreboot_tables.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
+#include <soc/gpio.h>
+#include <soc/mc.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/mc.h>
-#include <soc/nvidia/tegra124/pmc.h>
-#include <soc/nvidia/tegra124/spi.h>
+#include <soc/pmc.h>
+#include <soc/spi.h>
 #include <soc/nvidia/tegra/usb.h>
 #include <symbols.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/nyan_big/memlayout.ld b/src/mainboard/google/nyan_big/memlayout.ld
index 33ce6446ad..ead7f47838 100644
--- a/src/mainboard/google/nyan_big/memlayout.ld
+++ b/src/mainboard/google/nyan_big/memlayout.ld
@@ -1 +1 @@
-#include <soc/nvidia/tegra124/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/nyan_big/pmic.c b/src/mainboard/google/nyan_big/pmic.c
index c89db2895b..f57bf08c52 100644
--- a/src/mainboard/google/nyan_big/pmic.c
+++ b/src/mainboard/google/nyan_big/pmic.c
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <boardid.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/i2c.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <reset.h>
 
-#include <boardid.h>
 #include "pmic.h"
-#include <reset.h>
 
 enum {
 	AS3722_I2C_ADDR = 0x40
diff --git a/src/mainboard/google/nyan_big/reset.c b/src/mainboard/google/nyan_big/reset.c
index 05cca2777e..de096c6520 100644
--- a/src/mainboard/google/nyan_big/reset.c
+++ b/src/mainboard/google/nyan_big/reset.c
@@ -18,7 +18,7 @@
  */
 
 #include <arch/io.h>
-#include <soc/nvidia/tegra124/gpio.h>
+#include <soc/gpio.h>
 #include <reset.h>
 
 void hard_reset(void)
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index f2077bbb27..83d2eeffea 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -27,20 +27,21 @@
 #include <reset.h>
 #include <program_loading.h>
 #include <romstage_handoff.h>
-#include <vendorcode/google/chromeos/chromeos.h>
-#include "sdram_configs.h"
-#include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/cache.h>
-#include <soc/nvidia/tegra124/chip.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/early_configs.h>
-#include <soc/nvidia/tegra124/power.h>
-#include <soc/nvidia/tegra124/sdram.h>
 #include <soc/addressmap.h>
+#include <soc/cache.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
 #include <soc/display.h>
+#include <soc/early_configs.h>
+#include <soc/nvidia/tegra/i2c.h>
+#include <soc/nvidia/tegra124/chip.h>
+#include <soc/power.h>
+#include <soc/sdram.h>
 #include <symbols.h>
 #include <timestamp.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
+#include "sdram_configs.h"
 
 static void __attribute__((noinline)) romstage(void)
 {
diff --git a/src/mainboard/google/nyan_big/sdram_configs.c b/src/mainboard/google/nyan_big/sdram_configs.c
index 748b6dc3ba..7904b4e94b 100644
--- a/src/mainboard/google/nyan_big/sdram_configs.c
+++ b/src/mainboard/google/nyan_big/sdram_configs.c
@@ -18,7 +18,8 @@
  */
 
 #include <console/console.h>
-#include <soc/nvidia/tegra124/sdram.h>
+#include <soc/sdram.h>
+
 #include "sdram_configs.h"
 
 static struct sdram_params sdram_configs[] = {
diff --git a/src/mainboard/google/nyan_big/sdram_configs.h b/src/mainboard/google/nyan_big/sdram_configs.h
index 4bf376c190..6c3bda097a 100644
--- a/src/mainboard/google/nyan_big/sdram_configs.h
+++ b/src/mainboard/google/nyan_big/sdram_configs.h
@@ -20,7 +20,7 @@
 #ifndef __MAINBOARD_GOOGLE_NYAN_BIG_SDRAM_CONFIG_H__
 #define __MAINBOARD_GOOGLE_NYAN_BIG_SDRAM_CONFIG_H__
 
-#include <soc/nvidia/tegra124/sdram_param.h>
+#include <soc/sdram_param.h>
 
 /* Loads SDRAM configurations for current system. */
 const struct sdram_params *get_sdram_config(void);
diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c
index 3a22dede45..335da87a50 100644
--- a/src/mainboard/google/nyan_blaze/boardid.c
+++ b/src/mainboard/google/nyan_blaze/boardid.c
@@ -17,12 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <boardid.h>
 #include <console/console.h>
-#include <soc/nvidia/tegra124/gpio.h>
+#include <soc/gpio.h>
 #include <stdlib.h>
 
-#include <boardid.h>
-
 uint8_t board_id(void)
 {
 	static int id = -1;
diff --git a/src/mainboard/google/nyan_blaze/bootblock.c b/src/mainboard/google/nyan_blaze/bootblock.c
index 05bb1c94c0..b24862e8b9 100644
--- a/src/mainboard/google/nyan_blaze/bootblock.c
+++ b/src/mainboard/google/nyan_blaze/bootblock.c
@@ -22,12 +22,12 @@
 #include <console/console.h>
 #include <device/i2c.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
+#include <soc/gpio.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/pinmux.h>
-#include <soc/nvidia/tegra124/spi.h>	/* FIXME: move back to soc code? */
+#include <soc/pinmux.h>
+#include <soc/spi.h>	/* FIXME: move back to soc code? */
 
 #include "pmic.h"
 
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index da017eaed1..0b944d1667 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -21,9 +21,9 @@
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
+#include <soc/gpio.h>
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include <soc/nvidia/tegra124/gpio.h>
 
 //enum {
 //	ACTIVE_LOW = 0,
diff --git a/src/mainboard/google/nyan_blaze/early_configs.c b/src/mainboard/google/nyan_blaze/early_configs.c
index c1f5f9b2f6..020f3fd8a8 100644
--- a/src/mainboard/google/nyan_blaze/early_configs.c
+++ b/src/mainboard/google/nyan_blaze/early_configs.c
@@ -19,9 +19,9 @@
 
 #include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/gpio.h>
+#include <soc/early_configs.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/early_configs.h>
 
 static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE;
 
diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index 5f1cb49ceb..da49377166 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -18,18 +18,18 @@
  */
 
 #include <arch/io.h>
+#include <boot/coreboot_tables.h>
 #include <device/device.h>
 #include <elog.h>
-#include <boot/coreboot_tables.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/clk_rst.h>
+#include <soc/gpio.h>
+#include <soc/mc.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/mc.h>
-#include <soc/nvidia/tegra124/pmc.h>
-#include <soc/nvidia/tegra124/spi.h>
 #include <soc/nvidia/tegra/usb.h>
+#include <soc/pmc.h>
+#include <soc/spi.h>
 #include <symbols.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/nyan_blaze/memlayout.ld b/src/mainboard/google/nyan_blaze/memlayout.ld
index 33ce6446ad..ead7f47838 100644
--- a/src/mainboard/google/nyan_blaze/memlayout.ld
+++ b/src/mainboard/google/nyan_blaze/memlayout.ld
@@ -1 +1 @@
-#include <soc/nvidia/tegra124/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c
index c89db2895b..f57bf08c52 100644
--- a/src/mainboard/google/nyan_blaze/pmic.c
+++ b/src/mainboard/google/nyan_blaze/pmic.c
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <boardid.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/i2c.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <reset.h>
 
-#include <boardid.h>
 #include "pmic.h"
-#include <reset.h>
 
 enum {
 	AS3722_I2C_ADDR = 0x40
diff --git a/src/mainboard/google/nyan_blaze/reset.c b/src/mainboard/google/nyan_blaze/reset.c
index 05cca2777e..de096c6520 100644
--- a/src/mainboard/google/nyan_blaze/reset.c
+++ b/src/mainboard/google/nyan_blaze/reset.c
@@ -18,7 +18,7 @@
  */
 
 #include <arch/io.h>
-#include <soc/nvidia/tegra124/gpio.h>
+#include <soc/gpio.h>
 #include <reset.h>
 
 void hard_reset(void)
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index fb1b9e2b77..034a929944 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -27,20 +27,21 @@
 #include <reset.h>
 #include <program_loading.h>
 #include <romstage_handoff.h>
-#include <vendorcode/google/chromeos/chromeos.h>
-#include "sdram_configs.h"
-#include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra124/cache.h>
-#include <soc/nvidia/tegra124/chip.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
-#include <soc/nvidia/tegra124/early_configs.h>
-#include <soc/nvidia/tegra124/power.h>
-#include <soc/nvidia/tegra124/sdram.h>
 #include <soc/addressmap.h>
+#include <soc/cache.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
 #include <soc/display.h>
+#include <soc/early_configs.h>
+#include <soc/nvidia/tegra/i2c.h>
+#include <soc/nvidia/tegra124/chip.h>
+#include <soc/power.h>
+#include <soc/sdram.h>
 #include <symbols.h>
 #include <timestamp.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
+#include "sdram_configs.h"
 
 static void __attribute__((noinline)) romstage(void)
 {
diff --git a/src/mainboard/google/nyan_blaze/sdram_configs.c b/src/mainboard/google/nyan_blaze/sdram_configs.c
index 6fb517d3e2..94c9203b5f 100644
--- a/src/mainboard/google/nyan_blaze/sdram_configs.c
+++ b/src/mainboard/google/nyan_blaze/sdram_configs.c
@@ -18,7 +18,8 @@
  */
 
 #include <console/console.h>
-#include <soc/nvidia/tegra124/sdram.h>
+#include <soc/sdram.h>
+
 #include "sdram_configs.h"
 
 static struct sdram_params sdram_configs[] = {
diff --git a/src/mainboard/google/nyan_blaze/sdram_configs.h b/src/mainboard/google/nyan_blaze/sdram_configs.h
index 26fd048120..e5f987339f 100644
--- a/src/mainboard/google/nyan_blaze/sdram_configs.h
+++ b/src/mainboard/google/nyan_blaze/sdram_configs.h
@@ -20,7 +20,7 @@
 #ifndef __MAINBOARD_GOOGLE_NYAN_BLAZE_SDRAM_CONFIG_H__
 #define __MAINBOARD_GOOGLE_NYAN_BLAZE_SDRAM_CONFIG_H__
 
-#include <soc/nvidia/tegra124/sdram_param.h>
+#include <soc/sdram_param.h>
 
 /* Loads SDRAM configurations for current system. */
 const struct sdram_params *get_sdram_config(void);
diff --git a/src/soc/nvidia/tegra/displayport.h b/src/soc/nvidia/tegra/displayport.h
index 5bf8423d11..b7face5d4e 100644
--- a/src/soc/nvidia/tegra/displayport.h
+++ b/src/soc/nvidia/tegra/displayport.h
@@ -17,6 +17,8 @@
 #ifndef __SOC_NVIDIA_TEGRA_DISPLAYPORT_H__
 #define __SOC_NVIDIA_TEGRA_DISPLAYPORT_H__
 
+#include <soc/sor.h>
+
 /* things we can't get rid of just yet. */
 #define DPAUX_INTR_EN_AUX				(0x1)
 #define DPAUX_INTR_AUX					(0x5)
diff --git a/src/soc/nvidia/tegra/software_i2c.c b/src/soc/nvidia/tegra/software_i2c.c
index b50fb4f654..35fc1af3cc 100644
--- a/src/soc/nvidia/tegra/software_i2c.c
+++ b/src/soc/nvidia/tegra/software_i2c.c
@@ -18,8 +18,8 @@
  */
 
 #include <device/i2c.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <soc/nvidia/tegra124/pinmux.h>
+#include <soc/gpio.h>
+#include <soc/pinmux.h>
 
 #include "i2c.h"
 
diff --git a/src/soc/nvidia/tegra124/bootblock.c b/src/soc/nvidia/tegra124/bootblock.c
index 1ccc394be2..7318ad66b9 100644
--- a/src/soc/nvidia/tegra124/bootblock.c
+++ b/src/soc/nvidia/tegra124/bootblock.c
@@ -25,9 +25,9 @@
 #include <program_loading.h>
 #include <soc/clock.h>
 #include <soc/nvidia/tegra/apbmisc.h>
+#include <soc/pinmux.h>
+#include <soc/power.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include "pinmux.h"
-#include "power.h"
 
 static void run_next_stage(void *entry)
 {
diff --git a/src/soc/nvidia/tegra124/cache.c b/src/soc/nvidia/tegra124/cache.c
index 55e625478a..a925eafa63 100644
--- a/src/soc/nvidia/tegra124/cache.c
+++ b/src/soc/nvidia/tegra124/cache.c
@@ -18,8 +18,8 @@
  */
 
 #include <arch/cache.h>
+#include <soc/cache.h>
 #include <stdint.h>
-#include "cache.h"
 
 enum {
 	L2CTLR_ECC_PARITY = 0x1 << 21,
diff --git a/src/soc/nvidia/tegra124/cbfs.c b/src/soc/nvidia/tegra124/cbfs.c
index d56050d04c..33a7258feb 100644
--- a/src/soc/nvidia/tegra124/cbfs.c
+++ b/src/soc/nvidia/tegra124/cbfs.c
@@ -19,10 +19,9 @@
 
 
 #include <cbfs.h>  /* This driver serves as a CBFS media source. */
+#include <soc/spi.h>
 #include <symbols.h>
 
-#include "spi.h"
-
 int init_default_cbfs_media(struct cbfs_media *media)
 {
 	return initialize_tegra_spi_cbfs_media(media,
diff --git a/src/soc/nvidia/tegra124/cbmem.c b/src/soc/nvidia/tegra124/cbmem.c
index 9a754a0fea..fcc19da350 100644
--- a/src/soc/nvidia/tegra124/cbmem.c
+++ b/src/soc/nvidia/tegra124/cbmem.c
@@ -19,7 +19,7 @@
 
 #include <cbmem.h>
 #include <soc/display.h>
-#include <soc/nvidia/tegra124/sdram.h>
+#include <soc/sdram.h>
 
 void *cbmem_top(void)
 {
diff --git a/src/soc/nvidia/tegra124/chip.h b/src/soc/nvidia/tegra124/chip.h
index 08e96ab809..c3652a182a 100644
--- a/src/soc/nvidia/tegra124/chip.h
+++ b/src/soc/nvidia/tegra124/chip.h
@@ -21,7 +21,7 @@
 #define __SOC_NVIDIA_TEGRA124_CHIP_H__
 #include <arch/cache.h>
 #include <soc/addressmap.h>
-#include "gpio.h"
+#include <soc/gpio.h>
 
 #define EFAULT  1
 #define EINVAL  2
diff --git a/src/soc/nvidia/tegra124/clock.c b/src/soc/nvidia/tegra124/clock.c
index f5043af3cd..225a764431 100644
--- a/src/soc/nvidia/tegra124/clock.c
+++ b/src/soc/nvidia/tegra124/clock.c
@@ -14,19 +14,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <arch/clock.h>
+#include <arch/io.h>
 #include <console/console.h>
 #include <delay.h>
-#include <arch/io.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
+#include <soc/flow.h>
+#include <soc/maincpu.h>
+#include <soc/pmc.h>
+#include <soc/sysctr.h>
 #include <stdlib.h>
 #include <symbols.h>
-#include <arch/clock.h>
-#include "clk_rst.h"
-#include "flow.h"
-#include "maincpu.h"
-#include "pmc.h"
-#include "sysctr.h"
 
 static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE;
 static struct flow_ctlr *flow = (void *)TEGRA_FLOW_BASE;
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index 6f6790d56e..71fff1c93e 100644
--- a/src/soc/nvidia/tegra124/display.c
+++ b/src/soc/nvidia/tegra124/display.c
@@ -17,26 +17,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/console.h>
 #include <arch/io.h>
-#include <stdint.h>
-#include <lib.h>
-#include <stdlib.h>
-#include <delay.h>
-#include <soc/addressmap.h>
-#include <device/device.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <cbmem.h>
+#include <console/console.h>
+#include <cpu/cpu.h>
+#include <delay.h>
+#include <device/device.h>
 #include <edid.h>
+#include <lib.h>
+#include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/display.h>
+#include <soc/sdram.h>
 #include <soc/nvidia/tegra/dc.h>
 #include <soc/nvidia/tegra/pwm.h>
-#include <soc/nvidia/tegra124/sdram.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "chip.h"
-#include <soc/display.h>
 
 struct tegra_dc dc_data;
 
diff --git a/src/soc/nvidia/tegra124/dma.c b/src/soc/nvidia/tegra124/dma.c
index aadda80a6c..37375fd797 100644
--- a/src/soc/nvidia/tegra124/dma.c
+++ b/src/soc/nvidia/tegra124/dma.c
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <arch/io.h>
+#include <console/console.h>
 #include <inttypes.h>
+#include <soc/addressmap.h>
+#include <soc/dma.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <console/console.h>
-
-#include <arch/io.h>
-#include <soc/addressmap.h>
-
-#include "dma.h"
 
 struct apb_dma * const apb_dma = (struct apb_dma *)TEGRA_APB_DMA_BASE;
 
diff --git a/src/soc/nvidia/tegra124/dp.c b/src/soc/nvidia/tegra124/dp.c
index 35a5c73036..b3dab75349 100644
--- a/src/soc/nvidia/tegra124/dp.c
+++ b/src/soc/nvidia/tegra124/dp.c
@@ -17,18 +17,19 @@
 
 #include <arch/io.h>
 #include <console/console.h>
+#include <delay.h>
 #include <device/device.h>
 #include <device/i2c.h>
 #include <edid.h>
-#include <stdlib.h>
-#include <string.h>
-#include <delay.h>
 #include <soc/addressmap.h>
 #include <soc/nvidia/tegra/i2c.h>
 #include <soc/nvidia/tegra/dc.h>
-#include "chip.h"
-#include "sor.h"
 #include <soc/nvidia/tegra/displayport.h>
+#include <soc/sor.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "chip.h"
 
 enum {
 	DP_LT_SUCCESS = 0,
diff --git a/src/soc/nvidia/tegra124/cache.h b/src/soc/nvidia/tegra124/include/soc/cache.h
index 3723cd7650..3723cd7650 100644
--- a/src/soc/nvidia/tegra124/cache.h
+++ b/src/soc/nvidia/tegra124/include/soc/cache.h
diff --git a/src/soc/nvidia/tegra124/clk_rst.h b/src/soc/nvidia/tegra124/include/soc/clk_rst.h
index d2249f7669..d2249f7669 100644
--- a/src/soc/nvidia/tegra124/clk_rst.h
+++ b/src/soc/nvidia/tegra124/include/soc/clk_rst.h
diff --git a/src/soc/nvidia/tegra124/include/soc/clock.h b/src/soc/nvidia/tegra124/include/soc/clock.h
index 82b2ad8100..3133d0f76a 100644
--- a/src/soc/nvidia/tegra124/include/soc/clock.h
+++ b/src/soc/nvidia/tegra124/include/soc/clock.h
@@ -21,7 +21,7 @@
 #include <arch/hlt.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <soc/nvidia/tegra124/clk_rst.h>
+#include <soc/clk_rst.h>
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/src/soc/nvidia/tegra124/dma.h b/src/soc/nvidia/tegra124/include/soc/dma.h
index e37bf743ad..e37bf743ad 100644
--- a/src/soc/nvidia/tegra124/dma.h
+++ b/src/soc/nvidia/tegra124/include/soc/dma.h
diff --git a/src/soc/nvidia/tegra124/early_configs.h b/src/soc/nvidia/tegra124/include/soc/early_configs.h
index 69511d2765..69511d2765 100644
--- a/src/soc/nvidia/tegra124/early_configs.h
+++ b/src/soc/nvidia/tegra124/include/soc/early_configs.h
diff --git a/src/soc/nvidia/tegra124/emc.h b/src/soc/nvidia/tegra124/include/soc/emc.h
index f9d415bcef..f9d415bcef 100644
--- a/src/soc/nvidia/tegra124/emc.h
+++ b/src/soc/nvidia/tegra124/include/soc/emc.h
diff --git a/src/soc/nvidia/tegra124/flow.h b/src/soc/nvidia/tegra124/include/soc/flow.h
index 416681ac8f..416681ac8f 100644
--- a/src/soc/nvidia/tegra124/flow.h
+++ b/src/soc/nvidia/tegra124/include/soc/flow.h
diff --git a/src/soc/nvidia/tegra124/gpio.h b/src/soc/nvidia/tegra124/include/soc/gpio.h
index f7d1c3006a..34de5b93df 100644
--- a/src/soc/nvidia/tegra124/gpio.h
+++ b/src/soc/nvidia/tegra124/include/soc/gpio.h
@@ -21,10 +21,9 @@
 #define __SOC_NVIDIA_TEGRA124_GPIO_H__
 
 #include <soc/nvidia/tegra/gpio.h>
+#include <soc/pinmux.h>	/* for pinmux constants in GPIO macro */
 #include <stdint.h>
 
-#include "pinmux.h"	/* for pinmux constants in GPIO macro */
-
 /* GPIO index constants. */
 
 #define GPIO_PORT_CONSTANTS(port) \
diff --git a/src/soc/nvidia/tegra124/maincpu.h b/src/soc/nvidia/tegra124/include/soc/maincpu.h
index 1d5a907a80..1d5a907a80 100644
--- a/src/soc/nvidia/tegra124/maincpu.h
+++ b/src/soc/nvidia/tegra124/include/soc/maincpu.h
diff --git a/src/soc/nvidia/tegra124/mc.h b/src/soc/nvidia/tegra124/include/soc/mc.h
index 567b32a226..567b32a226 100644
--- a/src/soc/nvidia/tegra124/mc.h
+++ b/src/soc/nvidia/tegra124/include/soc/mc.h
diff --git a/src/soc/nvidia/tegra124/memlayout.ld b/src/soc/nvidia/tegra124/include/soc/memlayout.ld
index 0d9e772d41..0d9e772d41 100644
--- a/src/soc/nvidia/tegra124/memlayout.ld
+++ b/src/soc/nvidia/tegra124/include/soc/memlayout.ld
diff --git a/src/soc/nvidia/tegra124/pingroup.h b/src/soc/nvidia/tegra124/include/soc/pingroup.h
index ed9557b1ba..ed9557b1ba 100644
--- a/src/soc/nvidia/tegra124/pingroup.h
+++ b/src/soc/nvidia/tegra124/include/soc/pingroup.h
diff --git a/src/soc/nvidia/tegra124/pinmux.h b/src/soc/nvidia/tegra124/include/soc/pinmux.h
index c79732b7e2..c79732b7e2 100644
--- a/src/soc/nvidia/tegra124/pinmux.h
+++ b/src/soc/nvidia/tegra124/include/soc/pinmux.h
diff --git a/src/soc/nvidia/tegra124/pmc.h b/src/soc/nvidia/tegra124/include/soc/pmc.h
index 2dfdaadb60..2dfdaadb60 100644
--- a/src/soc/nvidia/tegra124/pmc.h
+++ b/src/soc/nvidia/tegra124/include/soc/pmc.h
diff --git a/src/soc/nvidia/tegra124/power.h b/src/soc/nvidia/tegra124/include/soc/power.h
index 889dede2dd..889dede2dd 100644
--- a/src/soc/nvidia/tegra124/power.h
+++ b/src/soc/nvidia/tegra124/include/soc/power.h
diff --git a/src/soc/nvidia/tegra124/sdram.h b/src/soc/nvidia/tegra124/include/soc/sdram.h
index d32ce37770..1571521995 100644
--- a/src/soc/nvidia/tegra124/sdram.h
+++ b/src/soc/nvidia/tegra124/include/soc/sdram.h
@@ -20,7 +20,7 @@
 #ifndef __SOC_NVIDIA_TEGRA124_SDRAM_H__
 #define __SOC_NVIDIA_TEGRA124_SDRAM_H__
 
-#include "sdram_param.h"
+#include <soc/sdram_param.h>
 
 uint32_t sdram_get_ram_code(void);
 void sdram_init(const struct sdram_params *param);
diff --git a/src/soc/nvidia/tegra124/sdram_param.h b/src/soc/nvidia/tegra124/include/soc/sdram_param.h
index c845611da0..c845611da0 100644
--- a/src/soc/nvidia/tegra124/sdram_param.h
+++ b/src/soc/nvidia/tegra124/include/soc/sdram_param.h
diff --git a/src/soc/nvidia/tegra124/sor.h b/src/soc/nvidia/tegra124/include/soc/sor.h
index 569cdb970b..569cdb970b 100644
--- a/src/soc/nvidia/tegra124/sor.h
+++ b/src/soc/nvidia/tegra124/include/soc/sor.h
diff --git a/src/soc/nvidia/tegra124/spi.h b/src/soc/nvidia/tegra124/include/soc/spi.h
index 11e88feec5..ab046323b1 100644
--- a/src/soc/nvidia/tegra124/spi.h
+++ b/src/soc/nvidia/tegra124/include/soc/spi.h
@@ -18,10 +18,9 @@
 #define __NVIDIA_TEGRA124_SPI_H__
 
 #include <spi-generic.h>
+#include <soc/dma.h>
 #include <stddef.h>
 
-#include "dma.h"
-
 struct tegra_spi_regs {
 	u32 command1;		/* 0x000: SPI_COMMAND1 */
 	u32 command2;		/* 0x004: SPI_COMMAND2 */
diff --git a/src/soc/nvidia/tegra124/sysctr.h b/src/soc/nvidia/tegra124/include/soc/sysctr.h
index 1d7f53c3e1..1d7f53c3e1 100644
--- a/src/soc/nvidia/tegra124/sysctr.h
+++ b/src/soc/nvidia/tegra124/include/soc/sysctr.h
diff --git a/src/soc/nvidia/tegra124/power.c b/src/soc/nvidia/tegra124/power.c
index 75f04942b9..825b27bda9 100644
--- a/src/soc/nvidia/tegra124/power.c
+++ b/src/soc/nvidia/tegra124/power.c
@@ -22,10 +22,9 @@
 #include <console/console.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
-
-#include "pmc.h"
-#include "power.h"
-#include "flow.h"
+#include <soc/flow.h>
+#include <soc/pmc.h>
+#include <soc/power.h>
 
 static struct tegra_pmc_regs * const pmc = (void *)TEGRA_PMC_BASE;
 static struct flow_ctlr * const flow = (void *)TEGRA_FLOW_BASE;
diff --git a/src/soc/nvidia/tegra124/sdram.c b/src/soc/nvidia/tegra124/sdram.c
index 82219b1da5..d094c18594 100644
--- a/src/soc/nvidia/tegra124/sdram.c
+++ b/src/soc/nvidia/tegra124/sdram.c
@@ -22,13 +22,13 @@
 #include <delay.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/emc.h>
+#include <soc/mc.h>
+#include <soc/pmc.h>
+#include <soc/sdram.h>
 #include <stdlib.h>
 #include <symbols.h>
 
-#include "emc.h"
-#include "mc.h"
-#include "pmc.h"
-#include "sdram.h"
 
 static void sdram_patch(uintptr_t addr, uint32_t value)
 {
diff --git a/src/soc/nvidia/tegra124/sdram_lp0.c b/src/soc/nvidia/tegra124/sdram_lp0.c
index 0cd814ea2c..11e8bc0aba 100644
--- a/src/soc/nvidia/tegra124/sdram_lp0.c
+++ b/src/soc/nvidia/tegra124/sdram_lp0.c
@@ -17,12 +17,11 @@
 
 #include <arch/cache.h>
 #include <console/console.h>
-#include <stdlib.h>
 #include <soc/addressmap.h>
-
-#include "clk_rst.h"
-#include "pmc.h"
-#include "sdram.h"
+#include <soc/clk_rst.h>
+#include <soc/pmc.h>
+#include <soc/sdram.h>
+#include <stdlib.h>
 
 /*
  * This function reads SDRAM parameters (and a few CLK_RST regsiter values) from
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index 5da41a9b04..58da1ebaf8 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/io.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <arch/io.h>
 #include <soc/nvidia/tegra/dc.h>
-#include <soc/nvidia/tegra124/sdram.h>
-#include "chip.h"
 #include <soc/display.h>
+#include <soc/sdram.h>
 #include <symbols.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
+#include "chip.h"
+
 /* this sucks, but for now, fb size/location are hardcoded.
  * Will break if we get 2. Sigh.
  * We assume it's all multiples of MiB for MMUs sake.
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index 3eaae0e8f9..3de63f9e99 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -14,26 +14,26 @@
  *
  */
 
-#include <console/console.h>
 #include <arch/io.h>
-#include <stdint.h>
-#include <lib.h>
-#include <stdlib.h>
-#include <delay.h>
-#include <soc/addressmap.h>
-#include <device/device.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <cbmem.h>
+#include <console/console.h>
+#include <cpu/cpu.h>
+#include <delay.h>
+#include <lib.h>
+#include <device/device.h>
+#include <soc/addressmap.h>
+#include <soc/clk_rst.h>
+#include <soc/clock.h>
+#include <soc/display.h>
 #include <soc/nvidia/tegra/dc.h>
-#include "sor.h"
 #include <soc/nvidia/tegra/displayport.h>
-#include "clk_rst.h"
-#include <soc/clock.h>
+#include <soc/sor.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "chip.h"
-#include <soc/display.h>
 
 #define DEBUG_SOR 0
 
diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c
index b88306bb4a..aefb4da0d6 100644
--- a/src/soc/nvidia/tegra124/spi.c
+++ b/src/soc/nvidia/tegra124/spi.c
@@ -18,23 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/cache.h>
+#include <arch/io.h>
 #include <assert.h>
+#include <console/console.h>
 #include <cbfs.h>
+#include <delay.h>
 #include <inttypes.h>
+#include <soc/addressmap.h>
+#include <soc/dma.h>
+#include <soc/spi.h>
 #include <spi-generic.h>
 #include <spi_flash.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <timer.h>
-#include <arch/cache.h>
-#include <arch/io.h>
-#include <console/console.h>
-#include <soc/addressmap.h>
-#include <delay.h>
 
-#include "dma.h"
-#include "spi.h"
 
 #if defined(CONFIG_DEBUG_SPI) && CONFIG_DEBUG_SPI
 # define DEBUG_SPI(x,...)	printk(BIOS_DEBUG, "TEGRA_SPI: " x)
diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c
index fd8074daa0..4af00e9906 100644
--- a/src/soc/nvidia/tegra124/uart.c
+++ b/src/soc/nvidia/tegra124/uart.c
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/uart.h>
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
 #include <console/console.h>	/* for __console definition */
+#include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 
 
diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c
index 2e5ddf276c..80324232a8 100644
--- a/src/soc/nvidia/tegra124/verstage.c
+++ b/src/soc/nvidia/tegra124/verstage.c
@@ -20,8 +20,8 @@
 #include <arch/cache.h>
 #include <arch/exception.h>
 #include <console/console.h>
-#include <soc/nvidia/tegra124/cache.h>
-#include <soc/nvidia/tegra124/early_configs.h>
+#include <soc/cache.h>
+#include <soc/early_configs.h>
 #include <stdlib.h>
 #include <symbols.h>
 #include <vendorcode/google/chromeos/chromeos.h>