diff --git a/src/mainboard/google/urara/memlayout.ld b/src/mainboard/google/urara/memlayout.ld
index ab0b4dd8ff..ead7f47838 100644
--- a/src/mainboard/google/urara/memlayout.ld
+++ b/src/mainboard/google/urara/memlayout.ld
@@ -1 +1 @@
-#include <soc/imgtec/pistachio/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/soc/imgtec/pistachio/Makefile.inc b/src/soc/imgtec/pistachio/Makefile.inc
index d052c8f435..e955968ddc 100644
--- a/src/soc/imgtec/pistachio/Makefile.inc
+++ b/src/soc/imgtec/pistachio/Makefile.inc
@@ -42,6 +42,8 @@ romstage-y += romstage.c
 romstage-y += monotonic_timer.c
 romstage-y += timestamp.c
 
+CPPFLAGS_common += -Isrc/soc/imgtec/pistachio/include/
+
 # Generate the actual coreboot bootblock code
 $(objcbfs)/bootblock.raw: $(objcbfs)/bootblock.elf
 	@printf "    OBJCOPY    $(subst $(obj)/,,$(@))\n"
diff --git a/src/soc/imgtec/pistachio/cpu.h b/src/soc/imgtec/pistachio/include/soc/cpu.h
similarity index 100%
rename from src/soc/imgtec/pistachio/cpu.h
rename to src/soc/imgtec/pistachio/include/soc/cpu.h
diff --git a/src/soc/imgtec/pistachio/memlayout.ld b/src/soc/imgtec/pistachio/include/soc/memlayout.ld
similarity index 100%
rename from src/soc/imgtec/pistachio/memlayout.ld
rename to src/soc/imgtec/pistachio/include/soc/memlayout.ld
diff --git a/src/soc/imgtec/pistachio/spi.h b/src/soc/imgtec/pistachio/include/soc/spi.h
similarity index 100%
rename from src/soc/imgtec/pistachio/spi.h
rename to src/soc/imgtec/pistachio/include/soc/spi.h
diff --git a/src/soc/imgtec/pistachio/spi.c b/src/soc/imgtec/pistachio/spi.c
index 2b21475d0a..69682d0456 100644
--- a/src/soc/imgtec/pistachio/spi.c
+++ b/src/soc/imgtec/pistachio/spi.c
@@ -16,10 +16,10 @@
 #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 "cpu.h"
-#include "spi.h"
 
 #if !CONFIG_SPI_ATOMIC_SEQUENCING
 #error "Unsupported SPI driver API"