diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index 7f2d40363e..d78a250c54 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -520,5 +520,6 @@ const input_driver_t input_android = {
    android_input_state,
    android_input_key_pressed,
    android_input_free_input,
+   NULL,
    "android_input",
 };
diff --git a/driver.h b/driver.h
index cbe94afdcd..26844d6f7e 100644
--- a/driver.h
+++ b/driver.h
@@ -206,8 +206,8 @@ typedef struct input_driver
    int16_t (*input_state)(void *data, const struct retro_keybind **retro_keybinds, unsigned port, unsigned device, unsigned index, unsigned id);
    bool (*key_pressed)(void *data, int key);
    void (*free)(void *data);
-#ifdef RARCH_CONSOLE
    void (*set_default_keybinds)(unsigned device, unsigned port);
+#ifdef RARCH_CONSOLE
    void (*set_analog_dpad_mapping)(unsigned device, unsigned map_dpad_enum, unsigned controller_id);
 #endif
    const char *ident;
diff --git a/input/linuxraw_input.c b/input/linuxraw_input.c
index 1297f7ae88..9ba370213d 100644
--- a/input/linuxraw_input.c
+++ b/input/linuxraw_input.c
@@ -315,5 +315,6 @@ const input_driver_t input_linuxraw = {
    linuxraw_input_state,
    linuxraw_bind_button_pressed,
    linuxraw_input_free,
+   NULL,
    "linuxraw"
 };
diff --git a/input/null.c b/input/null.c
index ccd1352ac2..c9abd0fa75 100644
--- a/input/null.c
+++ b/input/null.c
@@ -72,8 +72,8 @@ const input_driver_t input_null = {
    nullinput_input_state,
    nullinput_input_key_pressed,
    nullinput_input_free_input,
-#ifdef RARCH_CONSOLE
    nullinput_set_default_keybinds,
+#ifdef RARCH_CONSOLE
    nullinput_set_analog_dpad_mapping,
 #endif
    "null",
diff --git a/input/sdl_input.c b/input/sdl_input.c
index 2d8a60ae4f..efc70bacdf 100644
--- a/input/sdl_input.c
+++ b/input/sdl_input.c
@@ -245,6 +245,7 @@ const input_driver_t input_sdl = {
    sdl_input_state,
    sdl_bind_button_pressed,
    sdl_input_free,
+   NULL,
    "sdl",
 };
 
diff --git a/input/x11_input.c b/input/x11_input.c
index 1f5851724a..0ebc50b01c 100644
--- a/input/x11_input.c
+++ b/input/x11_input.c
@@ -250,6 +250,7 @@ const input_driver_t input_x = {
    x_input_state,
    x_bind_button_pressed,
    x_input_free,
+   NULL,
    "x"
 };