diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h
index 53fe9f43f02e38e766a435ca7444da882e30a5ad..f2699587235f5431c0529d14d6d4e2ea50164347 100644
--- a/boards/z1/include/board.h
+++ b/boards/z1/include/board.h
@@ -11,8 +11,8 @@
 #define _Z1_BOARD_H
 
 /**
- * @defgroup    board_z1
- * @ingroup     board_z1
+ * @defgroup    board_z1 Zolertia Z1
+ * @ingroup     boards
  *
 <h2>Components</h2>
 \li MSP430F2617
diff --git a/cpu/sam3x8e/include/component/component_adc.h b/cpu/sam3x8e/include/component/component_adc.h
index 695dea3178fd325d2c1d03d982b631b1a42715e3..7921ea6fe5a82d7b2d537c0a7ae5852e1cf9d3e5 100644
--- a/cpu/sam3x8e/include/component/component_adc.h
+++ b/cpu/sam3x8e/include/component/component_adc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Analog-to-digital Converter */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_ADC Analog-to-digital Converter */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_ADC Analog-to-digital Converter */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_can.h b/cpu/sam3x8e/include/component/component_can.h
index cafb8fbe7a4e700ddab88db88b551acab77da627..547e875a1e8e57f2020988d059e8ccf70c41d9df 100644
--- a/cpu/sam3x8e/include/component/component_can.h
+++ b/cpu/sam3x8e/include/component/component_can.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Controller Area Network */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_CAN Controller Area Network */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_CAN Controller Area Network */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_chipid.h b/cpu/sam3x8e/include/component/component_chipid.h
index f4bf2704c06a2ed9defb82488adf253b798c992d..30f9aa667b74b1c7b2e8ba5a839456f8508fec6b 100644
--- a/cpu/sam3x8e/include/component/component_chipid.h
+++ b/cpu/sam3x8e/include/component/component_chipid.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Chip Identifier */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_CHIPID Chip Identifier */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_CHIPID Chip Identifier */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_dacc.h b/cpu/sam3x8e/include/component/component_dacc.h
index ebc61a2e673474c3afee92d4d7e37883c30036e2..59e93a89918c104de6cd8f4e1fbae1fd24ca09b7 100644
--- a/cpu/sam3x8e/include/component/component_dacc.h
+++ b/cpu/sam3x8e/include/component/component_dacc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Digital-to-Analog Converter Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_DACC Digital-to-Analog Converter Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_DACC Digital-to-Analog Converter Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_dmac.h b/cpu/sam3x8e/include/component/component_dmac.h
index c57255ce10c9ab732d95377f457dbde3aebb19dd..0549f8f90aa59525d33268fb5dc3c9c4f8471a06 100644
--- a/cpu/sam3x8e/include/component/component_dmac.h
+++ b/cpu/sam3x8e/include/component/component_dmac.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR DMA Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_DMAC DMA Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_DMAC DMA Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_efc.h b/cpu/sam3x8e/include/component/component_efc.h
index 3c2b96ad68ba5664570b0e52970d76a5eb3da2e1..bcc61619805354dd543c6a322e5b6987ca3bc959 100644
--- a/cpu/sam3x8e/include/component/component_efc.h
+++ b/cpu/sam3x8e/include/component/component_efc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Embedded Flash Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_EFC Embedded Flash Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_EFC Embedded Flash Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_emac.h b/cpu/sam3x8e/include/component/component_emac.h
index b43a504e8eb125d95e3f66d48ea13ec8bd2a2d15..b3325aefd44eba563d646497500cc29f0a8934c2 100644
--- a/cpu/sam3x8e/include/component/component_emac.h
+++ b/cpu/sam3x8e/include/component/component_emac.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Ethernet MAC 10/100 */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_EMAC Ethernet MAC 10/100 */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_EMAC Ethernet MAC 10/100 */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_gpbr.h b/cpu/sam3x8e/include/component/component_gpbr.h
index df9f1ebf407351d44f487fa6eb900d5813f4bc36..8c75f6156999ee4347d9aa7ddab52681f2f6b6b1 100644
--- a/cpu/sam3x8e/include/component/component_gpbr.h
+++ b/cpu/sam3x8e/include/component/component_gpbr.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR General Purpose Backup Register */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_GPBR General Purpose Backup Register */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_GPBR General Purpose Backup Register */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_hsmci.h b/cpu/sam3x8e/include/component/component_hsmci.h
index 3351f78bbb0473f2b7517517fe8c08bb9bc60e1d..084ed9db4a02e5058a9ba07b8c48ea52d18af943 100644
--- a/cpu/sam3x8e/include/component/component_hsmci.h
+++ b/cpu/sam3x8e/include/component/component_hsmci.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR High Speed MultiMedia Card Interface */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_HSMCI High Speed MultiMedia Card Interface */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_HSMCI High Speed MultiMedia Card Interface */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_matrix.h b/cpu/sam3x8e/include/component/component_matrix.h
index 360c95499ae730a05bb2f77c02eefccb483cb6c7..bc18f55260d24f3b637d49900c0793ff55bcc773 100644
--- a/cpu/sam3x8e/include/component/component_matrix.h
+++ b/cpu/sam3x8e/include/component/component_matrix.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR AHB Bus Matrix */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_MATRIX AHB Bus Matrix */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_MATRIX AHB Bus Matrix */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_pdc.h b/cpu/sam3x8e/include/component/component_pdc.h
index afb35223978f4ff56518f4bd96fadd59a2e26d1b..b497b437a03dc7ee096592ea3e7db9fdb15813d0 100644
--- a/cpu/sam3x8e/include/component/component_pdc.h
+++ b/cpu/sam3x8e/include/component/component_pdc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Peripheral DMA Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_PDC Peripheral DMA Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_PDC Peripheral DMA Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_pio.h b/cpu/sam3x8e/include/component/component_pio.h
index 8522954607bc010687b7838e49f9a0b1b9129b1d..4a2453af26666cd8e473237c693af2311ed51fd8 100644
--- a/cpu/sam3x8e/include/component/component_pio.h
+++ b/cpu/sam3x8e/include/component/component_pio.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Parallel Input/Output Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_PIO Parallel Input/Output Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_PIO Parallel Input/Output Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_pmc.h b/cpu/sam3x8e/include/component/component_pmc.h
index a5cffc5c56eced3429b76e2e0473e0b3899c11c7..b75c031e973beb590bb814655ae8635c6522b5e3 100644
--- a/cpu/sam3x8e/include/component/component_pmc.h
+++ b/cpu/sam3x8e/include/component/component_pmc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Power Management Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_PMC Power Management Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_PMC Power Management Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_pwm.h b/cpu/sam3x8e/include/component/component_pwm.h
index f2c29d859740d94afa387e1c09c886cb5d181d71..6e5e37f1d2769568ace718e133bd138d3b2a40fe 100644
--- a/cpu/sam3x8e/include/component/component_pwm.h
+++ b/cpu/sam3x8e/include/component/component_pwm.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Pulse Width Modulation Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_PWM Pulse Width Modulation Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_PWM Pulse Width Modulation Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_rstc.h b/cpu/sam3x8e/include/component/component_rstc.h
index c22778aa7f3788bb0d60fddaeec3d4209f1dfa6d..16f5a39428deb793a057959edce39d5bcf98dd61 100644
--- a/cpu/sam3x8e/include/component/component_rstc.h
+++ b/cpu/sam3x8e/include/component/component_rstc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Reset Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_RSTC Reset Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_RSTC Reset Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_rtc.h b/cpu/sam3x8e/include/component/component_rtc.h
index 2fc6fc8c3840f25df21437ce6b21a59aff19813d..cd56f8344acba7cf7f65d8edb80ab6b71bcafe85 100644
--- a/cpu/sam3x8e/include/component/component_rtc.h
+++ b/cpu/sam3x8e/include/component/component_rtc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Real-time Clock */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_RTC Real-time Clock */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_RTC Real-time Clock */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_rtt.h b/cpu/sam3x8e/include/component/component_rtt.h
index 6f30e21b23ff255d02dbcfb8b243ac18bc454b3d..9f6a8a1c5609b2abfafccd298ed14250b5b95c26 100644
--- a/cpu/sam3x8e/include/component/component_rtt.h
+++ b/cpu/sam3x8e/include/component/component_rtt.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Real-time Timer */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_RTT Real-time Timer */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_RTT Real-time Timer */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_sdramc.h b/cpu/sam3x8e/include/component/component_sdramc.h
index 77965dd1c2170040fca539893f7571f74d7d24e5..41c8d83f9806c2edbefc9ec440452a950d61480d 100644
--- a/cpu/sam3x8e/include/component/component_sdramc.h
+++ b/cpu/sam3x8e/include/component/component_sdramc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR SDRAM Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_SDRAMC SDRAM Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_SDRAMC SDRAM Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_smc.h b/cpu/sam3x8e/include/component/component_smc.h
index 314c44fb3a6fbfd55509712391dd1dd76eeb4fc7..9d60410444fff4520c23289b097f71e6b99c5d64 100644
--- a/cpu/sam3x8e/include/component/component_smc.h
+++ b/cpu/sam3x8e/include/component/component_smc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Static Memory Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_SMC Static Memory Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_SMC Static Memory Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_spi.h b/cpu/sam3x8e/include/component/component_spi.h
index 4009384e8a4cfe39e06f322ffcb99a84233d5f3c..f52009bb1210506e28455fdb0f19a5579ee80db9 100644
--- a/cpu/sam3x8e/include/component/component_spi.h
+++ b/cpu/sam3x8e/include/component/component_spi.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Serial Peripheral Interface */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_SPI Serial Peripheral Interface */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_SPI Serial Peripheral Interface */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_ssc.h b/cpu/sam3x8e/include/component/component_ssc.h
index 91592af89dbe0b892b7c684aaa01e7f7ea00166a..87730406cd464014c3a6a18a1169473afbaeb91b 100644
--- a/cpu/sam3x8e/include/component/component_ssc.h
+++ b/cpu/sam3x8e/include/component/component_ssc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Synchronous Serial Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_SSC Synchronous Serial Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_SSC Synchronous Serial Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_supc.h b/cpu/sam3x8e/include/component/component_supc.h
index 0b861f9f9024da82fdbf54cba26592d86e15eb33..ce8b126ff9ac62fbc9c8da4efd0d39e99234456e 100644
--- a/cpu/sam3x8e/include/component/component_supc.h
+++ b/cpu/sam3x8e/include/component/component_supc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Supply Controller */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_SUPC Supply Controller */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_SUPC Supply Controller */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_tc.h b/cpu/sam3x8e/include/component/component_tc.h
index a42d9323bfe722f9e29a4c0d100f7bb4c7d25aa8..6feae004b7728a8547a011a26dccc05aaf37fc67 100644
--- a/cpu/sam3x8e/include/component/component_tc.h
+++ b/cpu/sam3x8e/include/component/component_tc.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Timer Counter */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_TC Timer Counter */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_TC Timer Counter */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_trng.h b/cpu/sam3x8e/include/component/component_trng.h
index 04a2d9e0b947a5381367c2176d1aa6e9d6898685..ec59ccb01dd92793c231bfb0985a72b8ed7df91c 100644
--- a/cpu/sam3x8e/include/component/component_trng.h
+++ b/cpu/sam3x8e/include/component/component_trng.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR True Random Number Generator */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_TRNG True Random Number Generator */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_TRNG True Random Number Generator */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_twi.h b/cpu/sam3x8e/include/component/component_twi.h
index d65a870c07b254e81fd46df47a460a4a228e8f97..03bb3d3af93abe8b9ea00d71c09e3c51f90e12bc 100644
--- a/cpu/sam3x8e/include/component/component_twi.h
+++ b/cpu/sam3x8e/include/component/component_twi.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Two-wire Interface */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_TWI Two-wire Interface */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_TWI Two-wire Interface */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_uart.h b/cpu/sam3x8e/include/component/component_uart.h
index bbf442114083e24de52a2101c81a27a5bd4ca671..af1d6d2cdfff4ecff57c1a90e2ca369633328702 100644
--- a/cpu/sam3x8e/include/component/component_uart.h
+++ b/cpu/sam3x8e/include/component/component_uart.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Universal Asynchronous Receiver Transmitter */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_UART Universal Asynchronous Receiver Transmitter */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_UART Universal Asynchronous Receiver Transmitter */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_uotghs.h b/cpu/sam3x8e/include/component/component_uotghs.h
index 33f553f8b78180e5bb8fd8a3d36b9c7c955aae19..f8ce0589723ebdcd09d007d2368db3d789ec09e2 100644
--- a/cpu/sam3x8e/include/component/component_uotghs.h
+++ b/cpu/sam3x8e/include/component/component_uotghs.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR USB On-The-Go Interface */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_UOTGHS USB On-The-Go Interface */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_UOTGHS USB On-The-Go Interface */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_usart.h b/cpu/sam3x8e/include/component/component_usart.h
index 5d2f2359d2742e23b9829e77b13f42edd2da6fb0..fe4e086721efffa3d9f83f8d04703e4d2d069c2b 100644
--- a/cpu/sam3x8e/include/component/component_usart.h
+++ b/cpu/sam3x8e/include/component/component_usart.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Universal Synchronous Asynchronous Receiver Transmitter */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_USART Universal Synchronous Asynchronous Receiver Transmitter */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_USART Universal Synchronous Asynchronous Receiver Transmitter */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))
diff --git a/cpu/sam3x8e/include/component/component_wdt.h b/cpu/sam3x8e/include/component/component_wdt.h
index ded5d8535e1c00c97828207b7e7e79d341ce50b8..2536edbe8b260e1dc973f3e1392804dcb1a99647 100644
--- a/cpu/sam3x8e/include/component/component_wdt.h
+++ b/cpu/sam3x8e/include/component/component_wdt.h
@@ -33,7 +33,8 @@
 /* ============================================================================= */
 /**  SOFTWARE API DEFINITION FOR Watchdog Timer */
 /* ============================================================================= */
-/** \addtogroup SAM3XA_WDT Watchdog Timer */
+/** \ingroup SAM3X8E_cmsis */
+/** \defgroup SAM3XA_WDT Watchdog Timer */
 /*@{*/
 
 #if !(defined(__ASSEMBLY__) || defined(__IAR_SYSTEMS_ASM__))