diff --git a/lib/stm32/common/iwdg_common_all.c b/lib/stm32/common/iwdg_common_all.c
index d9aca5a9..f2b1c1d8 100644
--- a/lib/stm32/common/iwdg_common_all.c
+++ b/lib/stm32/common/iwdg_common_all.c
@@ -1,4 +1,5 @@
-/** @addtogroup iwdg_file
+/** @addtogroup iwdg_file IWDG peripheral API
+@ingroup peripheral_apis
 
 @author @htmlonly © @endhtmlonly 2012 Ken Sarkies ksarkies@internode.on.net
 
diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile
index cd2b37e6..ab8d58b5 100644
--- a/lib/stm32/f0/Makefile
+++ b/lib/stm32/f0/Makefile
@@ -37,7 +37,7 @@ TGT_CFLAGS	+= $(STANDARD_FLAGS)
 ARFLAGS		= rcs
 
 OBJS		= can.o flash.o rcc.o dma.o rtc.o comparator.o \
-                  dac.o iwdg.o pwr.o gpio.o timer.o adc.o desig.o
+                  dac.o pwr.o gpio.o timer.o adc.o desig.o
 
 OBJS            += gpio_common_all.o gpio_common_f0234.o crc_common_all.o crc_v2.o \
                    pwr_common_v1.o iwdg_common_all.o rtc_common_l1f024.o \
diff --git a/lib/stm32/f0/iwdg.c b/lib/stm32/f0/iwdg.c
deleted file mode 100644
index b34a652f..00000000
--- a/lib/stm32/f0/iwdg.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @defgroup iwdg_file IWDG
- *
- * @ingroup STM32F0xx
- *
- * @brief <b>libopencm3 STM32F0xx Independent Watchdog Timer</b>
- *
- * @version 1.0.0
- *
- * @date 11 July 2013
- *
- * 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/iwdg.h>
diff --git a/lib/stm32/f1/iwdg.c b/lib/stm32/f1/iwdg.c
deleted file mode 100644
index 2d9bc3c9..00000000
--- a/lib/stm32/f1/iwdg.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @defgroup iwdg_file IWDG
-
-@ingroup STM32F1xx
-
-@brief <b>libopencm3 STM32F1xx Independent Watchdog Timer</b>
-
-@version 1.0.0
-
-@date 18 August 2012
-
-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/iwdg.h>
diff --git a/lib/stm32/f2/iwdg.c b/lib/stm32/f2/iwdg.c
deleted file mode 100644
index 2d9dc4ac..00000000
--- a/lib/stm32/f2/iwdg.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @defgroup iwdg_file IWDG
-
-@ingroup STM32F2xx
-
-@brief <b>libopencm3 STM32F2xx Independent Watchdog Timer</b>
-
-@version 1.0.0
-
-@date 18 August 2012
-
-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/iwdg.h>
diff --git a/lib/stm32/f3/iwdg.c b/lib/stm32/f3/iwdg.c
deleted file mode 100644
index cf0045c5..00000000
--- a/lib/stm32/f3/iwdg.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @defgroup iwdg_file IWDG
- *
- * @ingroup STM32F3xx
- *
- * @brief <b>libopencm3 STM32F3xx Independent Watchdog Timer</b>
- *
- * @version 1.0.0
- *
- * @date 18 August 2012
- *
- * 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/iwdg.h>
diff --git a/lib/stm32/f4/iwdg.c b/lib/stm32/f4/iwdg.c
deleted file mode 100644
index 3985657f..00000000
--- a/lib/stm32/f4/iwdg.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @defgroup iwdg_file IWDG
-
-@ingroup STM32F4xx
-
-@brief <b>libopencm3 STM32F4xx Independent Watchdog Timer</b>
-
-@version 1.0.0
-
-@date 18 August 2012
-
-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/iwdg.h>
diff --git a/lib/stm32/l1/iwdg.c b/lib/stm32/l1/iwdg.c
deleted file mode 100644
index 1f37fe88..00000000
--- a/lib/stm32/l1/iwdg.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @defgroup iwdg_file IWDG
-
-@ingroup STM32L1xx
-
-@brief <b>libopencm3 STM32L1xx Independent Watchdog Timer</b>
-
-@version 1.0.0
-
-@date 18 August 2012
-
-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/iwdg.h>