diff --git a/input/input_mapper.c b/input/input_mapper.c
index ff41d32bbe..b4346022b4 100644
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@@ -125,11 +125,13 @@ void input_mapper_poll(input_mapper_t *handle,
                remap_valid                   = (current_button_value == 1) &&
                   (j != remap_button) && (remap_button != RARCH_UNMAPPED);
 
+#ifdef HAVE_ACCESSIBILITY
                /* gamepad override */
                if (i==0 && get_gamepad_input_override() & (1<<j))
                {
                   BIT256_SET(handle->buttons[i], j);
                }
+#endif
 
                if (remap_valid)
                {
diff --git a/retroarch.c b/retroarch.c
index 6d855dd506..fe7d3008bf 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -31134,6 +31134,4 @@ void reset_gamepad_input_override(void)
 {
     gamepad_input_override = 0;
 }
-
-
 #endif