diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h
index e57f56d88c..347ec3c202 100644
--- a/src/include/spi-generic.h
+++ b/src/include/spi-generic.h
@@ -20,10 +20,6 @@
 
 /* Controller-specific definitions: */
 
-/* SPI opcodes */
-#define SPI_OPCODE_WREN 0x06
-#define SPI_OPCODE_FAST_READ 0x0b
-
 /*-----------------------------------------------------------------------
  * Representation of a SPI slave, i.e. what we're communicating with.
  *
diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h
index 70eef8e325..8fec4849c7 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -19,6 +19,10 @@
 #include <stddef.h>
 #include <boot/coreboot_tables.h>
 
+/* SPI Flash opcodes */
+#define SPI_OPCODE_WREN 0x06
+#define SPI_OPCODE_FAST_READ 0x0b
+
 struct spi_flash {
 	struct spi_slave *spi;
 	const char *name;
diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index d651350cd5..1f2b285b93 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -21,6 +21,7 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/pci_ids.h>
+#include <spi_flash.h>
 #include <spi-generic.h>
 
 #include <soc/lpc.h>
diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c
index 97ca2e56ef..01f215008d 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -22,6 +22,7 @@
 #include <rules.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
+#include <spi_flash.h>
 #include <spi-generic.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c
index e07b42513d..c7ac09c7de 100644
--- a/src/soc/intel/broadwell/spi.c
+++ b/src/soc/intel/broadwell/spi.c
@@ -20,6 +20,7 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/pci_ids.h>
+#include <spi_flash.h>
 #include <spi-generic.h>
 #include <soc/pci_devs.h>
 #include <soc/rcba.h>
diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c
index b021175961..1ab73f3ae3 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -22,6 +22,7 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/pci_ids.h>
+#include <spi_flash.h>
 #include <spi-generic.h>
 
 #include <soc/lpc.h>
diff --git a/src/southbridge/intel/fsp_rangeley/spi.c b/src/southbridge/intel/fsp_rangeley/spi.c
index 007c61270d..8b0c3c1f72 100644
--- a/src/southbridge/intel/fsp_rangeley/spi.c
+++ b/src/southbridge/intel/fsp_rangeley/spi.c
@@ -22,6 +22,7 @@
 #include <console/console.h>
 #include <device/pci_ids.h>
 
+#include <spi_flash.h>
 #include <spi-generic.h>
 
 static int ich_status_poll(u16 bitmask, int wait_til_set);