diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 6a22c28b05..dc64ed2394 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -809,9 +809,9 @@ endif
 
 ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
     PS2_ENABLE := yes
+    MOUSE_ENABLE := yes
     SRC += ps2_mouse.c
     OPT_DEFS += -DPS2_MOUSE_ENABLE
-    OPT_DEFS += -DMOUSE_ENABLE
 endif
 
 VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
diff --git a/drivers/ps2/ps2_interrupt.c b/drivers/ps2/ps2_interrupt.c
index 2810a0f126..f7400564ef 100644
--- a/drivers/ps2/ps2_interrupt.c
+++ b/drivers/ps2/ps2_interrupt.c
@@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 // chibiOS headers
 #    include "ch.h"
 #    include "hal.h"
+#    include "gpio.h"
 #endif
 
 #include "ps2.h"
diff --git a/platforms/chibios/drivers/ps2/ps2_io.c b/platforms/chibios/drivers/ps2/ps2_io.c
index 906d85d848..9eb56d63da 100644
--- a/platforms/chibios/drivers/ps2/ps2_io.c
+++ b/platforms/chibios/drivers/ps2/ps2_io.c
@@ -4,6 +4,7 @@
 // chibiOS headers
 #include "ch.h"
 #include "hal.h"
+#include "gpio.h"
 
 /* Check port settings for clock and data line */
 #if !(defined(PS2_CLOCK_PIN))