diff --git a/ports/ARM7/chcore.h b/ports/ARM7/chcore.h
index ed994ac10..0655f56ab 100644
--- a/ports/ARM7/chcore.h
+++ b/ports/ARM7/chcore.h
@@ -124,9 +124,9 @@ typedef struct {
  */
 #define STACK_ALIGN(n) ((((n) - 1) | sizeof(stkalign_t)) + 1)
 
- /**
-  * Computes the thread working area global size.
-  */
+/**
+ * Computes the thread working area global size.
+ */
 #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \
                                    sizeof(struct intctx) +              \
                                    sizeof(struct extctx) +              \
diff --git a/ports/ARMCM3/chcore.h b/ports/ARMCM3/chcore.h
index a0f0c4f4e..6d3599936 100644
--- a/ports/ARMCM3/chcore.h
+++ b/ports/ARMCM3/chcore.h
@@ -132,9 +132,9 @@ typedef struct {
  */
 #define STACK_ALIGN(n) ((((n) - 1) | sizeof(stkalign_t)) + 1)
 
- /**
-  * Computes the thread working area global size.
-  */
+/**
+ * Computes the thread working area global size.
+ */
 #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \
                                    sizeof(struct intctx) +              \
                                    sizeof(struct extctx) +              \
diff --git a/ports/AVR/chcore.h b/ports/AVR/chcore.h
index b967cb9a0..34eba546c 100644
--- a/ports/AVR/chcore.h
+++ b/ports/AVR/chcore.h
@@ -148,9 +148,9 @@ typedef struct {
  */
 #define STACK_ALIGN(n) ((((n) - 1) | sizeof(stkalign_t)) + 1)
 
- /**
-  * Computes the thread working area global size.
-  */
+/**
+ * Computes the thread working area global size.
+ */
 #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \
                                    (sizeof(struct intctx) - 1) +        \
                                    (sizeof(struct extctx) - 1) +        \
diff --git a/ports/MSP430/chcore.h b/ports/MSP430/chcore.h
index b090cffba..807e7168f 100644
--- a/ports/MSP430/chcore.h
+++ b/ports/MSP430/chcore.h
@@ -121,9 +121,9 @@ typedef struct {
  */
 #define STACK_ALIGN(n) ((((n) - 1) | sizeof(stkalign_t)) + 1)
 
- /**
-  * Computes the thread working area global size.
-  */
+/**
+ * Computes the thread working area global size.
+ */
 #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \
                                    sizeof(struct intctx) +              \
                                    sizeof(struct extctx) +              \
diff --git a/src/templates/chcore.h b/src/templates/chcore.h
index 576fbf708..d8d3614c8 100644
--- a/src/templates/chcore.h
+++ b/src/templates/chcore.h
@@ -95,9 +95,9 @@ typedef struct {
  */
 #define STACK_ALIGN(n) ((((n) - 1) | sizeof(stkalign_t)) + 1)
 
- /**
-  * Computes the thread working area global size.
-  */
+/**
+ * Computes the thread working area global size.
+ */
 #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \
                                    sizeof(struct intctx) +              \
                                    sizeof(struct extctx) +              \