diff --git a/configuration.c b/configuration.c
index 171427ea4b..ff4829ee4d 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2742,14 +2742,14 @@ void config_set_defaults(void *data)
 
    for (i = 0; i < MAX_USERS; i++)
    {
-      settings->uints.input_joypad_index[i] = i;
+      settings->uints.input_joypad_index[i] = (unsigned)i;
 #ifdef SWITCH /* Switch prefered default dpad mode */
       settings->uints.input_analog_dpad_mode[i] = ANALOG_DPAD_LSTICK;
 #else
       settings->uints.input_analog_dpad_mode[i] = ANALOG_DPAD_NONE;
 #endif
-      input_config_set_device(i, RETRO_DEVICE_JOYPAD);
-      settings->uints.input_mouse_index[i] = i;
+      input_config_set_device((unsigned)i, RETRO_DEVICE_JOYPAD);
+      settings->uints.input_mouse_index[i] = (unsigned)i;
    }
 
    video_driver_reset_custom_viewport(settings);
diff --git a/gfx/drivers/gl2.c b/gfx/drivers/gl2.c
index 03a7207b59..c240e8d04a 100644
--- a/gfx/drivers/gl2.c
+++ b/gfx/drivers/gl2.c
@@ -1768,7 +1768,7 @@ static bool gl2_add_lut(
       bool lut_mipmap,
       unsigned lut_filter,
       enum gfx_wrap_type lut_wrap_type,
-      unsigned i, GLuint *textures_lut)
+      size_t i, GLuint *textures_lut)
 {
    struct texture_image img;
    enum texture_filter_type filter_type = TEXTURE_FILTER_LINEAR;
diff --git a/gfx/drivers/gl3.c b/gfx/drivers/gl3.c
index ad4798e84f..d762723b97 100644
--- a/gfx/drivers/gl3.c
+++ b/gfx/drivers/gl3.c
@@ -287,7 +287,7 @@ static void gl3_render_overlay(gl3_t *gl,
    {
       glActiveTexture(GL_TEXTURE1);
       glBindTexture(GL_TEXTURE_2D, gl->overlay_tex[i]);
-      glDrawArrays(GL_TRIANGLE_STRIP, 4 * i, 4);
+      glDrawArrays(GL_TRIANGLE_STRIP, (GLint)(4 * i), 4);
    }
 
    glDisableVertexAttribArray(0);
@@ -1290,8 +1290,8 @@ static bool gl3_overlay_load(void *data,
       gl->overlay_tex[i] = id;
 
       /* Default. Stretch to whole screen. */
-      gl3_overlay_tex_geom(gl, i, 0, 0, 1, 1);
-      gl3_overlay_vertex_geom(gl, i, 0, 0, 1, 1);
+      gl3_overlay_tex_geom   (gl, (unsigned)i, 0, 0, 1, 1);
+      gl3_overlay_vertex_geom(gl, (unsigned)i, 0, 0, 1, 1);
 
       for (j = 0; j < 16; j++)
          gl->overlay_color_coord[16 * i + j] = 1.0f;
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index fdb0f17b13..0ca0bc96e0 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -618,7 +618,7 @@ void video_shader_resolve_parameters(struct video_shader *shader)
 
          /* Even though the pass is set in the loop too, 
           * not all passes have parameters */
-         param->pass = i;
+         param->pass = (int)i;
 
          while ((shader->num_parameters < ARRAY_SIZE(shader->parameters)) 
                && (line_index < lines.size))
@@ -644,7 +644,7 @@ void video_shader_resolve_parameters(struct video_shader *shader)
             if (ret == 5)
                param->step  = 0.1f * (param->maximum - param->minimum);
 
-            param->pass     = i;
+            param->pass     = (int)i;
 
 #ifdef DEBUG
             RARCH_DBG("[Shaders]: Found #pragma parameter %s (%s) %f %f %f %f in pass %d.\n",
@@ -817,7 +817,7 @@ static bool video_shader_write_root_preset(const struct video_shader *shader,
 
       formatted_num[0]                     = '\0';
 
-      snprintf(formatted_num, sizeof(formatted_num), "%u", i);
+      snprintf(formatted_num, sizeof(formatted_num), "%u", (int)i);
 
       strlcpy(key, "shader",      sizeof(key));
       strlcat(key, formatted_num, sizeof(key));
@@ -1616,7 +1616,7 @@ static bool video_shader_load_root_config_into_shader(
 
       for (i = 0; i < shader->passes; i++)
       {
-         if (!video_shader_parse_pass(conf, &shader->pass[i], i))
+         if (!video_shader_parse_pass(conf, &shader->pass[i], (unsigned)i))
          {
             string_list_deinitialize(&file_list);
             return false;
@@ -1633,7 +1633,7 @@ static bool video_shader_load_root_config_into_shader(
    {
       for (i = 0; i < shader->passes; i++)
       {
-         if (!video_shader_parse_pass(conf, &shader->pass[i], i))
+         if (!video_shader_parse_pass(conf, &shader->pass[i], (unsigned)i))
             return false;
       }
    }