diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index 98e93881dc..9e185bc9f2 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -26,18 +26,7 @@
 
 #include "../general.h"
 
-#if 0
-enum
-{
-   AUTODETECT_MATCH_NONE = 0,
-   AUTODETECT_MATCH_VID,
-   AUTODETECT_MATCH_PID,
-   AUTODETECT_MATCH_IDENT,
-   AUTODETECT_MATCH_DRIVER,
-   AUTODETECT_MATCH_NAME
-};
-#endif
-bool remote_is_bound = false;
+static bool remote_is_bound = false;
 
 static void input_autoconfigure_joypad_conf(config_file_t *conf,
       struct retro_keybind *binds)
diff --git a/input/input_common.c b/input/input_common.c
index 633e199dd7..6e6976318a 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -170,8 +170,8 @@ void input_config_parse_key(config_file_t *conf,
       const char *prefix, const char *btn,
       struct retro_keybind *bind)
 {
-   char tmp[64] = {0};
-   char key[64] = {0};
+   char tmp[64];
+   char key[64];
    fill_pathname_join_delim(key, prefix, btn, '_', sizeof(key));
 
    if (config_get_array(conf, key, tmp, sizeof(tmp)))
@@ -182,8 +182,10 @@ const char *input_config_get_prefix(unsigned user, bool meta)
 {
    if (user == 0)
       return meta ? "input" : bind_user_prefix[user];
-   else if (user != 0 && !meta)
+
+   if (user != 0 && !meta)
       return bind_user_prefix[user];
+
    /* Don't bother with meta bind for anyone else than first user. */
    return NULL;
 }
diff --git a/input/input_remapping.c b/input/input_remapping.c
index 117ce1bfe7..1b1bd13b9b 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -104,8 +104,8 @@ bool input_remapping_save_file(const char *path)
    if (!conf)
    {
       conf = config_file_new(NULL);
-	  if (!conf)
-	     return false;
+      if (!conf)
+         return false;
    }
 
    for (i = 0; i < settings->input.max_users; i++)