diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
index 7f6d833b73..7dcda29ff3 100644
--- a/gfx/drivers_context/mali_fbdev_ctx.c
+++ b/gfx/drivers_context/mali_fbdev_ctx.c
@@ -23,6 +23,7 @@
 
 #include <streams/file_stream.h>
 
+#include "../../frontend/frontend_driver.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
@@ -106,7 +107,7 @@ static void *gfx_ctx_mali_fbdev_init(void *video_driver)
        return NULL;
 
 #ifdef HAVE_EGL
-   egl_install_sighandlers();
+   frontend_driver_install_signal_handler();
 #endif
 
    /* Disable cursor blinking so it's not visible in RetroArch. */
@@ -145,7 +146,7 @@ static void gfx_ctx_mali_fbdev_check_window(void *data, bool *quit,
       *resize = true;
    }
 
-   *quit = g_egl_quit;
+   *quit   = (bool)frontend_driver_get_signal_handler_state();
 }
 
 static bool gfx_ctx_mali_fbdev_set_resize(void *data,
diff --git a/gfx/drivers_context/opendingux_fbdev_ctx.c b/gfx/drivers_context/opendingux_fbdev_ctx.c
index d2a7971b6c..6d60a6c536 100644
--- a/gfx/drivers_context/opendingux_fbdev_ctx.c
+++ b/gfx/drivers_context/opendingux_fbdev_ctx.c
@@ -16,6 +16,7 @@
 
 #include <signal.h>
 
+#include "../../frontend/frontend_driver.h"
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
@@ -80,7 +81,7 @@ static void *gfx_ctx_opendingux_init(void *video_driver)
    (void)video_driver;
 
 #ifdef HAVE_EGL
-   egl_install_sighandlers();
+   frontend_driver_install_signal_handler();
 
    if (!egl_init_context(&viv->egl, EGL_DEFAULT_DISPLAY,
             &major, &minor,
@@ -127,7 +128,7 @@ static void gfx_ctx_opendingux_check_window(void *data, bool *quit,
       *resize = true;
    }
 
-   *quit = g_egl_quit;
+   *quit   = (bool)frontend_driver_get_signal_handler_state();
 }
 
 static bool gfx_ctx_opendingux_set_resize(void *data,
diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
index 4288a8ab58..e993001e08 100644
--- a/gfx/drivers_context/vc_egl_ctx.c
+++ b/gfx/drivers_context/vc_egl_ctx.c
@@ -86,7 +86,7 @@ static void gfx_ctx_vc_check_window(void *data, bool *quit,
    (void)height;
 
    *resize = false;
-   *quit   = g_egl_quit;
+   *quit   = (bool)frontend_driver_get_signal_handler_state();
 }
 
 static bool gfx_ctx_vc_set_resize(void *data, unsigned width, unsigned height)
@@ -317,7 +317,7 @@ static bool gfx_ctx_vc_set_video_mode(void *data,
    if (g_egl_inited)
       return false;
 
-   egl_install_sighandlers();
+   frontend_driver_install_signal_handler();
    gfx_ctx_vc_set_swap_interval(&vc->egl, vc->egl.interval);
 
    g_egl_inited = true;
diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c
index 4a554fc33b..4b4dc39865 100644
--- a/gfx/drivers_context/vivante_fbdev_ctx.c
+++ b/gfx/drivers_context/vivante_fbdev_ctx.c
@@ -17,6 +17,7 @@
 #include <signal.h>
 
 #include "../../driver.h"
+#include "../../frontend/frontend_driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
 
@@ -76,7 +77,7 @@ static void *gfx_ctx_vivante_init(void *video_driver)
    (void)video_driver;
 
 #ifdef HAVE_EGL
-   egl_install_sighandlers();
+   frontend_driver_install_signal_handler();
 
    if (!egl_init_context(&viv->egl, EGL_DEFAULT_DISPLAY, &major, &minor,
             &n, attribs))
@@ -121,7 +122,7 @@ static void gfx_ctx_vivante_check_window(void *data, bool *quit,
       *resize = true;
    }
 
-   *quit = g_egl_quit;
+   *quit = (bool)frontend_driver_get_signal_handler_state();
 }
 
 static bool gfx_ctx_vivante_set_resize(void *data,