diff --git a/demos/modules/console/main.c b/demos/modules/console/main.c
index 1227e89a..4efe9d0a 100644
--- a/demos/modules/console/main.c
+++ b/demos/modules/console/main.c
@@ -18,12 +18,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/**
- *	The following stuff is optional in your gfxconf.h:
- *
- *				#define GDISP_NEED_SCROLL	TRUE	(optional but recommended if your GDISP driver supports it)
- */
-
 #include "ch.h"
 #include "hal.h"
 #include "chprintf.h"
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_board_example.h b/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
index 48221b3a..a79e557b 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
+ * @file    drivers/gdisp/ILI9320/gdisp_lld_board_example.h
  * @brief   GDISP Graphic Driver subsystem board interface for the ILI9320 display.
  *
  * @addtogroup GDISP
diff --git a/drivers/gdisp/S6D1121/gdisp_lld_board_example.h b/drivers/gdisp/S6D1121/gdisp_lld_board_example.h
index 00c4b869..2396b155 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_board_example.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_board_example.h
@@ -19,8 +19,8 @@
 */
 
 /**
- * @file    drivers/gdisp/SSD1289/gdisp_lld_board_example.h
- * @brief   GDISP Graphic Driver subsystem board interface for the SSD1289 display.
+ * @file    drivers/gdisp/S6D1121/gdisp_lld_board_example.h
+ * @brief   GDISP Graphic Driver subsystem board interface for the S6D1121 display.
  *
  * @addtogroup GDISP
  * @{
diff --git a/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h b/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
index 9abfa74c..34224425 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
@@ -20,7 +20,7 @@
 
 /**
  * @file    drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
- * @brief   GDISP Graphic Driver subsystem board interface for the SSD1289 display.
+ * @brief   GDISP Graphic Driver subsystem board interface for the S6D1121 display
  *
  * @addtogroup GDISP
  * @{
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
index 04d77be6..bc018b89 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
@@ -19,8 +19,8 @@
 */
 
 /**
- * @file    drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
- * @brief   GINPUT Touch low level driver source for the ADS7843 on the example board.
+ * @file    drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
+ * @brief   GINPUT ouch low level driver source for the ADS7843 on the FireBull STM32F103-FB board.
  *
  * @defgroup Mouse Mouse
  * @ingroup GINPUT
diff --git a/include/gdisp/lld/emulation.c b/include/gdisp/lld/emulation.c
index 04afd630..a514458c 100644
--- a/include/gdisp/lld/emulation.c
+++ b/include/gdisp/lld/emulation.c
@@ -18,20 +18,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*
-	Emulation routines included into gdisp_lld.c
-*/
-
-/*
-	Even though this is a software emulation of a low level driver
-	most validation doesn't need to happen here as eventually
-	we call a real low level driver routine and if validation is
-	required - it will do it.
-*/
+/**
+ * @file	include/gdisp/lld/emulation.c
+ * @brief	GDISP emulation routines for stuff the driver dosen't support
+ *
+ * @addtogroup GDISP
+ *
+ * @details	Even though this is a software emulation of a low level driver
+ *			most validation doesn't need to happen here as eventually
+ *			we call a real low level driver routine and if validation is
+ *			required - it will do it.
+ *
+ * @{
+ */
 #ifndef GDISP_EMULATION_C
 #define GDISP_EMULATION_C
 
-#if GFX_USE_GDISP || defined(__DOXYGEN__)
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__) */
 
 #ifndef GDISP_LLD_NO_STRUCT
 	static struct GDISPDriver {
@@ -765,4 +768,5 @@ void *GDISP_LLD(query)(unsigned what) {
 
 #endif  /* GFX_USE_GDISP */
 #endif	/* GDISP_EMULATION_C */
+/** @} */