diff --git a/include/chipdrivers.h b/include/chipdrivers.h
index a2e75d1a5..936a2efa3 100644
--- a/include/chipdrivers.h
+++ b/include/chipdrivers.h
@@ -22,12 +22,6 @@
 
 #include "flash.h"	/* for chipaddr and flashctx */
 
-/* spi.c */
-int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
-int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
-int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len);
-bool spi_probe_opcode(const struct flashctx *flash, uint8_t opcode);
-
 /* spi25.c */
 int probe_spi_rdid(struct flashctx *flash);
 int probe_spi_rdid4(struct flashctx *flash);
diff --git a/include/spi.h b/include/spi.h
index a44aaaf42..d0f199c6e 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -249,4 +249,9 @@ int spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds
 
 void clear_spi_id_cache(void);
 
+int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
+int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
+int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len);
+bool spi_probe_opcode(const struct flashctx *flash, uint8_t opcode);
+
 #endif		/* !__SPI_H__ */