diff --git a/Makefile.common b/Makefile.common
index a8bbbb18cb..eb895bdcb1 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -346,6 +346,7 @@ ifeq ($(HAVE_OPENGL), 1)
 			 gfx/fonts/gl_font.o \
 			 gfx/fonts/gl_raster_font.o \
 			 gfx/math/matrix.o \
+			 gfx/shader/shader_gl_common.o \
 			 gfx/state_tracker.o \
 			 gfx/glsym/rglgen.o
 
diff --git a/gfx/shader/shader_context.c b/gfx/shader/shader_context.c
index ae7215a17b..2f47cac140 100644
--- a/gfx/shader/shader_context.c
+++ b/gfx/shader/shader_context.c
@@ -15,77 +15,3 @@
 
 #include "shader_context.h"
 #include "../../retroarch_logger.h"
-
-#ifdef HAVE_OPENGL
-#include "shader_gl_common.h"
-
-void gl_load_texture_data(GLuint obj, const struct texture_image *img,
-      GLenum wrap, bool linear, bool mipmap)
-{
-   glBindTexture(GL_TEXTURE_2D, obj);
-
-#ifdef HAVE_PSGL
-   mipmap = false;
-#endif
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap);
-
-   GLint mag_filter = linear ? GL_LINEAR : GL_NEAREST;
-   GLint min_filter = linear ? (mipmap ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR) :
-                               (mipmap ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
-
-#ifndef HAVE_PSGL
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-#endif
-   glTexImage2D(GL_TEXTURE_2D,
-         0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_INTERNAL_FORMAT32,
-         img->width, img->height,
-         0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_TEXTURE_TYPE32,
-         RARCH_GL_FORMAT32, img->pixels);
-#ifndef HAVE_PSGL
-   if (mipmap)
-      glGenerateMipmap(GL_TEXTURE_2D);
-#endif
-}
-
-bool gl_load_luts(const struct gfx_shader *generic_shader,
-      GLuint *lut_textures)
-{
-   unsigned i;
-   unsigned num_luts = min(generic_shader->luts, GFX_MAX_TEXTURES);
-
-   if (!generic_shader->luts)
-      return true;
-
-   /*  Original shader_glsl.c code only generated one 
-    *  texture handle.  I assume it was a bug, but if not, 
-    *  replace num_luts with 1 when GLSL is used. */
-   glGenTextures(num_luts, lut_textures);
-   for (i = 0; i < num_luts; i++)
-   {
-      struct texture_image img = {0};
-      RARCH_LOG("Loading texture image from: \"%s\" ...\n",
-            generic_shader->lut[i].path);
-
-      if (!texture_image_load(&img, generic_shader->lut[i].path))
-      {
-         RARCH_ERR("Failed to load texture image from: \"%s\"\n",
-               generic_shader->lut[i].path);
-         return false;
-      }
-
-      gl_load_texture_data(lut_textures[i], &img,
-            driver.video->wrap_type_to_enum(generic_shader->lut[i].wrap),
-            generic_shader->lut[i].filter != RARCH_FILTER_NEAREST,
-            generic_shader->lut[i].mipmap);
-      texture_image_free(&img);
-   }
-
-   glBindTexture(GL_TEXTURE_2D, 0);
-   return true;
-}
-#endif // HAVE_OPENGL
-
-
diff --git a/gfx/shader/shader_gl_common.c b/gfx/shader/shader_gl_common.c
new file mode 100644
index 0000000000..5f181640dc
--- /dev/null
+++ b/gfx/shader/shader_gl_common.c
@@ -0,0 +1,85 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "shader_gl_common.h"
+
+void gl_load_texture_data(GLuint obj, const struct texture_image *img,
+      GLenum wrap, bool linear, bool mipmap)
+{
+   glBindTexture(GL_TEXTURE_2D, obj);
+
+#ifdef HAVE_PSGL
+   mipmap = false;
+#endif
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap);
+
+   GLint mag_filter = linear ? GL_LINEAR : GL_NEAREST;
+   GLint min_filter = linear ? (mipmap ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR) :
+                               (mipmap ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
+
+#ifndef HAVE_PSGL
+   glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+#endif
+   glTexImage2D(GL_TEXTURE_2D,
+         0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_INTERNAL_FORMAT32,
+         img->width, img->height,
+         0, driver.gfx_use_rgba ? GL_RGBA : RARCH_GL_TEXTURE_TYPE32,
+         RARCH_GL_FORMAT32, img->pixels);
+#ifndef HAVE_PSGL
+   if (mipmap)
+      glGenerateMipmap(GL_TEXTURE_2D);
+#endif
+}
+
+bool gl_load_luts(const struct gfx_shader *generic_shader,
+      GLuint *lut_textures)
+{
+   unsigned i;
+   unsigned num_luts = min(generic_shader->luts, GFX_MAX_TEXTURES);
+
+   if (!generic_shader->luts)
+      return true;
+
+   /*  Original shader_glsl.c code only generated one 
+    *  texture handle.  I assume it was a bug, but if not, 
+    *  replace num_luts with 1 when GLSL is used. */
+   glGenTextures(num_luts, lut_textures);
+   for (i = 0; i < num_luts; i++)
+   {
+      struct texture_image img = {0};
+      RARCH_LOG("Loading texture image from: \"%s\" ...\n",
+            generic_shader->lut[i].path);
+
+      if (!texture_image_load(&img, generic_shader->lut[i].path))
+      {
+         RARCH_ERR("Failed to load texture image from: \"%s\"\n",
+               generic_shader->lut[i].path);
+         return false;
+      }
+
+      gl_load_texture_data(lut_textures[i], &img,
+            driver.video->wrap_type_to_enum(generic_shader->lut[i].wrap),
+            generic_shader->lut[i].filter != RARCH_FILTER_NEAREST,
+            generic_shader->lut[i].mipmap);
+      texture_image_free(&img);
+   }
+
+   glBindTexture(GL_TEXTURE_2D, 0);
+   return true;
+}
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 91075fb687..c3d7c6fad8 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -145,6 +145,10 @@ VIDEO CONTEXT
 /*============================================================
 VIDEO SHADERS
 ============================================================ */
+#ifdef HAVE_OPENGL
+#include "../gfx/shader/shader_gl_common.c"
+#endif
+
 #ifdef HAVE_SHADERS
 #include "../gfx/shader/shader_context.c"
 #include "../gfx/shader/shader_parse.c"