diff --git a/os/hal/include/hal_pal.h b/os/hal/include/hal_pal.h
index f19c8396f..a0ef91b37 100644
--- a/os/hal/include/hal_pal.h
+++ b/os/hal/include/hal_pal.h
@@ -143,7 +143,7 @@ typedef void (*palcallback_t)(void *arg);
  * @brief   Type of a PAL event record.
  */
 typedef struct {
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
   /**
    * @brief   Threads queued for an event.
    */
@@ -248,7 +248,7 @@ typedef struct {
  *
  * @notapi
  */
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
 #define _pal_isr_code(e) do {                                               \
   if (_pal_events[e].cb != NULL) {                                          \
     _pal_events[e].cb(_pal_events[e].arg);                                  \
@@ -276,7 +276,7 @@ typedef struct {
  *
  * @notapi
  */
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
 #define _pal_set_event(e, c, a) {                                           \
   osalThreadQueueObjectInit(&_pal_events[e].threads);                       \
   _pal_events[e].cb = c;                                                    \
@@ -298,7 +298,7 @@ typedef struct {
  *
  * @notapi
  */
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
 #define _pal_clear_event(e) {                                               \
   osalThreadDequeueAllI(&_pal_events[e].threads, MSG_RESET);                \
   _pal_events[e].cb = NULL;                                                 \
@@ -873,7 +873,7 @@ typedef struct {
     osalSysUnlock();                                                        \
   } while (false)
 
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
 /**
  * @brief   Waits for an edge on the specified port/pad.
  *
@@ -915,7 +915,7 @@ typedef struct {
     osalSysUnlock();                                                        \
   } while (false)
 
-#endif /* defined(PAL_USE_WAIT) */
+#endif /* PAL_USE_WAIT */
 
 /** @} */
 
@@ -929,10 +929,10 @@ extern "C" {
   ioportmask_t palReadBus(IOBus *bus);
   void palWriteBus(IOBus *bus, ioportmask_t bits);
   void palSetBusMode(IOBus *bus, iomode_t mode);
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
   msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad, systime_t timeout);
   msg_t palWaitLineTimeoutS(ioline_t line, systime_t timeout);
-#endif /* defined(PAL_USE_WAIT) */
+#endif /* PAL_USE_WAIT */
 #ifdef __cplusplus
 }
 #endif
diff --git a/os/hal/src/hal_pal.c b/os/hal/src/hal_pal.c
index 850c3506b..12b06abd0 100644
--- a/os/hal/src/hal_pal.c
+++ b/os/hal/src/hal_pal.c
@@ -117,7 +117,7 @@ void palSetBusMode(IOBus *bus, iomode_t mode) {
   palSetGroupMode(bus->portid, bus->mask, bus->offset, mode);
 }
 
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
 /**
  * @brief   Waits for an edge on the specified port/pad.
  *
@@ -155,7 +155,7 @@ msg_t palWaitLineTimeoutS(ioline_t line, systime_t timeout) {
   palevent_t *pep = pal_lld_get_line_event(line);
   return osalThreadEnqueueTimeoutS(&pep->threads, timeout);
 }
-#endif /* defined(PAL_USE_WAIT) */
+#endif /* PAL_USE_WAIT */
 
 #endif /* HAL_USE_PAL == TRUE */
 
diff --git a/testhal/STM32/multi/PAL/main.c b/testhal/STM32/multi/PAL/main.c
index 597e8274d..a5646c1b2 100644
--- a/testhal/STM32/multi/PAL/main.c
+++ b/testhal/STM32/multi/PAL/main.c
@@ -38,7 +38,7 @@ static THD_FUNCTION(Thread1, arg) {
 }
 #endif
 
-#if defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#if PAL_USE_WAIT || defined(__DOXYGEN__)
 
 /*
  * Application entry point.
@@ -83,7 +83,7 @@ int main(void) {
   }
 }
 
-#else /* !defined(PAL_USE_WAIT) */
+#else /* !PAL_USE_WAIT */
 
 static event_source_t button_pressed_event;
 static event_source_t button_released_event;
@@ -150,5 +150,5 @@ int main(void) {
     }
   }
 }
-#endif /* !defined(PAL_USE_WAIT) */
+#endif /* !PAL_USE_WAIT */