diff --git a/os/ports/GCC/ARM7/chcore.h b/os/ports/GCC/ARM7/chcore.h
index 22fbf2137..cd88cf0cc 100644
--- a/os/ports/GCC/ARM7/chcore.h
+++ b/os/ports/GCC/ARM7/chcore.h
@@ -61,7 +61,6 @@ typedef uint32_t stkalign_t;
  */
 typedef void *regarm_t;
 
-#if !defined(__DOXYGEN__)
 /**
  * @brief   Interrupt saved context.
  * @details This structure represents the stack frame saved during a
@@ -77,9 +76,7 @@ struct extctx {
   regarm_t      r12;
   regarm_t      lr_usr;
 };
-#endif
 
-#if !defined(__DOXYGEN__)
 /**
  * @brief   System saved context.
  * @details This structure represents the inner stack frame during a context
@@ -98,19 +95,15 @@ struct intctx {
   regarm_t      r11;
   regarm_t      lr;
 };
-#endif
 
-#if !defined(__DOXYGEN__)
 /**
  * @brief   Platform dependent part of the @p Thread structure.
- * @details In the ARM7 port this structure just holds a pointer to the
- *          @p intctx structure representing the stack pointer at the time
- *          of the context switch.
+ * @details In this port the structure just holds a pointer to the @p intctx
+ *          structure representing the stack pointer at context switch time.
  */
 struct context {
   struct intctx *r13;
 };
-#endif
 
 /**
  * @brief   Platform dependent part of the @p chThdInit() API.
diff --git a/os/ports/GCC/ARMCMx/chcore.h b/os/ports/GCC/ARMCMx/chcore.h
index 3581a6dea..db02d6bc1 100644
--- a/os/ports/GCC/ARMCMx/chcore.h
+++ b/os/ports/GCC/ARMCMx/chcore.h
@@ -282,7 +282,6 @@ struct intctx {
 };
 #endif
 
-#if !defined(__DOXYGEN__)
 /**
  * @brief   Platform dependent part of the @p Thread structure.
  * @details In this port the structure just holds a pointer to the @p intctx
@@ -291,7 +290,6 @@ struct intctx {
 struct context {
   struct intctx *r13;
 };
-#endif
 
 /**
  * @brief   Enforces a correct alignment for a stack area size value.