diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 1fecb5e7da..451dfb30af 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -3973,7 +3973,11 @@ static bool gl2_alive(void *data)
 static bool gl2_suppress_screensaver(void *data, bool enable)
 {
    bool enabled = enable;
-   return video_context_driver_suppress_screensaver(&enabled);
+   gl_t *gl     = (gl_t*)data;
+
+   if (gl->ctx_data && gl->ctx_driver->suppress_screensaver)
+      return gl->ctx_driver->suppress_screensaver(gl->ctx_data, enabled);
+   return false;
 }
 
 static void gl2_update_tex_filter_frame(gl_t *gl)
diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c
index cc801f7bdc..5cf6eb55db 100644
--- a/gfx/drivers/gl_core.c
+++ b/gfx/drivers/gl_core.c
@@ -1392,8 +1392,11 @@ static void gl_core_set_nonblock_state(void *data, bool state)
 
 static bool gl_core_suppress_screensaver(void *data, bool enable)
 {
-   bool enabled = enable;
-   return video_context_driver_suppress_screensaver(&enabled);
+   bool enabled                = enable;
+   gl_core_t         *gl       = (gl_core_t*)data;
+   if (gl->ctx_data && gl->ctx_driver->suppress_screensaver)
+      return gl->ctx_driver->suppress_screensaver(gl->ctx_data, enabled);
+   return false;
 }
 
 static bool gl_core_set_shader(void *data,
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 055f340bcf..6f63802227 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -469,8 +469,11 @@ static bool vg_alive(void *data)
 
 static bool vg_suppress_screensaver(void *data, bool enable)
 {
-   bool enabled = enable;
-   return video_context_driver_suppress_screensaver(&enabled);
+   bool enabled         = enable;
+   vg_t            *vg  = (vg_t*)data;
+   if (vg->ctx_data && vg->ctx_driver->suppress_screensaver)
+      return vg->ctx_driver->suppress_screensaver(vg->ctx_data, enabled);
+   return false;
 }
 
 static bool vg_set_shader(void *data,
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 2e44af1c55..3f6e6880e8 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -1365,9 +1365,11 @@ static bool vulkan_alive(void *data)
 static bool vulkan_suppress_screensaver(void *data, bool enable)
 {
    bool enabled = enable;
-   (void)data;
+   vk_t *vk     = (vk_t*)data;
 
-   return video_context_driver_suppress_screensaver(&enabled);
+   if (vk->ctx_data && vk->ctx_driver->suppress_screensaver)
+      return vk->ctx_driver->suppress_screensaver(vk->ctx_data, enabled);
+   return false;
 }
 
 static bool vulkan_set_shader(void *data,
diff --git a/retroarch.c b/retroarch.c
index 74106aff06..3c514188cf 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -19695,15 +19695,6 @@ bool video_context_driver_input_driver(gfx_ctx_input_t *inp)
    return true;
 }
 
-bool video_context_driver_suppress_screensaver(bool *bool_data)
-{
-   if (     video_context_data
-         && current_video_context.suppress_screensaver(
-            video_context_data, *bool_data))
-      return true;
-   return false;
-}
-
 bool video_context_driver_get_ident(gfx_ctx_ident_t *ident)
 {
    if (!ident)
diff --git a/retroarch.h b/retroarch.h
index 259cbd650d..a2fd2d9291 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -1843,8 +1843,6 @@ bool video_context_driver_get_video_output_prev(void);
 
 bool video_context_driver_get_video_output_next(void);
 
-bool video_context_driver_bind_hw_render(bool *enable);
-
 void video_context_driver_make_current(bool restore);
 
 bool video_context_driver_set(const gfx_ctx_driver_t *data);
@@ -1853,8 +1851,6 @@ void video_context_driver_destroy(void);
 
 bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data);
 
-bool video_context_driver_suppress_screensaver(bool *bool_data);
-
 bool video_context_driver_get_ident(gfx_ctx_ident_t *ident);
 
 bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info);