diff --git a/general.h b/general.h
index 05f1659a9e..6379361155 100644
--- a/general.h
+++ b/general.h
@@ -780,7 +780,6 @@ extern struct defaults g_defaults;
 
 /* Public functions. */
 void config_load(void);
-void config_set_defaults(void);
 const char *config_get_default_camera(void);
 const char *config_get_default_location(void);
 const char *config_get_default_osk(void);
@@ -795,7 +794,6 @@ const char *config_get_default_menu(void);
 
 #include "conf/config_file.h"
 bool config_save_file(const char *path);
-bool config_read_keybinds(const char *path);
 
 void rarch_main_state_new(void);
 void rarch_main_state_free(void);
diff --git a/settings.c b/settings.c
index 5bb2afc55a..f05e4bc548 100644
--- a/settings.c
+++ b/settings.c
@@ -283,7 +283,7 @@ const char *config_get_default_location(void)
    }
 }
 
-void config_set_defaults(void)
+static void config_set_defaults(void)
 {
    unsigned i, j;
    const char *def_video = config_get_default_video();
@@ -1246,22 +1246,6 @@ static void config_load_core_specific(void)
    }
 }
 
-void config_load(void)
-{
-   /* Flush out per-core configs before loading a new config. */
-   if (*g_extern.core_specific_config_path &&
-         g_settings.config_save_on_exit && g_settings.core_specific_config)
-      config_save_file(g_extern.core_specific_config_path);
-
-   if (!g_extern.block_config_read)
-   {
-      config_set_defaults();
-      parse_config_file();
-   }
-
-   /* Per-core config handling. */
-   config_load_core_specific();
-}
 
 
 
@@ -1352,7 +1336,8 @@ static void config_read_keybinds_conf(config_file_t *conf)
       read_keybinds_player(conf, i);
 }
 
-bool config_read_keybinds(const char *path)
+#if 0
+static bool config_read_keybinds(const char *path)
 {
    config_file_t *conf = (config_file_t*)config_file_new(path);
 
@@ -1364,6 +1349,7 @@ bool config_read_keybinds(const char *path)
 
    return true;
 }
+#endif
 
 static void save_keybind_key(config_file_t *conf, const char *prefix,
       const char *base, const struct retro_keybind *bind)
@@ -1476,6 +1462,23 @@ static void save_keybinds_player(config_file_t *conf, unsigned player)
    }
 }
 
+void config_load(void)
+{
+   /* Flush out per-core configs before loading a new config. */
+   if (*g_extern.core_specific_config_path &&
+         g_settings.config_save_on_exit && g_settings.core_specific_config)
+      config_save_file(g_extern.core_specific_config_path);
+
+   if (!g_extern.block_config_read)
+   {
+      config_set_defaults();
+      parse_config_file();
+   }
+
+   /* Per-core config handling. */
+   config_load_core_specific();
+}
+
 bool config_save_file(const char *path)
 {
    unsigned i = 0;