15 files changed, 16 insertions, 16 deletions
diff --git a/src/ginput/ginput_ginput.c b/src/ginput/ginput.c
index becefc19..becefc19 100644
--- a/src/ginput/ginput_ginput.c
+++ b/src/ginput/ginput.c
diff --git a/src/ginput/sys_defs.h b/src/ginput/ginput.h
index cab1e15d..469a10d1 100644
--- a/src/ginput/sys_defs.h
+++ b/src/ginput/ginput.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/ginput/sys_defs.h
+ * @file    src/ginput/ginput.h
  *
  * @addtogroup GINPUT
  *
diff --git a/src/ginput/sys_make.mk b/src/ginput/ginput.mk
index 6adb2e4c..c814afa2 100644
--- a/src/ginput/sys_make.mk
+++ b/src/ginput/ginput.mk
@@ -1,6 +1,6 @@
-GFXSRC +=   $(GFXLIB)/src/ginput/ginput_ginput.c \
+GFXSRC +=   $(GFXLIB)/src/ginput/ginput.c \
 			$(GFXLIB)/src/ginput/ginput_mouse.c \
 			$(GFXLIB)/src/ginput/ginput_keyboard.c \
-			$(GFXLIB)/src/ginput/keyboard_microcode.c \
+			$(GFXLIB)/src/ginput/ginput_keyboard_microcode.c \
 			$(GFXLIB)/src/ginput/ginput_toggle.c \
 			$(GFXLIB)/src/ginput/ginput_dial.c
diff --git a/src/ginput/ginput_dial.c b/src/ginput/ginput_dial.c
index 6af89b31..6c4f872b 100644
--- a/src/ginput/ginput_dial.c
+++ b/src/ginput/ginput_dial.c
@@ -17,7 +17,7 @@
 
 #if GFX_USE_GINPUT && GINPUT_NEED_DIAL
 
-#include "driver_dial.h"
+#include "ginput_driver_dial.h"
 
 static GTIMER_DECL(DialTimer);
 static struct DialStatus_t {
diff --git a/src/ginput/driver_dial.h b/src/ginput/ginput_driver_dial.h
index bf01da20..146ffc8d 100644
--- a/src/ginput/driver_dial.h
+++ b/src/ginput/ginput_driver_dial.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/ginput/driver_dial.h
+ * @file    src/ginput/ginput_driver_dial.h
  * @brief   GINPUT header file for dial drivers.
  *
  * @defgroup Dial Dial
diff --git a/src/ginput/driver_keyboard.h b/src/ginput/ginput_driver_keyboard.h
index 329df97a..62a00339 100644
--- a/src/ginput/driver_keyboard.h
+++ b/src/ginput/ginput_driver_keyboard.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/ginput/driver_keyboard.h
+ * @file    src/ginput/ginput_driver_keyboard.h
  * @brief   GINPUT LLD header file for keyboard drivers.
  *
  * @defgroup Keyboard Keyboard
@@ -20,7 +20,7 @@
 #if GINPUT_NEED_KEYBOARD //|| defined(__DOXYGEN__)
 
 // Include the GDRIVER infrastructure
-#include "src/gdriver/sys_defs.h"
+#include "src/gdriver/gdriver.h"
 
 typedef struct GKeyboard {
 	GDriver			d;					// The driver overheads and vmt
diff --git a/src/ginput/driver_mouse.h b/src/ginput/ginput_driver_mouse.h
index 5f948458..93d01124 100644
--- a/src/ginput/driver_mouse.h
+++ b/src/ginput/ginput_driver_mouse.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/ginput/driver_mouse.h
+ * @file    src/ginput/ginput_driver_mouse.h
  * @brief   GINPUT LLD header file for mouse/touch drivers.
  *
  * @defgroup Mouse Mouse
@@ -20,7 +20,7 @@
 #if GINPUT_NEED_MOUSE //|| defined(__DOXYGEN__)
 
 // Include the GDRIVER infrastructure
-#include "src/gdriver/sys_defs.h"
+#include "src/gdriver/gdriver.h"
 
 typedef struct GMouseReading {
 	coord_t		x, y, z;
diff --git a/src/ginput/driver_toggle.h b/src/ginput/ginput_driver_toggle.h
index 6d672c91..0dced07b 100644
--- a/src/ginput/driver_toggle.h
+++ b/src/ginput/ginput_driver_toggle.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/ginput/driver_toggle.h
+ * @file    src/ginput/ginput_driver_toggle.h
  * @brief   GINPUT header file for toggle drivers.
  *
  * @defgroup Toggle Toggle
diff --git a/src/ginput/ginput_keyboard.c b/src/ginput/ginput_keyboard.c
index 2d284eaa..eac2e9e0 100644
--- a/src/ginput/ginput_keyboard.c
+++ b/src/ginput/ginput_keyboard.c
@@ -21,8 +21,8 @@
 #endif
 
 // Get the keyboard driver interface
-#include "driver_keyboard.h"
-#include "keyboard_microcode.h"
+#include "ginput_driver_keyboard.h"
+#include "ginput_keyboard_microcode.h"
 
 // The keyboard poll timer
 static GTIMER_DECL(KeyboardTimer);
diff --git a/src/ginput/keyboard_microcode.c b/src/ginput/ginput_keyboard_microcode.c
index e3c04d5f..e3c04d5f 100644
--- a/src/ginput/keyboard_microcode.c
+++ b/src/ginput/ginput_keyboard_microcode.c
diff --git a/src/ginput/keyboard_microcode.h b/src/ginput/ginput_keyboard_microcode.h
index c18e94e5..c18e94e5 100644
--- a/src/ginput/keyboard_microcode.h
+++ b/src/ginput/ginput_keyboard_microcode.h
diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c
index 9ecf7dc7..f88c2ded 100644
--- a/src/ginput/ginput_mouse.c
+++ b/src/ginput/ginput_mouse.c
@@ -46,7 +46,7 @@
 #define CALIBRATION_ERROR_HEIGHT		40
 
 // Get the mouse driver interface
-#include "driver_mouse.h"
+#include "ginput_driver_mouse.h"
 
 // The mouse poll timer
 static GTIMER_DECL(MouseTimer);
diff --git a/src/ginput/sys_options.h b/src/ginput/ginput_options.h
index 9c1b0d30..3d3478d2 100644
--- a/src/ginput/sys_options.h
+++ b/src/ginput/ginput_options.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/ginput/sys_options.h
+ * @file    src/ginput/ginput_options.h
  * @brief   GINPUT sub-system options header file.
  *
  * @addtogroup GINPUT
diff --git a/src/ginput/sys_rules.h b/src/ginput/ginput_rules.h
index d9a367ce..6d997f90 100644
--- a/src/ginput/sys_rules.h
+++ b/src/ginput/ginput_rules.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/ginput/sys_rules.h
+ * @file    src/ginput/ginput_rules.h
  * @brief   GINPUT safety rules header file.
  *
  * @addtogroup GINPUT
diff --git a/src/ginput/ginput_toggle.c b/src/ginput/ginput_toggle.c
index 4c6dc9ae..9ef945fa 100644
--- a/src/ginput/ginput_toggle.c
+++ b/src/ginput/ginput_toggle.c
@@ -17,7 +17,7 @@
 
 #if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) || defined(__DOXYGEN__)
 
-#include "driver_toggle.h"
+#include "ginput_driver_toggle.h"
 
 #define GINPUT_TOGGLE_ISON		0x01
 #define GINPUT_TOGGLE_INVERT	0x02