diff --git a/docs/ch.txt b/docs/ch.txt
index fe8ab6510..b95e80ff2 100644
--- a/docs/ch.txt
+++ b/docs/ch.txt
@@ -646,10 +646,10 @@
  * An unlimited number of Event Sources can exists in a system and each
  * thread can listen on an unlimited number of them.<br>
  * Note that the events can be asynchronously generated but are synchronously
- * served, a thread can serve event by calling the \p chEvtWait()
+ * served, a thread can serve event by calling a \p chEvtWaitXXX()
  * API. If an event is generated while a listening thread is not ready to
  * serve it then the event becomes "pending" and will be served as soon the
- * thread invokes the \p chEvtWait().<br>
+ * thread invokes a \p chEvtWaitXXX().<br>
  * In order to use the Event APIs the \p CH_USE_EVENTS option must be
  * specified in \p chconf.h.
  * @file events.h Events macros and structures.
diff --git a/src/chevents.c b/src/chevents.c
index e55cb759c..af42a36b3 100644
--- a/src/chevents.c
+++ b/src/chevents.c
@@ -160,7 +160,8 @@ void chEvtDispatch(const evhandler_t handlers[], eventmask_t mask) {
   }
 }
 
-#if defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENTS_TIMEOUT)
+#if defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENTS_TIMEOUT) || \
+    defined(__DOXIGEN__)
 /**
  * A pending event among those specified in \p ewmask is selected, cleared and
  * its mask returned.
diff --git a/src/chlists.c b/src/chlists.c
index 3df824397..397529bbe 100644
--- a/src/chlists.c
+++ b/src/chlists.c
@@ -23,7 +23,7 @@
  */
 #include <ch.h>
 
-#ifndef CH_OPTIMIZE_SPEED
+#if !defined(CH_OPTIMIZE_SPEED) || defined(__DOXIGEN__)
 /**
  * Inserts a thread into a priority ordered queue.
  *