diff --git a/src/soc/intel/skylake/flash_controller.c b/src/soc/intel/skylake/flash_controller.c
index f27bcc5484..ab334416c7 100644
--- a/src/soc/intel/skylake/flash_controller.c
+++ b/src/soc/intel/skylake/flash_controller.c
@@ -23,9 +23,9 @@
 #include <bootstate.h>
 #include <delay.h>
 #include <device/pci_ids.h>
-#include <flash_controller.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
+#include <soc/flash_controller.h>
 #include <soc/pci_devs.h>
 #include <soc/spi.h>
 
diff --git a/src/soc/intel/skylake/include/flash_controller.h b/src/soc/intel/skylake/include/soc/flash_controller.h
similarity index 97%
rename from src/soc/intel/skylake/include/flash_controller.h
rename to src/soc/intel/skylake/include/soc/flash_controller.h
index c79d265248..25cbce9d1f 100644
--- a/src/soc/intel/skylake/include/flash_controller.h
+++ b/src/soc/intel/skylake/include/soc/flash_controller.h
@@ -17,8 +17,8 @@
  * Foundation, Inc.,
  */
 
-#ifndef _FLASH_CONTROLLER__H_
-#define _FLASH_CONTROLLER__H_
+#ifndef _SOC_FLASH_CONTROLLER__H_
+#define _SOC_FLASH_CONTROLLER__H_
 
 #include <rules.h>
 #include <arch/io.h>
@@ -173,4 +173,4 @@ enum {
 	HSFC_FCYCLE_SHIFT =	1,
 	HSFC_FDBC_SHIFT =	8,
 };
-#endif	/* _FLASH_CONTROLLER__H_ */
+#endif	/* _SOC_FLASH_CONTROLLER__H_ */
diff --git a/src/soc/intel/skylake/romstage/spi.c b/src/soc/intel/skylake/romstage/spi.c
index be6db41d97..2194d21f58 100644
--- a/src/soc/intel/skylake/romstage/spi.c
+++ b/src/soc/intel/skylake/romstage/spi.c
@@ -18,7 +18,7 @@
  * Foundation, Inc.
  */
 
-#include <flash_controller.h>
+#include <soc/flash_controller.h>
 #include <soc/romstage.h>
 
 int early_spi_read(u32 offset, u32 size, u8 *buffer)