diff --git a/include/libopencm3/stm32/common/spi_common_f24.h b/include/libopencm3/stm32/common/spi_common_f24.h
index 090c0891..f8946261 100644
--- a/include/libopencm3/stm32/common/spi_common_f24.h
+++ b/include/libopencm3/stm32/common/spi_common_f24.h
@@ -34,13 +34,15 @@ specific memorymap.h header before including this header file.*/
 
 /**@{*/
 
-#include <libopencm3/stm32/common/spi_common_f124.h>
+#include <libopencm3/stm32/common/spi_common_l1f124.h>
 
 /*
  * This file extends the common STM32 version with definitions only
  * applicable to the STM32F2/4 series of devices.
  */
 
+/* Note, these values are also on the F0, but other parts are _not_ */
+
 /* --- SPI_CR2 values ------------------------------------------------------ */
 
 /* FRF: Frame format */
diff --git a/include/libopencm3/stm32/common/spi_common_f124.h b/include/libopencm3/stm32/common/spi_common_l1f124.h
similarity index 92%
rename from include/libopencm3/stm32/common/spi_common_f124.h
rename to include/libopencm3/stm32/common/spi_common_l1f124.h
index 6af5486d..a45220eb 100644
--- a/include/libopencm3/stm32/common/spi_common_f124.h
+++ b/include/libopencm3/stm32/common/spi_common_l1f124.h
@@ -29,8 +29,8 @@ specific memorymap.h header before including this header file.*/
 /** @cond */
 #ifdef LIBOPENCM3_SPI_H
 /** @endcond */
-#ifndef LIBOPENCM3_SPI_COMMON_F0124_H
-#define LIBOPENCM3_SPI_COMMON_F0124_H
+#ifndef LIBOPENCM3_SPI_COMMON_L1F124_H
+#define LIBOPENCM3_SPI_COMMON_L1F124_H
 
 /**@{*/
 
@@ -38,7 +38,7 @@ specific memorymap.h header before including this header file.*/
 
 /*
  * This file extends the common STM32 version with definitions only
- * applicable to the STM32F0/1/2/4 series of devices.
+ * applicable to the STM32L1/F1/2/4 series of devices.
  */
 
 /* DFF: Data frame format */
diff --git a/include/libopencm3/stm32/f1/spi.h b/include/libopencm3/stm32/f1/spi.h
index ac5a78a3..1adb329b 100644
--- a/include/libopencm3/stm32/f1/spi.h
+++ b/include/libopencm3/stm32/f1/spi.h
@@ -32,7 +32,7 @@ LGPL License Terms @ref lgpl_license
 #define LIBOPENCM3_SPI_H
 
 #include <libopencm3/stm32/memorymap.h>
-#include <libopencm3/stm32/common/spi_common_f124.h>
+#include <libopencm3/stm32/common/spi_common_l1f124.h>
 
 #endif
 
diff --git a/include/libopencm3/stm32/l1/spi.h b/include/libopencm3/stm32/l1/spi.h
index 92f96d6b..2085ecec 100644
--- a/include/libopencm3/stm32/l1/spi.h
+++ b/include/libopencm3/stm32/l1/spi.h
@@ -32,7 +32,7 @@ LGPL License Terms @ref lgpl_license
 #define LIBOPENCM3_SPI_H
 
 #include <libopencm3/stm32/memorymap.h>
-#include <libopencm3/stm32/common/spi_common_all.h>
+#include <libopencm3/stm32/common/spi_common_l1f124.h>
 
 #endif