diff --git a/gfx/gl.c b/gfx/gl.c
index c4f5aed47b..69fed450b3 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -558,9 +558,9 @@ static void gl_create_fbo_textures(void *data)
          glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, 
                gl->fbo_rect[i].width, gl->fbo_rect[i].height,
                0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+#endif
       }
       else
-#endif
       {
          glTexImage2D(GL_TEXTURE_2D,
                0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_INTERNAL_FORMAT32,
diff --git a/gfx/shader_parse.c b/gfx/shader_parse.c
index 06621d8b55..3ed69019f6 100644
--- a/gfx/shader_parse.c
+++ b/gfx/shader_parse.c
@@ -211,6 +211,10 @@ static bool shader_parse_imports(config_file_t *conf, struct gfx_shader *shader)
 
    char *save;
    const char *id = strtok_r(imports, ";", &save);
+
+   /* FIXME - unused variable and then redefined again in for loop? */
+   (void)id;
+
    for (const char *id = strtok_r(imports, ";", &save);
          id && shader->variables < GFX_MAX_VARIABLES;
          shader->variables++, id = strtok_r(NULL, ";", &save))
diff --git a/griffin/griffin.c b/griffin/griffin.c
index dd9f6802bd..97ea3616e1 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -109,7 +109,7 @@ VIDEO CONTEXT
 VIDEO SHADERS
 ============================================================ */
 
-#if defined(HAVE_CG) || defined(HAVE_HLSL)
+#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
 #include "../gfx/shader_parse.c"
 #endif