diff --git a/src/platforms/stm32/dfu_f1.c b/src/platforms/stm32/dfu_f1.c
index 83e95ec..b4b9208 100644
--- a/src/platforms/stm32/dfu_f1.c
+++ b/src/platforms/stm32/dfu_f1.c
@@ -19,7 +19,7 @@
 #include "general.h"
 #include "usbdfu.h"
 
-#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/flash.h>
 #include <libopencm3/cm3/scb.h>
 
 #define FLASH_OBP_RDP 0x1FFFF800
diff --git a/src/platforms/stm32/dfu_f4.c b/src/platforms/stm32/dfu_f4.c
index 2ececa0..0e3f935 100644
--- a/src/platforms/stm32/dfu_f4.c
+++ b/src/platforms/stm32/dfu_f4.c
@@ -19,11 +19,8 @@
 #include "general.h"
 #include "usbdfu.h"
 
-#if defined(STM32F2)
-#	include <libopencm3/stm32/f2/flash.h>
-#elif defined(STM32F4)
-#	include <libopencm3/stm32/f4/flash.h>
-#endif
+#include <libopencm3/stm32/flash.h>
+
 #include <libopencm3/cm3/scb.h>
 
 static uint32_t sector_addr[] = {
diff --git a/src/platforms/stm32/dfucore.c b/src/platforms/stm32/dfucore.c
index adeff9a..5931d1d 100644
--- a/src/platforms/stm32/dfucore.c
+++ b/src/platforms/stm32/dfucore.c
@@ -21,13 +21,13 @@
 
 #include <string.h>
 #if defined(STM32F1)
-#	include <libopencm3/stm32/f1/flash.h>
 #	define DFU_IFACE_STRING  "@Internal Flash   /0x08000000/8*001Ka,000*001Kg"
 #   define DFU_IFACE_STRING_OFFSET 38
 #elif defined(STM32F4)
-#	include <libopencm3/stm32/f4/flash.h>
 #	define DFU_IFACE_STRING  "/0x08000000/1*016Ka,3*016Kg,1*064Kg,7*128Kg"
 #endif
+#include <libopencm3/stm32/flash.h>
+
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>
 
diff --git a/src/platforms/stm32/traceswo.c b/src/platforms/stm32/traceswo.c
index 392de22..7af7ef3 100644
--- a/src/platforms/stm32/traceswo.c
+++ b/src/platforms/stm32/traceswo.c
@@ -37,7 +37,7 @@
 
 #include <libopencm3/cm3/nvic.h>
 #include <libopencm3/stm32/timer.h>
-#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/rcc.h>
 
 void traceswo_init(void)
 {
diff --git a/src/platforms/stm32/traceswoasync.c b/src/platforms/stm32/traceswoasync.c
index 98cf45d..94b07c3 100644
--- a/src/platforms/stm32/traceswoasync.c
+++ b/src/platforms/stm32/traceswoasync.c
@@ -35,7 +35,7 @@
 #include <libopencmsis/core_cm3.h>
 #include <libopencm3/cm3/nvic.h>
 #include <libopencm3/stm32/timer.h>
-#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/rcc.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/dma.h>