diff --git a/os/ports/GCC/ARM7/port.dox b/os/ports/GCC/ARM7/port.dox
index 431177caf..f72f3c435 100644
--- a/os/ports/GCC/ARM7/port.dox
+++ b/os/ports/GCC/ARM7/port.dox
@@ -164,9 +164,6 @@
  * @details ARM7 specific port code, structures and macros.
  *
  * @ingroup ARM7
- * @file ARM7/chtypes.h Port types.
- * @file ARM7/chcore.h Port related structures and macros.
- * @file ARM7/chcore.c Port related code.
  */
 
 /**
diff --git a/os/ports/GCC/AVR/port.dox b/os/ports/GCC/AVR/port.dox
index 7ea309fe4..6187f399e 100644
--- a/os/ports/GCC/AVR/port.dox
+++ b/os/ports/GCC/AVR/port.dox
@@ -69,6 +69,13 @@
  * @ingroup AVR
  */
 
+/**
+ * @defgroup AVR_CORE Core Port Implementation
+ * @details AVR specific port code, structures and macros.
+ *
+ * @ingroup AVR
+ */
+
  /**
  * @defgroup AVR_STARTUP Startup Support
  * @details ChibiOS/RT doed not provide startup files for the AVR, there
@@ -77,10 +84,3 @@
  *
  * @ingroup AVR
  */
-
-/**
- * @defgroup AVR_CORE AVR Core Implementation
- * @details AVR specific port code, structures and macros.
- *
- * @ingroup AVR
- */
diff --git a/os/ports/GCC/MSP430/port.dox b/os/ports/GCC/MSP430/port.dox
index ffd2220d2..fad67b3e5 100644
--- a/os/ports/GCC/MSP430/port.dox
+++ b/os/ports/GCC/MSP430/port.dox
@@ -77,6 +77,13 @@
  * @ingroup MSP430
  */
 
+/**
+ * @defgroup MSP430_CORE Core Port Implementation
+ * @details MSP430 specific port code, structures and macros.
+ *
+ * @ingroup MSP430
+ */
+
  /**
  * @defgroup MSP430_STARTUP Startup Support
  * @details ChibiOS/RT doed not provide startup files for the MSP430, there
@@ -85,10 +92,3 @@
  *
  * @ingroup MSP430
  */
-
-/**
- * @defgroup MSP430_CORE Core Port Implementation
- * @details MSP430 specific port code, structures and macros.
- *
- * @ingroup MSP430
- */
diff --git a/os/ports/RC/STM8/port.dox b/os/ports/RC/STM8/port.dox
index a2f7bd507..7a7d10788 100644
--- a/os/ports/RC/STM8/port.dox
+++ b/os/ports/RC/STM8/port.dox
@@ -77,6 +77,13 @@
  * @ingroup STM8_RAISONANCE
  */
 
+/**
+ * @defgroup STM8_RAISONANCE_CORE Core Port Implementation
+ * @details STM8 specific port code, structures and macros.
+ *
+ * @ingroup STM8_RAISONANCE
+ */
+
  /**
  * @defgroup STM8_RAISONANCE_STARTUP Startup Support
  * @details ChibiOS/RT doed not provide startup files for the STM8, there
@@ -85,10 +92,3 @@
  *
  * @ingroup STM8_RAISONANCE
  */
-
-/**
- * @defgroup STM8_RAISONANCE_CORE Core Port Implementation
- * @details STM8 specific port code, structures and macros.
- *
- * @ingroup STM8_RAISONANCE
- */
diff --git a/os/ports/cosmic/STM8/port.dox b/os/ports/cosmic/STM8/port.dox
index 7b717887f..ec57658ae 100644
--- a/os/ports/cosmic/STM8/port.dox
+++ b/os/ports/cosmic/STM8/port.dox
@@ -77,6 +77,13 @@
  * @ingroup STM8_COSMIC
  */
 
+/**
+ * @defgroup STM8_COSMIC_CORE Core Port Implementation
+ * @details STM8 specific port code, structures and macros.
+ *
+ * @ingroup STM8_COSMIC
+ */
+
  /**
  * @defgroup STM8_COSMIC_STARTUP Startup Support
  * @details ChibiOS/RT doed not provide startup files for the STM8, there
@@ -85,10 +92,3 @@
  *
  * @ingroup STM8_COSMIC
  */
-
-/**
- * @defgroup STM8_COSMIC_CORE Core Port Implementation
- * @details STM8 specific port code, structures and macros.
- *
- * @ingroup STM8_COSMIC
- */