diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index b60e707aef..249a5717bc 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -975,13 +975,13 @@ static void gl_check_fbo_dimensions(gl_t *gl)
 }
 
 static void gl_frame_fbo(gl_t *gl, uint64_t frame_count,
-      const struct gl_tex_info *tex_info)
+      const struct gfx_tex_info *tex_info)
 {
    unsigned width, height;
    const struct gfx_fbo_rect *prev_rect;
    const struct gfx_fbo_rect *rect;
-   struct gl_tex_info *fbo_info;
-   struct gl_tex_info fbo_tex_info[GFX_MAX_SHADERS];
+   struct gfx_tex_info *fbo_info;
+   struct gfx_tex_info fbo_tex_info[GFX_MAX_SHADERS];
    int i;
    GLfloat xamt, yamt;
    unsigned fbo_tex_info_cnt = 0;
@@ -1410,7 +1410,7 @@ static INLINE void gl_copy_frame(gl_t *gl, const void *frame,
 }
 
 static INLINE void gl_set_prev_texture(gl_t *gl,
-      const struct gl_tex_info *tex_info)
+      const struct gfx_tex_info *tex_info)
 {
    memmove(gl->prev_info + 1, gl->prev_info,
          sizeof(*tex_info) * (gl->textures - 1));
diff --git a/gfx/drivers/gl_common.h b/gfx/drivers/gl_common.h
index 68f639806f..5abeb62705 100644
--- a/gfx/drivers/gl_common.h
+++ b/gfx/drivers/gl_common.h
@@ -198,9 +198,9 @@ struct gfx_ortho
    float zfar;
 };
 
-struct gl_tex_info
+struct gfx_tex_info
 {
-   GLuint tex;
+   unsigned int tex;
    float input_size[2];
    float tex_size[2];
    float coord[8];
@@ -247,8 +247,8 @@ typedef struct gl
    GLuint texture[GFX_MAX_TEXTURES];
    unsigned tex_index; /* For use with PREV. */
    unsigned textures;
-   struct gl_tex_info tex_info;
-   struct gl_tex_info prev_info[GFX_MAX_TEXTURES];
+   struct gfx_tex_info tex_info;
+   struct gfx_tex_info prev_info[GFX_MAX_TEXTURES];
    GLuint tex_mag_filter;
    GLuint tex_min_filter;
    bool tex_mipmap;
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index fc69ba726e..556bdedc13 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -233,9 +233,9 @@ static void gl_cg_set_params(void *data, unsigned width, unsigned height,
 {
    unsigned i;
    CGparameter param;
-   const struct gl_tex_info *info = (const struct gl_tex_info*)_info;
-   const struct gl_tex_info *prev_info = (const struct gl_tex_info*)_prev_info;
-   const struct gl_tex_info *fbo_info = (const struct gl_tex_info*)_fbo_info;
+   const struct gfx_tex_info *info = (const struct gfx_tex_info*)_info;
+   const struct gfx_tex_info *prev_info = (const struct gfx_tex_info*)_prev_info;
+   const struct gfx_tex_info *fbo_info = (const struct gfx_tex_info*)_fbo_info;
    driver_t *driver = driver_get_ptr();
    global_t *global = global_get_ptr();
    cg_shader_data_t *cg = (cg_shader_data_t*)driver->video_shader_data;
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 73a90b1ea9..f7242376b6 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -952,9 +952,9 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height,
    unsigned i, texunit = 1;
    const struct shader_uniforms *uni = NULL;
    size_t size = 0, attribs_size = 0;
-   const struct gl_tex_info *info = (const struct gl_tex_info*)_info;
-   const struct gl_tex_info *prev_info = (const struct gl_tex_info*)_prev_info;
-   const struct gl_tex_info *fbo_info = (const struct gl_tex_info*)_fbo_info;
+   const struct gfx_tex_info *info = (const struct gfx_tex_info*)_info;
+   const struct gfx_tex_info *prev_info = (const struct gfx_tex_info*)_prev_info;
+   const struct gfx_tex_info *fbo_info = (const struct gfx_tex_info*)_fbo_info;
    struct glsl_attrib *attr = (struct glsl_attrib*)attribs;
    driver_t *driver = driver_get_ptr();
    global_t *global = global_get_ptr();
diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c
index ad7d1d7696..369d190241 100644
--- a/gfx/drivers_shader/shader_hlsl.c
+++ b/gfx/drivers_shader/shader_hlsl.c
@@ -111,9 +111,9 @@ static void hlsl_set_params(void *data, unsigned width, unsigned height,
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
    LPDIRECT3DDEVICE d3d_device_ptr = (LPDIRECT3DDEVICE)d3d->dev;
-   const struct gl_tex_info *info = (const struct gl_tex_info*)_info;
-   const struct gl_tex_info *prev_info = (const struct gl_tex_info*)_prev_info;
-   const struct gl_tex_info *fbo_info = (const struct gl_tex_info*)_fbo_info;
+   const struct gfx_tex_info *info = (const struct gfx_tex_info*)_info;
+   const struct gfx_tex_info *prev_info = (const struct gfx_tex_info*)_prev_info;
+   const struct gfx_tex_info *fbo_info = (const struct gfx_tex_info*)_fbo_info;
    driver_t *driver = driver_get_ptr();
    global_t *global = global_get_ptr();
    hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)driver->video_shader_data;