diff --git a/src/mainboard/google/rush/boardid.c b/src/mainboard/google/rush/boardid.c
index 67e55ba3fb..7ed2b53ed6 100644
--- a/src/mainboard/google/rush/boardid.c
+++ b/src/mainboard/google/rush/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/tegra132/gpio.h>
-
 #include <boardid.h>
+#include <console/console.h>
+#include <soc/gpio.h>
 
 uint8_t board_id(void)
 {
diff --git a/src/mainboard/google/rush/bootblock.c b/src/mainboard/google/rush/bootblock.c
index e84a25ef8b..eb61cddf8c 100644
--- a/src/mainboard/google/rush/bootblock.c
+++ b/src/mainboard/google/rush/bootblock.c
@@ -21,13 +21,13 @@
 #include <console/console.h>
 #include <device/i2c.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/bootblock.h>
 #include <soc/clock.h>
-#include <soc/padconfig.h>
 #include <soc/funitcfg.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra132/clk_rst.h>
-#include <soc/nvidia/tegra132/spi.h>	/* FIXME: move back to soc code? */
+#include <soc/padconfig.h>
+#include <soc/spi.h>	/* FIXME: move back to soc code? */
 
 #include "pmic.h"
 
diff --git a/src/mainboard/google/rush/chromeos.c b/src/mainboard/google/rush/chromeos.c
index 03908c0434..5232344223 100644
--- a/src/mainboard/google/rush/chromeos.c
+++ b/src/mainboard/google/rush/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/tegra132/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/rush/mainboard.c b/src/mainboard/google/rush/mainboard.c
index 846a7ac55f..8ea3f4eb3d 100644
--- a/src/mainboard/google/rush/mainboard.c
+++ b/src/mainboard/google/rush/mainboard.c
@@ -18,17 +18,16 @@
  */
 
 #include <arch/mmu.h>
-#include <device/device.h>
 #include <boot/coreboot_tables.h>
-
+#include <device/device.h>
 #include <memrange.h>
-#include <soc/clock.h>
-#include <soc/nvidia/tegra132/clk_rst.h>
-#include <soc/nvidia/tegra132/spi.h>
 #include <soc/addressmap.h>
-#include <soc/padconfig.h>
+#include <soc/clk_rst.h>
+#include <soc/clock.h>
 #include <soc/funitcfg.h>
 #include <soc/nvidia/tegra/usb.h>
+#include <soc/padconfig.h>
+#include <soc/spi.h>
 
 static const struct pad_config sdmmc3_pad[] = {
 	/* MMC3(SDCARD) */
diff --git a/src/mainboard/google/rush/memlayout.ld b/src/mainboard/google/rush/memlayout.ld
index b9def51e74..ead7f47838 100644
--- a/src/mainboard/google/rush/memlayout.ld
+++ b/src/mainboard/google/rush/memlayout.ld
@@ -1 +1 @@
-#include <soc/nvidia/tegra132/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/rush/pmic.c b/src/mainboard/google/rush/pmic.c
index 85de2003e7..b016164ccd 100644
--- a/src/mainboard/google/rush/pmic.c
+++ b/src/mainboard/google/rush/pmic.c
@@ -18,13 +18,13 @@
  * 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 <boardid.h>
 #include "pmic.h"
 #include "reset.h"
 
diff --git a/src/mainboard/google/rush/reset.c b/src/mainboard/google/rush/reset.c
index f3057cac90..dbaed0d95b 100644
--- a/src/mainboard/google/rush/reset.c
+++ b/src/mainboard/google/rush/reset.c
@@ -18,8 +18,8 @@
  */
 
 #include <arch/io.h>
+#include <soc/gpio.h>
 #include <reset.h>
-#include <soc/nvidia/tegra132/gpio.h>
 
 void hard_reset(void)
 {
diff --git a/src/mainboard/google/rush/romstage.c b/src/mainboard/google/rush/romstage.c
index e82f5ad034..88b7d382c1 100644
--- a/src/mainboard/google/rush/romstage.c
+++ b/src/mainboard/google/rush/romstage.c
@@ -17,13 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <soc/romstage.h>
-
 #include <soc/addressmap.h>
 #include <soc/clock.h>
-#include <soc/padconfig.h>
-#include <soc/nvidia/tegra/i2c.h>
 #include <soc/funitcfg.h>
+#include <soc/nvidia/tegra/i2c.h>
+#include <soc/padconfig.h>
+#include <soc/romstage.h>
 
 static const struct pad_config padcfgs[] = {
 	/* SOC_WARM_RESET_L */
diff --git a/src/mainboard/google/rush_ryu/boardid.c b/src/mainboard/google/rush_ryu/boardid.c
index 1aa7c16831..9d99b90ddc 100644
--- a/src/mainboard/google/rush_ryu/boardid.c
+++ b/src/mainboard/google/rush_ryu/boardid.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <boardid.h>
 #include <console/console.h>
-#include <soc/nvidia/tegra132/gpio.h>
+#include <soc/gpio.h>
 #include <stdlib.h>
 
-#include <boardid.h>
 #include "gpio.h"
 
 /*
diff --git a/src/mainboard/google/rush_ryu/bootblock.c b/src/mainboard/google/rush_ryu/bootblock.c
index 9a1c68bb96..898bb3fdfe 100644
--- a/src/mainboard/google/rush_ryu/bootblock.c
+++ b/src/mainboard/google/rush_ryu/bootblock.c
@@ -22,11 +22,11 @@
 #include <device/i2c.h>
 #include <soc/addressmap.h>
 #include <soc/bootblock.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
 #include <soc/funitcfg.h>
-#include <soc/padconfig.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra132/clk_rst.h>
+#include <soc/padconfig.h>
 
 #include "pmic.h"
 
diff --git a/src/mainboard/google/rush_ryu/chromeos.c b/src/mainboard/google/rush_ryu/chromeos.c
index 9c9056eb96..521fe59372 100644
--- a/src/mainboard/google/rush_ryu/chromeos.c
+++ b/src/mainboard/google/rush_ryu/chromeos.c
@@ -23,6 +23,7 @@
 #include <ec/google/chromeec/ec_commands.h>
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
+
 #include "gpio.h"
 
 void fill_lb_gpios(struct lb_gpios *gpios)
diff --git a/src/mainboard/google/rush_ryu/gpio.h b/src/mainboard/google/rush_ryu/gpio.h
index f790e8f2be..9c67420ff0 100644
--- a/src/mainboard/google/rush_ryu/gpio.h
+++ b/src/mainboard/google/rush_ryu/gpio.h
@@ -20,7 +20,7 @@
 #ifndef __MAINBOARD_GOOGLE_RUSH_RYU_GPIO_H__
 #define __MAINBOARD_GOOGLE_RUSH_RYU_GPIO_H__
 
-#include <soc/nvidia/tegra132/gpio.h>
+#include <soc/gpio.h>
 
 /* Board ID definitions. */
 enum {
diff --git a/src/mainboard/google/rush_ryu/mainboard.c b/src/mainboard/google/rush_ryu/mainboard.c
index e19ad02612..1af7e221cd 100644
--- a/src/mainboard/google/rush_ryu/mainboard.c
+++ b/src/mainboard/google/rush_ryu/mainboard.c
@@ -18,16 +18,15 @@
  */
 
 #include <arch/mmu.h>
-#include <device/device.h>
 #include <boot/coreboot_tables.h>
+#include <device/device.h>
 #include <memrange.h>
-
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
 #include <soc/funitcfg.h>
-#include <soc/padconfig.h>
-#include <soc/nvidia/tegra132/clk_rst.h>
 #include <soc/nvidia/tegra/i2c.h>
+#include <soc/padconfig.h>
 
 static const struct pad_config mmcpads[] = {
 	/* MMC4 (eMMC) */
diff --git a/src/mainboard/google/rush_ryu/memlayout.ld b/src/mainboard/google/rush_ryu/memlayout.ld
index b9def51e74..ead7f47838 100644
--- a/src/mainboard/google/rush_ryu/memlayout.ld
+++ b/src/mainboard/google/rush_ryu/memlayout.ld
@@ -1 +1 @@
-#include <soc/nvidia/tegra132/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/rush_ryu/pmic.c b/src/mainboard/google/rush_ryu/pmic.c
index 85cc6e2f5b..a816e8ac14 100644
--- a/src/mainboard/google/rush_ryu/pmic.c
+++ b/src/mainboard/google/rush_ryu/pmic.c
@@ -23,6 +23,7 @@
 #include <device/i2c.h>
 #include <stdint.h>
 #include <stdlib.h>
+
 #include "pmic.h"
 #include "reset.h"
 
diff --git a/src/mainboard/google/rush_ryu/reset.c b/src/mainboard/google/rush_ryu/reset.c
index 4548837d7e..7ccb2de28b 100644
--- a/src/mainboard/google/rush_ryu/reset.c
+++ b/src/mainboard/google/rush_ryu/reset.c
@@ -19,6 +19,7 @@
 
 #include <arch/io.h>
 #include <reset.h>
+
 #include "gpio.h"
 
 void hard_reset(void)
diff --git a/src/mainboard/google/rush_ryu/romstage.c b/src/mainboard/google/rush_ryu/romstage.c
index 5d195a6fcb..41c9149be4 100644
--- a/src/mainboard/google/rush_ryu/romstage.c
+++ b/src/mainboard/google/rush_ryu/romstage.c
@@ -21,9 +21,10 @@
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/funitcfg.h>
-#include <soc/padconfig.h>
 #include <soc/nvidia/tegra/i2c.h>
+#include <soc/padconfig.h>
 #include <soc/romstage.h>
+
 #include "gpio.h"
 #include "pmic.h"
 
diff --git a/src/soc/nvidia/tegra132/addressmap.c b/src/soc/nvidia/tegra132/addressmap.c
index bd644d4c5c..72563f5095 100644
--- a/src/soc/nvidia/tegra132/addressmap.c
+++ b/src/soc/nvidia/tegra132/addressmap.c
@@ -19,13 +19,13 @@
 
 
 #include <arch/io.h>
-#include <stdlib.h>
 #include <console/console.h>
 #include <soc/addressmap.h>
 #include <soc/id.h>
+#include <soc/mc.h>
+#include <soc/sdram.h>
+#include <stdlib.h>
 #include <symbols.h>
-#include "mc.h"
-#include "sdram.h"
 
 static uintptr_t tz_base_mib;
 static const size_t tz_size_mib = CONFIG_TRUSTZONE_CARVEOUT_SIZE_MB;
diff --git a/src/soc/nvidia/tegra132/bootblock.c b/src/soc/nvidia/tegra132/bootblock.c
index 6f2505011b..fe7d6f04fa 100644
--- a/src/soc/nvidia/tegra132/bootblock.c
+++ b/src/soc/nvidia/tegra132/bootblock.c
@@ -26,8 +26,7 @@
 #include <soc/bootblock.h>
 #include <soc/clock.h>
 #include <soc/nvidia/tegra/apbmisc.h>
-
-#include "power.h"
+#include <soc/power.h>
 
 #define BCT_OFFSET_IN_BIT	0x50
 #define ODMDATA_OFFSET_IN_BCT	0x6A8
diff --git a/src/soc/nvidia/tegra132/cbfs.c b/src/soc/nvidia/tegra132/cbfs.c
index 648d13663a..2efd48bccf 100644
--- a/src/soc/nvidia/tegra132/cbfs.c
+++ b/src/soc/nvidia/tegra132/cbfs.c
@@ -17,12 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
 #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/tegra132/ccplex.c b/src/soc/nvidia/tegra132/ccplex.c
index b183e5d1e1..ea92b31324 100644
--- a/src/soc/nvidia/tegra132/ccplex.c
+++ b/src/soc/nvidia/tegra132/ccplex.c
@@ -17,21 +17,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
-#include <console/console.h>
 #include <arch/io.h>
 #include <cbfs.h>
-#include <timer.h>
+#include <console/console.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
+#include <soc/clk_rst.h>
+#include <soc/ccplex.h>
 #include <soc/cpu.h>
+#include <soc/flow.h>
+#include <soc/mc.h>
+#include <soc/pmc.h>
+#include <soc/power.h>
 #include <soc/romstage.h>
-#include "clk_rst.h"
-#include "ccplex.h"
-#include "flow.h"
-#include "mc.h"
-#include "pmc.h"
-#include "power.h"
+#include <string.h>
+#include <timer.h>
 
 #define PMC_REGS (void *)(uintptr_t)(TEGRA_PMC_BASE)
 #define MTS_FILE_NAME "mts"
diff --git a/src/soc/nvidia/tegra132/clock.c b/src/soc/nvidia/tegra132/clock.c
index db8a529223..0d37851775 100644
--- a/src/soc/nvidia/tegra132/clock.c
+++ b/src/soc/nvidia/tegra132/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/clock.h>
 #include <stdlib.h>
-#include <arch/clock.h>
-#include "clk_rst.h"
-#include "clst_clk.h"
-#include "flow.h"
-#include "maincpu.h"
-#include "pmc.h"
-#include "sysctr.h"
+#include <soc/addressmap.h>
+#include <soc/clk_rst.h>
+#include <soc/clock.h>
+#include <soc/clst_clk.h>
+#include <soc/flow.h>
+#include <soc/maincpu.h>
+#include <soc/pmc.h>
+#include <soc/sysctr.h>
 
 static struct clst_clk_ctlr *clst_clk = (void *)TEGRA_CLUSTER_CLOCK_BASE;
 static struct flow_ctlr *flow = (void *)TEGRA_FLOW_BASE;
diff --git a/src/soc/nvidia/tegra132/cpu.c b/src/soc/nvidia/tegra132/cpu.c
index fd0c0524c5..5dd4c53493 100644
--- a/src/soc/nvidia/tegra132/cpu.c
+++ b/src/soc/nvidia/tegra132/cpu.c
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/console.h>
 #include <arch/io.h>
+#include <console/console.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/cpu.h>
-#include "clk_rst.h"
-#include "pmc.h"
+#include <soc/pmc.h>
 
 #define EVP_CPU_RESET_VECTOR (void *)(uintptr_t)(TEGRA_EVP_BASE + 0x100)
 #define PMC_REGS (void *)(uintptr_t)(TEGRA_PMC_BASE)
diff --git a/src/soc/nvidia/tegra132/dma.c b/src/soc/nvidia/tegra132/dma.c
index 3f236c3e22..9f04e9777f 100644
--- a/src/soc/nvidia/tegra132/dma.c
+++ b/src/soc/nvidia/tegra132/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/tegra132/funitcfg.c b/src/soc/nvidia/tegra132/funitcfg.c
index 2d34756a7f..1054f5ce7e 100644
--- a/src/soc/nvidia/tegra132/funitcfg.c
+++ b/src/soc/nvidia/tegra132/funitcfg.c
@@ -19,11 +19,11 @@
 
 #include <arch/io.h>
 #include <soc/addressmap.h>
-#include <soc/funitcfg.h>
 #include <soc/clock.h>
+#include <soc/funitcfg.h>
+#include <soc/nvidia/tegra/usb.h>
 #include <soc/padconfig.h>
 #include <string.h>
-#include <soc/nvidia/tegra/usb.h>
 
 struct clk_dev_control {
 	uint32_t *clk_enb_set;
diff --git a/src/soc/nvidia/tegra132/i2c6.c b/src/soc/nvidia/tegra132/i2c6.c
index e4fbd19f4e..86373d621e 100644
--- a/src/soc/nvidia/tegra132/i2c6.c
+++ b/src/soc/nvidia/tegra132/i2c6.c
@@ -18,13 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <delay.h>
 #include <soc/addressmap.h>
+#include <soc/clk_rst.h>
 #include <soc/clock.h>
-#include <soc/padconfig.h>
 #include <soc/nvidia/tegra/i2c.h>
-#include <soc/nvidia/tegra132/power.h>
-#include <soc/nvidia/tegra132/clk_rst.h>
-#include "delay.h"
+#include <soc/padconfig.h>
+#include <soc/power.h>
 
 #define I2C6_BUS		5
 #define I2C6_PADCTL		0xC001
diff --git a/src/soc/nvidia/tegra132/ccplex.h b/src/soc/nvidia/tegra132/include/soc/ccplex.h
similarity index 100%
rename from src/soc/nvidia/tegra132/ccplex.h
rename to src/soc/nvidia/tegra132/include/soc/ccplex.h
diff --git a/src/soc/nvidia/tegra132/clk_rst.h b/src/soc/nvidia/tegra132/include/soc/clk_rst.h
similarity index 100%
rename from src/soc/nvidia/tegra132/clk_rst.h
rename to src/soc/nvidia/tegra132/include/soc/clk_rst.h
diff --git a/src/soc/nvidia/tegra132/include/soc/clock.h b/src/soc/nvidia/tegra132/include/soc/clock.h
index d93e7b657f..2c7664c1ff 100644
--- a/src/soc/nvidia/tegra132/include/soc/clock.h
+++ b/src/soc/nvidia/tegra132/include/soc/clock.h
@@ -21,7 +21,7 @@
 #include <arch/hlt.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <soc/nvidia/tegra132/clk_rst.h>
+#include <soc/clk_rst.h>
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/src/soc/nvidia/tegra132/clst_clk.h b/src/soc/nvidia/tegra132/include/soc/clst_clk.h
similarity index 100%
rename from src/soc/nvidia/tegra132/clst_clk.h
rename to src/soc/nvidia/tegra132/include/soc/clst_clk.h
diff --git a/src/soc/nvidia/tegra132/dma.h b/src/soc/nvidia/tegra132/include/soc/dma.h
similarity index 100%
rename from src/soc/nvidia/tegra132/dma.h
rename to src/soc/nvidia/tegra132/include/soc/dma.h
diff --git a/src/soc/nvidia/tegra132/emc.h b/src/soc/nvidia/tegra132/include/soc/emc.h
similarity index 100%
rename from src/soc/nvidia/tegra132/emc.h
rename to src/soc/nvidia/tegra132/include/soc/emc.h
diff --git a/src/soc/nvidia/tegra132/flow.h b/src/soc/nvidia/tegra132/include/soc/flow.h
similarity index 100%
rename from src/soc/nvidia/tegra132/flow.h
rename to src/soc/nvidia/tegra132/include/soc/flow.h
diff --git a/src/soc/nvidia/tegra132/include/soc/funitcfg.h b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
index cf49d0ab8c..2c680fe374 100644
--- a/src/soc/nvidia/tegra132/include/soc/funitcfg.h
+++ b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
@@ -20,10 +20,10 @@
 #ifndef __SOC_NVIDIA_TEGRA132_FUNIT_CFG_H
 #define __SOC_NVIDIA_TEGRA132_FUNIT_CFG_H
 
-#include <stdint.h>
-#include <soc/nvidia/tegra132/pinmux.h>
-#include <soc/padconfig.h>
 #include <soc/clock.h>
+#include <soc/padconfig.h>
+#include <soc/pinmux.h>
+#include <stdint.h>
 
 #define FUNIT_INDEX(_name)  FUNIT_##_name
 
diff --git a/src/soc/nvidia/tegra132/gpio.h b/src/soc/nvidia/tegra132/include/soc/gpio.h
similarity index 95%
rename from src/soc/nvidia/tegra132/gpio.h
rename to src/soc/nvidia/tegra132/include/soc/gpio.h
index 4b78b61f2c..b28a87f687 100644
--- a/src/soc/nvidia/tegra132/gpio.h
+++ b/src/soc/nvidia/tegra132/include/soc/gpio.h
@@ -20,6 +20,6 @@
 #ifndef __SOC_NVIDIA_TEGRA132_GPIO_H__
 #define __SOC_NVIDIA_TEGRA132_GPIO_H__
 
-#include <soc/nvidia/tegra132/pinmux.h>
+#include <soc/pinmux.h>
 
 #endif	/* __SOC_NVIDIA_TEGRA132_GPIO_H__ */
diff --git a/src/soc/nvidia/tegra132/maincpu.h b/src/soc/nvidia/tegra132/include/soc/maincpu.h
similarity index 100%
rename from src/soc/nvidia/tegra132/maincpu.h
rename to src/soc/nvidia/tegra132/include/soc/maincpu.h
diff --git a/src/soc/nvidia/tegra132/mc.h b/src/soc/nvidia/tegra132/include/soc/mc.h
similarity index 100%
rename from src/soc/nvidia/tegra132/mc.h
rename to src/soc/nvidia/tegra132/include/soc/mc.h
diff --git a/src/soc/nvidia/tegra132/memlayout.ld b/src/soc/nvidia/tegra132/include/soc/memlayout.ld
similarity index 100%
rename from src/soc/nvidia/tegra132/memlayout.ld
rename to src/soc/nvidia/tegra132/include/soc/memlayout.ld
diff --git a/src/soc/nvidia/tegra132/mmu_operations.h b/src/soc/nvidia/tegra132/include/soc/mmu_operations.h
similarity index 100%
rename from src/soc/nvidia/tegra132/mmu_operations.h
rename to src/soc/nvidia/tegra132/include/soc/mmu_operations.h
diff --git a/src/soc/nvidia/tegra132/include/soc/padconfig.h b/src/soc/nvidia/tegra132/include/soc/padconfig.h
index a4339891f2..569fe4624c 100644
--- a/src/soc/nvidia/tegra132/include/soc/padconfig.h
+++ b/src/soc/nvidia/tegra132/include/soc/padconfig.h
@@ -21,7 +21,7 @@
 #define __SOC_NVIDIA_TEGRA132_PAD_CFG_H
 
 #include <stdint.h>
-#include <soc/nvidia/tegra132/pinmux.h>
+#include <soc/pinmux.h>
 
 struct pad_config {
 	uint8_t pinmux_flags;	/* PU/PU, OD, INPUT, SFIO, etc */
diff --git a/src/soc/nvidia/tegra132/pinmux.h b/src/soc/nvidia/tegra132/include/soc/pinmux.h
similarity index 100%
rename from src/soc/nvidia/tegra132/pinmux.h
rename to src/soc/nvidia/tegra132/include/soc/pinmux.h
diff --git a/src/soc/nvidia/tegra132/pmc.h b/src/soc/nvidia/tegra132/include/soc/pmc.h
similarity index 100%
rename from src/soc/nvidia/tegra132/pmc.h
rename to src/soc/nvidia/tegra132/include/soc/pmc.h
diff --git a/src/soc/nvidia/tegra132/power.h b/src/soc/nvidia/tegra132/include/soc/power.h
similarity index 97%
rename from src/soc/nvidia/tegra132/power.h
rename to src/soc/nvidia/tegra132/include/soc/power.h
index 0dbcc5e082..d42116eb75 100644
--- a/src/soc/nvidia/tegra132/power.h
+++ b/src/soc/nvidia/tegra132/include/soc/power.h
@@ -20,7 +20,7 @@
 #ifndef __SOC_NVIDIA_TEGRA132_POWER_H__
 #define __SOC_NVIDIA_TEGRA132_POWER_H__
 
-#include "pmc.h"
+#include <soc/pmc.h>
 
 void power_ungate_partition(uint32_t id);
 
diff --git a/src/soc/nvidia/tegra132/sdram.h b/src/soc/nvidia/tegra132/include/soc/sdram.h
similarity index 97%
rename from src/soc/nvidia/tegra132/sdram.h
rename to src/soc/nvidia/tegra132/include/soc/sdram.h
index 7684eb86d4..1e6e70de8c 100644
--- a/src/soc/nvidia/tegra132/sdram.h
+++ b/src/soc/nvidia/tegra132/include/soc/sdram.h
@@ -20,7 +20,7 @@
 #ifndef __SOC_NVIDIA_TEGRA132_SDRAM_H__
 #define __SOC_NVIDIA_TEGRA132_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/tegra132/include/soc/sdram_configs.h b/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
index 300be1093c..38368fb69b 100644
--- a/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
+++ b/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
@@ -20,7 +20,7 @@
 #ifndef __SOC_NVIDIA_TEGRA132_SDRAM_CONFIGS_H__
 #define __SOC_NVIDIA_TEGRA132_SDRAM_CONFIGS_H__
 
-#include <soc/nvidia/tegra132/sdram.h>
+#include <soc/sdram.h>
 
 /* Loads SDRAM configurations for current system. */
 const struct sdram_params *get_sdram_config(void);
diff --git a/src/soc/nvidia/tegra132/sdram_param.h b/src/soc/nvidia/tegra132/include/soc/sdram_param.h
similarity index 100%
rename from src/soc/nvidia/tegra132/sdram_param.h
rename to src/soc/nvidia/tegra132/include/soc/sdram_param.h
diff --git a/src/soc/nvidia/tegra132/spi.h b/src/soc/nvidia/tegra132/include/soc/spi.h
similarity index 99%
rename from src/soc/nvidia/tegra132/spi.h
rename to src/soc/nvidia/tegra132/include/soc/spi.h
index e53505925b..2fd9562599 100644
--- a/src/soc/nvidia/tegra132/spi.h
+++ b/src/soc/nvidia/tegra132/include/soc/spi.h
@@ -18,11 +18,10 @@
 #ifndef __NVIDIA_TEGRA132_SPI_H__
 #define __NVIDIA_TEGRA132_SPI_H__
 
+#include <soc/dma.h>
 #include <spi-generic.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/tegra132/sysctr.h b/src/soc/nvidia/tegra132/include/soc/sysctr.h
similarity index 100%
rename from src/soc/nvidia/tegra132/sysctr.h
rename to src/soc/nvidia/tegra132/include/soc/sysctr.h
diff --git a/src/soc/nvidia/tegra132/mmu_operations.c b/src/soc/nvidia/tegra132/mmu_operations.c
index b2e1077f99..42678fc280 100644
--- a/src/soc/nvidia/tegra132/mmu_operations.c
+++ b/src/soc/nvidia/tegra132/mmu_operations.c
@@ -17,13 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/mmu.h>
+#include <memrange.h>
+#include <soc/addressmap.h>
+#include <soc/mmu_operations.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <memrange.h>
-
-#include <arch/mmu.h>
-#include "mmu_operations.h"
-#include <soc/addressmap.h>
 
 /* This structure keeps track of all the mmap memory ranges for t132 */
 static struct memranges t132_mmap_ranges;
diff --git a/src/soc/nvidia/tegra132/padconfig.c b/src/soc/nvidia/tegra132/padconfig.c
index 621898d2f7..5f7f2e4f93 100644
--- a/src/soc/nvidia/tegra132/padconfig.c
+++ b/src/soc/nvidia/tegra132/padconfig.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
 #include <arch/io.h>
 #include <soc/addressmap.h>
 #include <soc/padconfig.h>
diff --git a/src/soc/nvidia/tegra132/power.c b/src/soc/nvidia/tegra132/power.c
index 679845c2ce..4316d763db 100644
--- a/src/soc/nvidia/tegra132/power.c
+++ b/src/soc/nvidia/tegra132/power.c
@@ -22,9 +22,8 @@
 #include <assert.h>
 #include <console/console.h>
 #include <soc/addressmap.h>
-
-#include "pmc.h"
-#include "power.h"
+#include <soc/pmc.h>
+#include <soc/power.h>
 
 static struct tegra_pmc_regs * const pmc = (void *)TEGRA_PMC_BASE;
 
diff --git a/src/soc/nvidia/tegra132/ramstage.c b/src/soc/nvidia/tegra132/ramstage.c
index 40d80ff8b8..ec8839fe95 100644
--- a/src/soc/nvidia/tegra132/ramstage.c
+++ b/src/soc/nvidia/tegra132/ramstage.c
@@ -19,8 +19,8 @@
 
 #include <arch/stages.h>
 #include <soc/addressmap.h>
-#include "mmu_operations.h"
 #include <soc/clock.h>
+#include <soc/mmu_operations.h>
 
 void arm64_soc_init(void)
 {
diff --git a/src/soc/nvidia/tegra132/romstage.c b/src/soc/nvidia/tegra132/romstage.c
index 94fd845e65..28785dbabc 100644
--- a/src/soc/nvidia/tegra132/romstage.c
+++ b/src/soc/nvidia/tegra132/romstage.c
@@ -17,22 +17,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/exception.h>
 #include <arch/stages.h>
 #include <cbfs.h>
 #include <cbmem.h>
 #include <console/cbmem_console.h>
 #include <console/console.h>
-#include <timer.h>
-#include <arch/exception.h>
 #include <program_loading.h>
-
 #include <soc/addressmap.h>
-#include <soc/sdram_configs.h>
-#include "sdram.h"
-#include "ccplex.h"
-
+#include <soc/ccplex.h>
 #include <soc/clock.h>
+#include <soc/sdram.h>
+#include <soc/sdram_configs.h>
 #include <soc/romstage.h>
+#include <timer.h>
 
 void __attribute__((weak)) romstage_mainboard_init(void)
 {
diff --git a/src/soc/nvidia/tegra132/sdram.c b/src/soc/nvidia/tegra132/sdram.c
index c1d178ed2e..14d2b50fe1 100644
--- a/src/soc/nvidia/tegra132/sdram.c
+++ b/src/soc/nvidia/tegra132/sdram.c
@@ -22,13 +22,12 @@
 #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 "emc.h"
-#include "mc.h"
-#include "pmc.h"
-#include "sdram.h"
-
 static void sdram_patch(uintptr_t addr, uint32_t value)
 {
 	if (addr)
diff --git a/src/soc/nvidia/tegra132/sdram_lp0.c b/src/soc/nvidia/tegra132/sdram_lp0.c
index 2a88351656..c63b823006 100644
--- a/src/soc/nvidia/tegra132/sdram_lp0.c
+++ b/src/soc/nvidia/tegra132/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/tegra132/secmon.c b/src/soc/nvidia/tegra132/secmon.c
index 0a5ec7f113..42f471e82a 100644
--- a/src/soc/nvidia/tegra132/secmon.c
+++ b/src/soc/nvidia/tegra132/secmon.c
@@ -19,8 +19,8 @@
 
 #include <arch/secmon.h>
 #include <console/console.h>
-#include "mmu_operations.h"
 #include <soc/addressmap.h>
+#include <soc/mmu_operations.h>
 
 static void soc_get_secure_mem(uint64_t *base, size_t *size)
 {
diff --git a/src/soc/nvidia/tegra132/soc.c b/src/soc/nvidia/tegra132/soc.c
index 25a8e7edfa..b3841135f3 100644
--- a/src/soc/nvidia/tegra132/soc.c
+++ b/src/soc/nvidia/tegra132/soc.c
@@ -18,20 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
-#include <console/console.h>
-#include <device/device.h>
 #include <arch/io.h>
 #include <arch/cache.h>
 #include <arch/spintable.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
-#include <timer.h>
-#include <vendorcode/google/chromeos/chromeos.h>
+#include <console/console.h>
+#include <device/device.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/cpu.h>
 #include <soc/nvidia/tegra/apbmisc.h>
+#include <string.h>
+#include <timer.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
 #include "chip.h"
 
 static void soc_read_resources(device_t dev)
diff --git a/src/soc/nvidia/tegra132/spi.c b/src/soc/nvidia/tegra132/spi.c
index 219998c88d..0bff31a245 100644
--- a/src/soc/nvidia/tegra132/spi.c
+++ b/src/soc/nvidia/tegra132/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 <cbfs.h>
+#include <console/console.h>
+#include <delay.h>
 #include <inttypes.h>
 #include <spi-generic.h>
 #include <spi_flash.h>
+#include <soc/addressmap.h>
+#include <soc/dma.h>
+#include <soc/spi.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/tegra132/uart.c b/src/soc/nvidia/tegra132/uart.c
index 80328af9bf..17e1a53d22 100644
--- a/src/soc/nvidia/tegra132/uart.c
+++ b/src/soc/nvidia/tegra132/uart.c
@@ -17,12 +17,12 @@
  * 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 <stdint.h>
+#include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
+#include <stdint.h>
 
 /*
  * TODO: Use DRIVERS_UART_8250MEM driver instead.