diff --git a/doc/cpu.txt b/doc/cpu.txt
index 6df37c2b7..b348917d4 100644
--- a/doc/cpu.txt
+++ b/doc/cpu.txt
@@ -1,63 +1,50 @@
 /**
-\defgroup cpu Contiki CPUs
-@{
-*/
+ * \defgroup cpu Contiki CPUs
+ *
+ */
 
 /**
  * \defgroup avr AVR
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
 /**
- * \addtogroup avr 
  * \defgroup wireless Wireless 
- * @{ */
-/** @} */
+ * \ingroup avr 
+ */
 
 /**
  * \defgroup arm ARM
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
 /**
  * \defgroup stm32w-cpu STM32W108
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
 /**
  * \defgroup ccxxx CCxxx
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
 /**
  * \defgroup pic32 PIC32 Contiki Port
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
 /**
  * \defgroup ADUCRF101 ADUCRF101
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
 /**
  * \defgroup native Native
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
 /**
  * \defgroup x86 x86
- * \addtogroup cpu
- * @{ */
-/** @} */
+ * \ingroup cpu
+ */
 
-
-/** 6502  arm  avr  cc2430  cc2538  cc253x  mc1322x  msp430  native  pic32  stm32w108  x86  z80 */
-
-/** @} */