diff --git a/os/hal/platforms/AT91SAM7/serial_lld.h b/os/hal/platforms/AT91SAM7/serial_lld.h
index 3c36e0ab1..d05c7c6bd 100644
--- a/os/hal/platforms/AT91SAM7/serial_lld.h
+++ b/os/hal/platforms/AT91SAM7/serial_lld.h
@@ -102,7 +102,7 @@ typedef struct {
  * @brief @p SerialDriver specific data.
  */
 #define _serial_driver_data                                                 \
-  _base_asynchronous_channel_data;                                          \
+  _base_asynchronous_channel_data                                           \
   /* Driver state.*/                                                        \
   sdstate_t                 state;                                          \
   /* Current configuration data.*/                                          \
diff --git a/os/hal/platforms/AVR/serial_lld.h b/os/hal/platforms/AVR/serial_lld.h
index 4abadf018..3d5281e95 100644
--- a/os/hal/platforms/AVR/serial_lld.h
+++ b/os/hal/platforms/AVR/serial_lld.h
@@ -88,7 +88,7 @@ typedef struct {
  * @brief @p SerialDriver specific data.
  */
 #define _serial_driver_data                                                 \
-  _base_asynchronous_channel_data;                                          \
+  _base_asynchronous_channel_data                                           \
   /* Driver state.*/                                                        \
   sdstate_t                 state;                                          \
   /* Current configuration data.*/                                          \
diff --git a/os/hal/platforms/LPC214x/serial_lld.h b/os/hal/platforms/LPC214x/serial_lld.h
index 6501db299..3e0e4200f 100644
--- a/os/hal/platforms/LPC214x/serial_lld.h
+++ b/os/hal/platforms/LPC214x/serial_lld.h
@@ -123,7 +123,7 @@ typedef struct {
  * @brief @p SerialDriver specific data.
  */
 #define _serial_driver_data                                                 \
-  _base_asynchronous_channel_data;                                          \
+  _base_asynchronous_channel_data                                           \
   /* Driver state.*/                                                        \
   sdstate_t                 state;                                          \
   /* Current configuration data.*/                                          \
diff --git a/os/hal/platforms/Linux/serial_lld.h b/os/hal/platforms/Linux/serial_lld.h
index 61773459a..56618e30a 100644
--- a/os/hal/platforms/Linux/serial_lld.h
+++ b/os/hal/platforms/Linux/serial_lld.h
@@ -107,7 +107,7 @@ typedef struct {
  * @brief @p SerialDriver specific data.
  */
 #define _serial_driver_data                                                 \
-  _base_asynchronous_channel_data;                                          \
+  _base_asynchronous_channel_data                                           \
   /* Driver state.*/                                                        \
   sdstate_t                 state;                                          \
   /* Current configuration data.*/                                          \
diff --git a/os/hal/platforms/MSP430/serial_lld.h b/os/hal/platforms/MSP430/serial_lld.h
index 14542ce4a..3c7e437a2 100644
--- a/os/hal/platforms/MSP430/serial_lld.h
+++ b/os/hal/platforms/MSP430/serial_lld.h
@@ -92,7 +92,7 @@ typedef struct {
  * @brief @p SerialDriver specific data.
  */
 #define _serial_driver_data                                                 \
-  _base_asynchronous_channel_data;                                          \
+  _base_asynchronous_channel_data                                           \
   /* Driver state.*/                                                        \
   sdstate_t                 state;                                          \
   /* Current configuration data.*/                                          \
diff --git a/os/hal/platforms/STM32/serial_lld.h b/os/hal/platforms/STM32/serial_lld.h
index 9352d6200..a12dfe2d9 100644
--- a/os/hal/platforms/STM32/serial_lld.h
+++ b/os/hal/platforms/STM32/serial_lld.h
@@ -171,7 +171,7 @@ typedef struct {
  * @brief @p SerialDriver specific data.
  */
 #define _serial_driver_data                                                 \
-  _base_asynchronous_channel_data;                                          \
+  _base_asynchronous_channel_data                                           \
   /* Driver state.*/                                                        \
   sdstate_t                 state;                                          \
   /* Current configuration data.*/                                          \
diff --git a/os/hal/platforms/Win32/serial_lld.h b/os/hal/platforms/Win32/serial_lld.h
index c5d1f9c71..6f9f0150e 100644
--- a/os/hal/platforms/Win32/serial_lld.h
+++ b/os/hal/platforms/Win32/serial_lld.h
@@ -103,7 +103,7 @@ typedef struct {
  * @brief @p SerialDriver specific data.
  */
 #define _serial_driver_data                                                 \
-  _base_asynchronous_channel_data;                                          \
+  _base_asynchronous_channel_data                                           \
   /* Driver state.*/                                                        \
   sdstate_t                 state;                                          \
   /* Current configuration data.*/                                          \
diff --git a/os/kernel/include/channels.h b/os/kernel/include/channels.h
index 663ddc9d3..c822e99e8 100644
--- a/os/kernel/include/channels.h
+++ b/os/kernel/include/channels.h
@@ -58,7 +58,7 @@
  * @brief @p BaseChannel virtual methods table.
  */
 struct BaseChannelVMT {                                                     \
-  _base_channel_methods                                                    \
+  _base_channel_methods                                                     \
 };
 
 /**
@@ -209,7 +209,7 @@ typedef struct {
  * @brief @p BaseAsynchronousChannel specific data.
  */
 #define _base_asynchronous_channel_data                                     \
-  _base_channel_data                                                       \
+  _base_channel_data                                                        \
   /* Data Available EventSource.*/                                          \
   EventSource           ievent;                                             \
   /* Data Transmitted EventSource.*/                                        \