diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
index 9c1a582b..a308c0dc 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
@@ -28,13 +28,11 @@
 
 #include "ch.h"
 #include "hal.h"
+#include "gfx.h"
 
 #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
 
-#include "gdisp.h" /* for coord_t */
-#include "gevent.h"
-#include "ginput/ginput_mouse.h" /* for GINPUT_TOUCH_PRESSED */
-#include "lld/ginput/mouse.h"
+#include "ginput/lld/mouse.h"
 
 #if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD
 	#include "ginput_lld_mouse_board.h"
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse.c b/drivers/ginput/touch/MCU/ginput_lld_mouse.c
index d0a3c42e..61b512cd 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse.c
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse.c
@@ -28,13 +28,11 @@
 
 #include "ch.h"
 #include "hal.h"
+#include "gfx.h"
 
 #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
 
-#include "gdisp.h" /* for coord_t */
-#include "gevent.h"
-#include "ginput/ginput_mouse.h" /* for GINPUT_TOUCH_PRESSED */
-#include "lld/ginput/mouse.h"
+#include "ginput/lld/mouse.h"
 
 #if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD
 	#include "ginput_lld_mouse_board.h"
diff --git a/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c b/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c
index 1e60611d..9fb35c9b 100644
--- a/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c
+++ b/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c
@@ -28,13 +28,11 @@
 
 #include "ch.h"
 #include "hal.h"
+#include "gfx.h"
 
 #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
 
-#include "gdisp.h" /* for coord_t */
-#include "gevent.h"
-#include "ginput/ginput_mouse.h" /* for GINPUT_TOUCH_PRESSED */
-#include "lld/ginput/mouse.h"
+#include "ginput/lld/mouse.h"
 
 #if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD
 	#include "ginput_lld_mouse_board.h"