diff --git a/demos/ARMCM3-STM32F103-GCC/board.h b/demos/ARMCM3-STM32F103-GCC/board.h
index d2aaa19f7..236b4787b 100644
--- a/demos/ARMCM3-STM32F103-GCC/board.h
+++ b/demos/ARMCM3-STM32F103-GCC/board.h
@@ -24,13 +24,13 @@
  * Tricks required to make the TRUE/FALSE declaration inside the library
  * compatible.
  */
+#ifndef __STM32F10x_MAP_H
 #undef FALSE
 #undef TRUE
-#ifndef __STM32F10x_MAP_H
 #include "stm32f10x_map.h"
-#endif
 #define FALSE 0
 #define TRUE (!FALSE)
+#endif
 
 /*
  * This module requires the port driver.
diff --git a/docs/src/main.dox b/docs/src/main.dox
index fee2af8e5..bfe6f036c 100644
--- a/docs/src/main.dox
+++ b/docs/src/main.dox
@@ -403,7 +403,7 @@
  *
  * <h2>Usage</h2>
  * The use of I/O ports requires the inclusion of the header file @p ioports.h,
- * this file is not automatically included @o ch.h like the other header
+ * this file is not automatically included @p ch.h like the other header
  * files.
  *
  * @ingroup IO
diff --git a/ports/ARMCM3-STM32F103/ioports_lld.h b/ports/ARMCM3-STM32F103/ioports_lld.h
index 05d71831d..2194c3869 100644
--- a/ports/ARMCM3-STM32F103/ioports_lld.h
+++ b/ports/ARMCM3-STM32F103/ioports_lld.h
@@ -27,8 +27,16 @@
 #ifndef _IOPORTS_LLD_H_
 #define _IOPORTS_LLD_H_
 
+/*
+ * Tricks required to make the TRUE/FALSE declaration inside the library
+ * compatible.
+ */
 #ifndef __STM32F10x_MAP_H
+#undef FALSE
+#undef TRUE
 #include "stm32f10x_map.h"
+#define FALSE 0
+#define TRUE (!FALSE)
 #endif
 
 /*===========================================================================*/
diff --git a/src/templates/ioports_lld.h b/src/templates/ioports_lld.h
index 8420ca1c7..708efc8b7 100644
--- a/src/templates/ioports_lld.h
+++ b/src/templates/ioports_lld.h
@@ -19,7 +19,7 @@
 
 /**
  * @file src/templates/ioports_lld.h
- * @brief I/O ports low level driver
+ * @brief I/O ports low level driver template
  * @addtogroup IOPortsLLD
  * @{
  */