diff --git a/include/libopencm3/stm32/f0/timer.h b/include/libopencm3/stm32/f0/timer.h
index eac50c2e..5f59816c 100644
--- a/include/libopencm3/stm32/f0/timer.h
+++ b/include/libopencm3/stm32/f0/timer.h
@@ -32,6 +32,6 @@
 #ifndef LIBOPENCM3_TIMER_H
 #define LIBOPENCM3_TIMER_H
 
-#include <libopencm3/stm32/common/timer_common_all.h>
+#include <libopencm3/stm32/common/timer_common_f24.h>
 
 #endif
diff --git a/lib/stm32/common/timer_common_f234.c b/lib/stm32/common/timer_common_f0234.c
similarity index 100%
rename from lib/stm32/common/timer_common_f234.c
rename to lib/stm32/common/timer_common_f0234.c
diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile
index 4b2f8957..466554d1 100644
--- a/lib/stm32/f0/Makefile
+++ b/lib/stm32/f0/Makefile
@@ -42,7 +42,7 @@ OBJS            += gpio_common_all.o gpio_common_f0234.o crc_common_all.o \
                    pwr_common_all.o iwdg_common_all.o rtc_common_l1f024.o \
                    dma_common_l1f013.o exti_common_all.o spi_common_all.o \
 		   spi_common_f03.o flash_common_f01.o dac_common_all.o \
-		   timer_common_all.o rcc_common_all.o
+		   timer_common_all.o timer_common_f0234.o rcc_common_all.o
 OBJS		+= adc_common_v2.o
 OBJS		+= crs_common_all.o
 OBJS		+= usart_common_v2.o
diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile
index ed64fc3a..cb989f2f 100644
--- a/lib/stm32/f2/Makefile
+++ b/lib/stm32/f2/Makefile
@@ -40,7 +40,7 @@ OBJS		= gpio.o rcc.o desig.o
 OBJS            += crc_common_all.o dac_common_all.o dma_common_f24.o \
                    gpio_common_all.o gpio_common_f0234.o i2c_common_all.o \
                    iwdg_common_all.o rtc_common_l1f024.o spi_common_all.o \
-                   spi_common_l1f124.o timer_common_all.o timer_common_f234.o \
+                   spi_common_l1f124.o timer_common_all.o timer_common_f0234.o \
 		   timer_common_f24.o usart_common_all.o usart_common_f124.o \
 		   flash_common_f234.o flash_common_f24.o hash_common_f24.o \
 		   crypto_common_f24.o exti_common_all.o rcc_common_all.o
diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile
index 3a70ccd1..419962fb 100644
--- a/lib/stm32/f3/Makefile
+++ b/lib/stm32/f3/Makefile
@@ -41,7 +41,7 @@ OBJS		= rcc.o adc.o i2c.o usart.o dma.o flash.o desig.o
 OBJS            += gpio_common_all.o gpio_common_f0234.o \
 		   dac_common_all.o crc_common_all.o \
 		   iwdg_common_all.o spi_common_all.o dma_common_l1f013.o\
-		   timer_common_all.o timer_common_f234.o flash_common_f234.o \
+		   timer_common_all.o timer_common_f0234.o flash_common_f234.o \
 		   flash.o exti_common_all.o rcc_common_all.o spi_common_f03.o
 OBJS		+= adc_common_v2.o adc_common_v2_multi.o
 OBJS		+= usart_common_v2.o usart_common_all.o
diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile
index e8a2a326..5e4c4438 100644
--- a/lib/stm32/f4/Makefile
+++ b/lib/stm32/f4/Makefile
@@ -45,7 +45,7 @@ OBJS            += crc_common_all.o dac_common_all.o dma_common_f24.o \
                    gpio_common_all.o gpio_common_f0234.o i2c_common_all.o \
                    iwdg_common_all.o pwr_common_all.o rtc_common_l1f024.o \
                    spi_common_all.o spi_common_l1f124.o timer_common_all.o \
-                   timer_common_f234.o timer_common_f24.o usart_common_all.o \
+                   timer_common_f0234.o timer_common_f24.o usart_common_all.o \
 		   usart_common_f124.o flash_common_f234.o flash_common_f24.o \
 		   hash_common_f24.o crypto_common_f24.o exti_common_all.o \
 		   rcc_common_all.o