6 files changed, 12 insertions, 6 deletions
diff --git a/include/ginput/dial.h b/include/ginput/dial.h
index 1021b298..80855b54 100644
--- a/include/ginput/dial.h
+++ b/include/ginput/dial.h
@@ -21,7 +21,8 @@
  * @file    include/ginput/dial.h
  * @brief   GINPUT GFX User Input subsystem header file.
  *
- * @addtogroup GINPUT
+ * @defgroup Dial
+ * @ingroup GINPUT
  * @{
  */
 #ifndef _GINPUT_DIAL_H
diff --git a/include/ginput/keyboard.h b/include/ginput/keyboard.h
index 086d7f71..756b78e4 100644
--- a/include/ginput/keyboard.h
+++ b/include/ginput/keyboard.h
@@ -21,7 +21,8 @@
  * @file    include/ginput/keyboard.h
  * @brief   GINPUT GFX User Input subsystem header file.
  *
- * @addtogroup GINPUT
+ * @defgroup Keyboard
+ * @ingroup GINPUT
  * @{
  */
 #ifndef _GINPUT_KEYBOARD_H
diff --git a/include/ginput/lld/mouse.h b/include/ginput/lld/mouse.h
index 09a0fb6a..1b956c78 100644
--- a/include/ginput/lld/mouse.h
+++ b/include/ginput/lld/mouse.h
@@ -21,7 +21,8 @@
  * @file    include/ginput/lld/mouse.h
  * @brief   GINPUT LLD header file for mouse/touch drivers.
  *
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse
+ * @ingroup GINPUT
  * @{
  */
 #ifndef _LLD_GINPUT_MOUSE_H
diff --git a/include/ginput/lld/toggle.h b/include/ginput/lld/toggle.h
index 2b437ed9..77f6b346 100644
--- a/include/ginput/lld/toggle.h
+++ b/include/ginput/lld/toggle.h
@@ -21,7 +21,8 @@
  * @file    include/ginput/lld/toggle.h
  * @brief   GINPUT header file for toggle drivers.
  *
- * @addtogroup GINPUT_TOGGLE
+ * @defgroup Toggle
+ * @ingroup GINPUT
  * @{
  */
 #ifndef _LLD_GINPUT_TOGGLE_H
diff --git a/include/ginput/mouse.h b/include/ginput/mouse.h
index 09bfa050..ef268be4 100644
--- a/include/ginput/mouse.h
+++ b/include/ginput/mouse.h
@@ -21,7 +21,8 @@
  * @file    include/ginput/mouse.h
  * @brief   GINPUT GFX User Input subsystem header file for mouse and touch.
  *
- * @addtogroup GINPUT
+ * @defgroup Mouse
+ * @ingroup GINPUT
  * @{
  */
 #ifndef _GINPUT_MOUSE_H
diff --git a/include/ginput/toggle.h b/include/ginput/toggle.h
index eaf5bafe..889b9596 100644
--- a/include/ginput/toggle.h
+++ b/include/ginput/toggle.h
@@ -21,7 +21,8 @@
  * @file    include/ginput/toggle.h
  * @brief   GINPUT GFX User Input subsystem header file.
  *
- * @addtogroup GINPUT
+ * @defgroup Toggle
+ * @ingroup GINPUT
  * @{
  */
 #ifndef _GINPUT_TOGGLE_H