diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index fd36f0bdbd..33fb5ded90 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -554,12 +554,13 @@ static void gl_create_fbo_textures(gl_t *gl)
 static bool gl_create_fbo_targets(gl_t *gl)
 {
    int i;
+   GLenum status;
+
    if (!gl)
       return false;
 
    glBindTexture(GL_TEXTURE_2D, 0);
    glGenFramebuffers(gl->fbo_pass, gl->fbo);
-   GLenum status;
 
    for (i = 0; i < gl->fbo_pass; i++)
    {
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index d53df4a4f9..642628a7c4 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -297,7 +297,7 @@ enum
    PUSH_ARCHIVE_OPEN_DETECT_CORE = 0,
    PUSH_ARCHIVE_OPEN,
    PUSH_DEFAULT,
-   PUSH_DETECT_CORE_LIST,
+   PUSH_DETECT_CORE_LIST
 };
 
 
diff --git a/menu/intl/menu_hash_es.c b/menu/intl/menu_hash_es.c
index e06b3a1ea2..d329ef7df3 100644
--- a/menu/intl/menu_hash_es.c
+++ b/menu/intl/menu_hash_es.c
@@ -636,9 +636,9 @@ const char *menu_hash_to_str_es(uint32_t hash)
          return "Iniciando descarga: ";
       case MENU_VALUE_SECONDS:
          return "segundos";
-      case MENU_VALUE_OFF: //Not changed. Would be "SÍ"
+      case MENU_VALUE_OFF: /* Not changed. Would be "SÍ" */
          return "OFF";
-      case MENU_VALUE_ON: //Not changed. Would be "NO"
+      case MENU_VALUE_ON: /* Not changed. Would be "NO" */
          return "ON";
       case MENU_LABEL_VALUE_UPDATE_ASSETS:
          return "Actualizar recursos";
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index b250189bdf..f964f82997 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -403,6 +403,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
 static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
 {
+   int controller;
    char feat_str[PATH_MAX_LENGTH]        = {0};
    char tmp[PATH_MAX_LENGTH]             = {0};
    char tmp2[PATH_MAX_LENGTH]            = {0};
@@ -445,7 +446,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
       menu_list_push(info->list, cpu_str, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
-   for(int controller = 0; controller < MAX_USERS; controller++)
+   for(controller = 0; controller < MAX_USERS; controller++)
    {
        if (settings->input.autoconfigured[controller])
        {
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 9c2f783f34..36825d49d7 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -68,7 +68,7 @@ typedef enum
 {
    MENU_VIDEO_DRIVER_GENERIC = 0,
    MENU_VIDEO_DRIVER_OPENGL,
-   MENU_VIDEO_DRIVER_DIRECT3D,
+   MENU_VIDEO_DRIVER_DIRECT3D
 } menu_video_driver_type_t;
 
 typedef struct
diff --git a/menu/menu_input.c b/menu/menu_input.c
index d4b13e315d..0826d86cf5 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -358,7 +358,9 @@ static bool menu_input_poll_find_trigger(struct menu_bind_state *state,
 
       /* Update the joypad mapping automatically.
        * More friendly that way. */
-      //settings->input.joypad_map[state->user] = i;
+#if 0
+      settings->input.joypad_map[state->user] = i;
+#endif
       return true;
    }
    return false;