diff --git a/sw/airborne/arch/stm32/mcu_arch.c b/sw/airborne/arch/stm32/mcu_arch.c
index d5d8be1b28..8066250927 100644
--- a/sw/airborne/arch/stm32/mcu_arch.c
+++ b/sw/airborne/arch/stm32/mcu_arch.c
@@ -33,11 +33,7 @@
 #include <inttypes.h>
 #include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/rcc.h>
-#if defined(STM32F1)
-#include <libopencm3/stm32/f1/flash.h>
-#elif defined(STM32F4)
-#include <libopencm3/stm32/f4/flash.h>
-#endif
+#include <libopencm3/stm32/flash.h>
 #include <libopencm3/cm3/scb.h>
 
 #include "std.h"
diff --git a/sw/airborne/arch/stm32/subsystems/settings_arch.c b/sw/airborne/arch/stm32/subsystems/settings_arch.c
index 411e97552d..3b814a5df3 100644
--- a/sw/airborne/arch/stm32/subsystems/settings_arch.c
+++ b/sw/airborne/arch/stm32/subsystems/settings_arch.c
@@ -35,12 +35,7 @@
 
 #include "subsystems/settings.h"
 
-#if defined(STM32F1)
-#include <libopencm3/stm32/f1/flash.h>
-#elif defined(STM32F4)
-#include <libopencm3/stm32/f4/flash.h>
-#endif
-
+#include <libopencm3/stm32/flash.h>
 #include <libopencm3/stm32/crc.h>
 #include <libopencm3/stm32/dbgmcu.h>