diff --git a/Makefile.emscripten b/Makefile.emscripten
index a77a28c39c..d12fe0a43b 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -29,6 +29,7 @@ OBJ = frontend/platform/platform_emscripten.o \
 		input/overlay.o \
 		fifo_buffer.o \
 		gfx/scaler/scaler.o \
+		gfx/shader_common.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
 		gfx/scaler/scaler_filter.o \
diff --git a/Makefile.win b/Makefile.win
index 486849cfec..1c07f211d8 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -34,6 +34,7 @@ OBJ = frontend/frontend.o \
 		media/rarch.o \
 		gfx/context/win32_common.o \
 		gfx/scaler/scaler.o \
+		gfx/shader_common.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
 		gfx/scaler/scaler_filter.o \
diff --git a/gfx/shader_common.c b/gfx/shader_common.c
index 26d0d2e8d9..4698507301 100644
--- a/gfx/shader_common.c
+++ b/gfx/shader_common.c
@@ -24,7 +24,7 @@ void gl_load_texture_data(GLuint obj, const struct texture_image *img,
    glBindTexture(GL_TEXTURE_2D, obj);
 
 #ifdef HAVE_OPENGLES2
-   GLenum wrap = GL_CLAMP_TO_EDGE;
+   wrap = GL_CLAMP_TO_EDGE;
 #endif
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap);
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 2045a545aa..f2e58a768a 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -18,6 +18,10 @@
 #define HAVE_FILTERS_BUILTIN
 #endif
 
+#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
+#define HAVE_SHADERS
+#endif
+
 #if defined(_XBOX)
 #include "../msvc/msvc_compat.h"
 #endif
@@ -141,9 +145,10 @@ VIDEO CONTEXT
 /*============================================================
 VIDEO SHADERS
 ============================================================ */
-#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
+#include "../gfx/shader_common.c"
+
+#ifdef HAVE_SHADERS
 #include "../gfx/shader_parse.c"
-#endif
 
 #ifdef HAVE_CG
 #include "../gfx/shader_cg.c"
@@ -157,6 +162,8 @@ VIDEO SHADERS
 #include "../gfx/shader_glsl.c"
 #endif
 
+#endif
+
 /*============================================================
 VIDEO IMAGE
 ============================================================ */
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 1d83cdfff1..4e6fa89fc0 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -288,6 +288,8 @@
     </ClCompile>
     <ClCompile Include="..\..\gfx\scaler\scaler.c">
     </ClCompile>
+    <ClCompile Include="..\..\gfx\shader_common.c">
+    </ClCompile>
     <ClCompile Include="..\..\gfx\scaler\scaler_int.c">
     </ClCompile>
     <ClCompile Include="..\..\gfx\state_tracker.c">