diff --git a/gfx/gfx_context.c b/gfx/gfx_context.c
index 4f0eb5e60e..8f8fb4ced0 100644
--- a/gfx/gfx_context.c
+++ b/gfx/gfx_context.c
@@ -104,7 +104,7 @@ void find_next_context_driver(void)
 
 static const gfx_ctx_driver_t *ctx_init(void *data,
       const gfx_ctx_driver_t *ctx,
-      const char *driver,
+      const char *drv,
       enum gfx_ctx_api api, unsigned major,
       unsigned minor, bool hw_render_ctx)
 {
@@ -173,13 +173,12 @@ static const gfx_ctx_driver_t *gfx_ctx_find_driver(void *data,
 
 
 const gfx_ctx_driver_t *gfx_ctx_init_first(void *data,
-      const char *driver,
+      const char *drv,
       enum gfx_ctx_api api, unsigned major,
       unsigned minor, bool hw_render_ctx)
 {
-   unsigned i;
    const gfx_ctx_driver_t *ctx = (const gfx_ctx_driver_t*)
-      gfx_ctx_find_driver(data, driver, api, major, minor,
+      gfx_ctx_find_driver(data, drv, api, major, minor,
             hw_render_ctx);
 
    if (!ctx)
diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h
index 0db5134ac8..6e278706eb 100644
--- a/gfx/gfx_context.h
+++ b/gfx/gfx_context.h
@@ -149,6 +149,10 @@ extern const gfx_ctx_driver_t gfx_ctx_null;
 /* Finds first suitable driver and initializes. */
 const gfx_ctx_driver_t *gfx_ctx_init_first(void *data, const char *driver,
       enum gfx_ctx_api api, unsigned major, unsigned minor, bool hw_render_ctx);
+    
+void find_next_context_driver(void);
+    
+void find_prev_gfx_context_driver(void);
 
 #ifdef __cplusplus
 }
diff --git a/gfx/gl.c b/gfx/gl.c
index 4ad0f52121..2d43428c6b 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -2013,6 +2013,8 @@ static const gfx_ctx_driver_t *gl_get_context(gl_t *gl)
    enum gfx_ctx_api api = GFX_CTX_OPENGL_API;
    const char *api_name = "OpenGL";
 #endif
+    
+   (void)api_name;
 
    gl->shared_context_use = g_settings.video.shared_context
       && cb->context_type != RETRO_HW_CONTEXT_NONE;