diff --git a/lib/stm32/common/flash_common_all.c b/lib/stm32/common/flash_common_all.c
index 98821796..b369d903 100644
--- a/lib/stm32/common/flash_common_all.c
+++ b/lib/stm32/common/flash_common_all.c
@@ -1,5 +1,5 @@
-/** @addtogroup flash_file
- *
+/** @addtogroup flash_file FLASH peripheral API
+ * @ingroup peripheral_apis
  */
 
 /*
diff --git a/lib/stm32/f0/flash.c b/lib/stm32/f0/flash.c
index 433b7b53..9e7ebc33 100644
--- a/lib/stm32/f0/flash.c
+++ b/lib/stm32/f0/flash.c
@@ -1,6 +1,6 @@
-/** @defgroup flash_file FLASH
+/** @defgroup flash_file
  *
- * @ingroup STM32F0xx
+ * @ingroup peripheral_apis
  *
  * @brief <b>libopencm3 STM32F05x FLASH</b>
  *
diff --git a/lib/stm32/f1/flash.c b/lib/stm32/f1/flash.c
index 68606a9a..8c8c6e5f 100644
--- a/lib/stm32/f1/flash.c
+++ b/lib/stm32/f1/flash.c
@@ -1,6 +1,6 @@
-/** @defgroup flash_file FLASH
+/** @defgroup flash_file
  *
- * @ingroup STM32F1xx
+ * @ingroup peripheral_apis
  *
  * @brief <b>libopencm3 STM32F1xx FLASH Memory</b>
  *
diff --git a/lib/stm32/f2/flash.c b/lib/stm32/f2/flash.c
index c2a0b3ba..0744ba5b 100644
--- a/lib/stm32/f2/flash.c
+++ b/lib/stm32/f2/flash.c
@@ -1,6 +1,6 @@
-/** @defgroup flash_file FLASH
+/** @defgroup flash_file
  *
- * @ingroup STM32F2xx
+ * @ingroup peripheral_apis
  *
  * @brief <b>libopencm3 STM32F2xx FLASH</b>
  *
diff --git a/lib/stm32/f3/flash.c b/lib/stm32/f3/flash.c
index da8dfb68..e987d374 100644
--- a/lib/stm32/f3/flash.c
+++ b/lib/stm32/f3/flash.c
@@ -1,6 +1,6 @@
-/** @defgroup flash_file FLASH
+/** @defgroup flash_file
  *
- * @ingroup STM32F3xx
+ * @ingroup peripheral_apis
  *
  * @brief <b>libopencm3 STM32F3xx FLASH</b>
  *
diff --git a/lib/stm32/f4/flash.c b/lib/stm32/f4/flash.c
index 8891be6e..75407d0d 100644
--- a/lib/stm32/f4/flash.c
+++ b/lib/stm32/f4/flash.c
@@ -1,6 +1,6 @@
-/** @defgroup flash_file FLASH
+/** @defgroup flash_file
  *
- * @ingroup STM32F4xx
+ * @ingroup peripheral_apis
  *
  * @brief <b>libopencm3 STM32F4xx FLASH</b>
  *
diff --git a/lib/stm32/f7/flash.c b/lib/stm32/f7/flash.c
index 9ec3e219..341a32f2 100644
--- a/lib/stm32/f7/flash.c
+++ b/lib/stm32/f7/flash.c
@@ -1,5 +1,6 @@
-/** @addtogroup flash_file
+/** @defgroup flash_file
  *
+ * @ingroup peripheral_apis
  */
 
 /*
diff --git a/lib/stm32/g0/flash.c b/lib/stm32/g0/flash.c
index 74ecf5d0..bb19d598 100644
--- a/lib/stm32/g0/flash.c
+++ b/lib/stm32/g0/flash.c
@@ -1,4 +1,4 @@
-/** @defgroup flash_file FLASH peripheral API
+/** @defgroup flash_file
  *
  * @ingroup peripheral_apis
  *
diff --git a/lib/stm32/l0/Makefile b/lib/stm32/l0/Makefile
index 90b88b19..baa19d3e 100644
--- a/lib/stm32/l0/Makefile
+++ b/lib/stm32/l0/Makefile
@@ -46,7 +46,7 @@ OBJS		+= adc_common_v2.o
 OBJS		+= crs_common_all.o
 OBJS		+= dma_common_l1f013.o
 OBJS		+= exti_common_all.o
-OBJS		+= flash.o flash_common_all.o flash_common_l01.o
+OBJS		+= flash_common_all.o flash_common_l01.o
 OBJS		+= i2c_common_v2.o
 OBJS		+= rng_common_v1.o
 OBJS		+= usart_common_all.o usart_common_v2.o
diff --git a/lib/stm32/l0/flash.c b/lib/stm32/l0/flash.c
deleted file mode 100644
index b1ba6420..00000000
--- a/lib/stm32/l0/flash.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @defgroup gpio_file GPIO
- *
- * @ingroup STM32L0xx
- *
- * @brief <b>libopencm3 STM32L0xx General Purpose I/O</b>
- *
- * LGPL License Terms @ref lgpl_license
- */
-
-/*
- * This file is part of the libopencm3 project.
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <libopencm3/stm32/flash.h>
diff --git a/lib/stm32/l1/flash.c b/lib/stm32/l1/flash.c
index 5e176b05..416b4efc 100644
--- a/lib/stm32/l1/flash.c
+++ b/lib/stm32/l1/flash.c
@@ -1,6 +1,6 @@
-/** @defgroup flash_file FLASH
+/** @defgroup flash_file
  *
- * @ingroup STM32L1xx
+ * @ingroup peripheral_apis
  *
  * @brief <b>libopencm3 STM32L1xx FLASH</b>
  *
diff --git a/lib/stm32/l4/flash.c b/lib/stm32/l4/flash.c
index 58374b29..cb45081a 100644
--- a/lib/stm32/l4/flash.c
+++ b/lib/stm32/l4/flash.c
@@ -1,6 +1,6 @@
-/** @defgroup flash_file FLASH
+/** @defgroup flash_file
  *
- * @ingroup STM32L4xx
+ * @ingroup peripheral_apis
  *
  * @brief <b>libopencm3 STM32L4xx FLASH</b>
  *