diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index 8c10231ce3..e59fd8a8b2 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -60,9 +60,9 @@ static void input_autoconfigure_joypad_conf(config_file_t *conf,
    for (i = 0; i < RARCH_BIND_LIST_END; i++)
    {
       input_config_parse_joy_button(conf, "input",
-            input_config_bind_map[i].base, &binds[i]);
+            input_bind_map_get_base(i), &binds[i]);
       input_config_parse_joy_axis(conf, "input",
-            input_config_bind_map[i].base, &binds[i]);
+            input_bind_map_get_base(i), &binds[i]);
    }
 }
 
diff --git a/input/input_common.c b/input/input_common.c
index 1ba09a317c..9e951471f4 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -30,6 +30,23 @@
 #include "../config.h"
 #endif
 
+/* Input config. */
+struct input_bind_map
+{
+   bool valid;
+
+   /* Meta binds get input as prefix, not input_playerN".
+    * 0 = libretro related.
+    * 1 = Common hotkey.
+    * 2 = Uncommon/obscure hotkey.
+    */
+   unsigned meta;
+
+   const char *base;
+   const char *desc;
+   unsigned retro_key;
+};
+
 static const char *bind_user_prefix[MAX_USERS] = {
    "input_player1",
    "input_player2",
diff --git a/input/input_common.h b/input/input_common.h
index 000ed0ba43..8537a09ee9 100644
--- a/input/input_common.h
+++ b/input/input_common.h
@@ -21,25 +21,6 @@
 #include <stdint.h>
 #include "../driver.h"
 
-/* Input config. */
-struct input_bind_map
-{
-   bool valid;
-
-   /* Meta binds get input as prefix, not input_playerN".
-    * 0 = libretro related.
-    * 1 = Common hotkey.
-    * 2 = Uncommon/obscure hotkey.
-    */
-   unsigned meta;
-
-   const char *base;
-   const char *desc;
-   unsigned retro_key;
-};
-
-extern const struct input_bind_map input_config_bind_map[];
-
 const void *input_bind_map_get(unsigned i);
 
 const char *input_bind_map_get_base(unsigned i);
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 7285ba59c8..86988b0135 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -735,8 +735,8 @@ int menu_input_key_bind_iterate(char *s, size_t len)
 
    snprintf(s, len,
          "[%s]\npress keyboard or joypad\n(timeout %d %s)",
-         input_config_bind_map[
-         menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc,
+         input_bind_map_get_desc(
+         menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN),
          timeout,
          menu_hash_to_str(MENU_VALUE_SECONDS));