diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index ffb6073600..710866283e 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1687,13 +1687,9 @@ static void gl_begin_debug(gl_t *gl)
 extern gl_renderchain_driver_t gl2_renderchain;
 
 static const gl_renderchain_driver_t *renderchain_gl_drivers[] = {
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
-   &gl2_renderchain,
-#endif
-   NULL
+   &gl2_renderchain
 };
 
-
 static bool renderchain_gl_init_first(
       const gl_renderchain_driver_t **renderchain_driver,
       void **renderchain_handle)
@@ -1715,7 +1711,8 @@ static bool renderchain_gl_init_first(
    return false;
 }
 
-static void *gl_init(const video_info_t *video, const input_driver_t **input, void **input_data)
+static void *gl_init(const video_info_t *video,
+      const input_driver_t **input, void **input_data)
 {
    gfx_ctx_mode_t mode;
    gfx_ctx_input_t inp;
diff --git a/gfx/drivers_renderchain/gl1_renderchain.c b/gfx/drivers_renderchain/gl1_renderchain.c
index 3eb1f887c7..f4f06acb43 100644
--- a/gfx/drivers_renderchain/gl1_renderchain.c
+++ b/gfx/drivers_renderchain/gl1_renderchain.c
@@ -55,8 +55,6 @@ typedef struct gl1_renderchain
    void *empty;
 } gl1_renderchain_t;
 
-GLenum min_filter_to_mag(GLenum type);
-
 void gl1_renderchain_free(void *data, void *chain_data)
 {
    (void)chain_data;
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 60e58e04e6..f6d6144aee 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -408,9 +408,10 @@ static void materialui_draw_tab(
 }
 
 /* Draw the onscreen keyboard */
-static void materialui_render_keyboard(materialui_handle_t *mui,
+static void materialui_render_keyboard(
+      materialui_handle_t *mui,
       video_frame_info_t *video_info,
-      const char *grid[], unsigned id)
+      char *grid[], unsigned id)
 {
    int ptr_width, ptr_height;
    unsigned i;
diff --git a/menu/widgets/menu_osk.c b/menu/widgets/menu_osk.c
index 5bc3c6aa5f..65e17b04cc 100644
--- a/menu/widgets/menu_osk.c
+++ b/menu/widgets/menu_osk.c
@@ -148,7 +148,7 @@ void menu_event_osk_iterate(void)
    }
 }
 
-const char** menu_event_get_osk_grid(void)
+char** menu_event_get_osk_grid(void)
 {
    return osk_grid;
 }
diff --git a/menu/widgets/menu_osk.h b/menu/widgets/menu_osk.h
index be11d86e7f..2c460a7efb 100644
--- a/menu/widgets/menu_osk.h
+++ b/menu/widgets/menu_osk.h
@@ -59,7 +59,7 @@ void menu_event_osk_append(int a);
 
 void menu_event_osk_iterate(void);
 
-const char** menu_event_get_osk_grid(void);
+char** menu_event_get_osk_grid(void);
 
 RETRO_END_DECLS