diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index cd1bab1fbe..bfdfeee050 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -86,7 +86,6 @@ static void *vg_init(const video_info_t *video, const input_driver_t **input, vo
    unsigned temp_width = 0, temp_height = 0;
    VGfloat clearColor[4] = {0, 0, 0, 1};
    settings_t        *settings = config_get_ptr();
-   driver_t            *driver = driver_get_ptr();
    const gfx_ctx_driver_t *ctx = NULL;
    vg_t                    *vg = (vg_t*)calloc(1, sizeof(vg_t));
 
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index 32f4fd1bf7..942c2cc712 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -278,7 +278,8 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
       }
    }
    
-   if(msg&&strcmp(msg,"")){
+   if(msg && strcmp(msg,""))
+   {
      driver_t          *driver = driver_get_ptr();
      const font_renderer_t *font_ctx = driver->font_osd_driver;
      
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index bde1e44e81..546eaf50c8 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -409,7 +409,6 @@ static void *xv_init(const video_info_t *video,
    XvAdaptorInfo *adaptor_info            = NULL;
    const struct retro_game_geometry *geom = NULL;
    struct retro_system_av_info *av_info   = NULL;
-   driver_t *driver                       = driver_get_ptr();
    settings_t *settings                   = config_get_ptr();
 
    xv_t                               *xv = (xv_t*)calloc(1, sizeof(*xv));
diff --git a/gfx/video_state_tracker.c b/gfx/video_state_tracker.c
index 76b97cbc83..d2ec2530fd 100644
--- a/gfx/video_state_tracker.c
+++ b/gfx/video_state_tracker.c
@@ -283,9 +283,6 @@ static void state_tracker_update_input(state_tracker_t *tracker)
    for (i = 0; i < MAX_USERS; i++)
       binds[i] = settings->input.binds[i];
 
-   if (!driver->input)
-      return;
-
    for (i = 0; i < 2; i++)
       input_push_analog_dpad(settings->input.binds[i],
             settings->input.analog_dpad_mode[i]);