8 files changed, 12 insertions, 14 deletions
diff --git a/os/rt/ports/ARMCMx/chcore_timer.h b/os/rt/ports/ARMCMx/chcore_timer.h
index e0cacabdd..548da4afe 100644
--- a/os/rt/ports/ARMCMx/chcore_timer.h
+++ b/os/rt/ports/ARMCMx/chcore_timer.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/chcore_timer.h
+ * @file    chcore_timer.h
  * @brief   System timer header file.
  *
  * @addtogroup ARMCMx_TIMER
diff --git a/os/rt/ports/ARMCMx/chcore_v6m.c b/os/rt/ports/ARMCMx/chcore_v6m.c
index 03688709a..9548c2a8e 100644
--- a/os/rt/ports/ARMCMx/chcore_v6m.c
+++ b/os/rt/ports/ARMCMx/chcore_v6m.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/chcore_v6m.c
+ * @file    chcore_v6m.c
  * @brief   ARMv6-M architecture port code.
  *
  * @addtogroup ARMCMx_V6M_CORE
diff --git a/os/rt/ports/ARMCMx/chcore_v6m.h b/os/rt/ports/ARMCMx/chcore_v6m.h
index 759041b8a..62dde2b30 100644
--- a/os/rt/ports/ARMCMx/chcore_v6m.h
+++ b/os/rt/ports/ARMCMx/chcore_v6m.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/chcore_v6m.h
+ * @file    chcore_v6m.h
  * @brief   ARMv6-M architecture port macros and structures.
  *
  * @addtogroup ARMCMx_V6M_CORE
@@ -270,10 +270,6 @@ struct context {
 }
 #endif
 
-#if CH_CFG_TIMEDELTA > 0
-#include "chcore_timer.h"
-#endif
-
 /*===========================================================================*/
 /* External declarations.                                                    */
 /*===========================================================================*/
@@ -290,6 +286,10 @@ extern "C" {
 }
 #endif
 
+#if CH_CFG_TIMEDELTA > 0
+#include "chcore_timer.h"
+#endif
+
 /*===========================================================================*/
 /* Module inline functions.                                                  */
 /*===========================================================================*/
diff --git a/os/rt/ports/ARMCMx/chcore_v7m.c b/os/rt/ports/ARMCMx/chcore_v7m.c
index ff9219ac6..29add3fb1 100644
--- a/os/rt/ports/ARMCMx/chcore_v7m.c
+++ b/os/rt/ports/ARMCMx/chcore_v7m.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/chcore_v7m.c
+ * @file    chcore_v7m.c
  * @brief   ARMv7-M architecture port code.
  *
  * @addtogroup ARMCMx_V7M_CORE
diff --git a/os/rt/ports/ARMCMx/chcore_v7m.h b/os/rt/ports/ARMCMx/chcore_v7m.h
index 57b5fc40f..fb5bd4476 100644
--- a/os/rt/ports/ARMCMx/chcore_v7m.h
+++ b/os/rt/ports/ARMCMx/chcore_v7m.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/chcore_v7m.h
+ * @file    chcore_v7m.h
  * @brief   ARMv7-M architecture port macros and structures.
  *
  * @addtogroup ARMCMx_V7M_CORE
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
index d8f5601db..25f05fdc1 100644
--- a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/GCC/chcoreasm_v6m.s
+ * @file    chcoreasm_v6m.s
  * @brief   ARMv6-M architecture port low level code.
  *
  * @addtogroup ARMCMx_CORE
@@ -40,7 +40,6 @@
 
 #if !defined(__DOXYGEN__)
 
-
                 .set    CONTEXT_OFFSET, 12
                 .set    SCB_ICSR, 0xE000ED04
                 .set    ICSR_PENDSVSET, 0x10000000
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
index 8e3a913e7..3bcc00c92 100644
--- a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/GCC/chcoreasm_v7m.s
+ * @file    chcoreasm_v7m.s
  * @brief   ARMv7-M architecture port low level code.
  *
  * @addtogroup ARMCMx_CORE
@@ -40,7 +40,6 @@
 
 #if !defined(__DOXYGEN__)
 
-
                 .set    CONTEXT_OFFSET, 12
                 .set    SCB_ICSR, 0xE000ED04
                 .set    ICSR_PENDSVSET, 0x10000000
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h b/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
index bc33d2e10..e16e4379e 100644
--- a/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    ARMCMx/GCC/chtypes.h
+ * @file    ARMCMx/compilers/GCC/chtypes.h
  * @brief   ARM Cortex-Mx port system types.
  *
  * @addtogroup ARMCMx_CORE