diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 05aa052d..3a076dc3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -235,11 +235,11 @@ if OPENGL
 snes9x_gtk_SOURCES += \
     src/gtk_display_driver_opengl.cpp \
     src/gtk_display_driver_opengl.h \
-    src/shaders/CGLCG.cpp \
-    src/shaders/cgFunctions.cpp \
-    src/shaders/CCGShader.cpp \
-    src/shaders/glsl.cpp \
-    src/shaders/shader_helpers.cpp \
+    ../shaders/CGLCG.cpp \
+    ../shaders/cgFunctions.cpp \
+    ../shaders/CCGShader.cpp \
+    ../shaders/glsl.cpp \
+    ../shaders/shader_helpers.cpp \
     src/gtk_shader_parameters.cpp
 endif
 
diff --git a/gtk/src/shaders/CCGShader.cpp b/shaders/CCGShader.cpp
similarity index 100%
rename from gtk/src/shaders/CCGShader.cpp
rename to shaders/CCGShader.cpp
diff --git a/gtk/src/shaders/CCGShader.h b/shaders/CCGShader.h
similarity index 100%
rename from gtk/src/shaders/CCGShader.h
rename to shaders/CCGShader.h
diff --git a/gtk/src/shaders/CGLCG.cpp b/shaders/CGLCG.cpp
similarity index 99%
rename from gtk/src/shaders/CGLCG.cpp
rename to shaders/CGLCG.cpp
index 0219ab9b..352d6bfa 100644
--- a/gtk/src/shaders/CGLCG.cpp
+++ b/shaders/CGLCG.cpp
@@ -190,12 +190,11 @@
   Nintendo Co., Limited and its subsidiary companies.
  ***********************************************************************************/
 #include "CGLCG.h"
-#include "../gtk_s9x.h"
 #include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../gtk_display_driver_opengl.h"
+#include "snes9x.h"
 #include "shader_helpers.h"
 
 static char* ReadShaderFileContents(const char *filename)
diff --git a/gtk/src/shaders/CGLCG.h b/shaders/CGLCG.h
similarity index 100%
rename from gtk/src/shaders/CGLCG.h
rename to shaders/CGLCG.h
diff --git a/gtk/src/shaders/cgFunctions.cpp b/shaders/cgFunctions.cpp
similarity index 100%
rename from gtk/src/shaders/cgFunctions.cpp
rename to shaders/cgFunctions.cpp
diff --git a/gtk/src/shaders/cgFunctions.h b/shaders/cgFunctions.h
similarity index 100%
rename from gtk/src/shaders/cgFunctions.h
rename to shaders/cgFunctions.h
diff --git a/gtk/src/shaders/cgMini.h b/shaders/cgMini.h
similarity index 100%
rename from gtk/src/shaders/cgMini.h
rename to shaders/cgMini.h
diff --git a/gtk/src/shaders/glsl.cpp b/shaders/glsl.cpp
similarity index 99%
rename from gtk/src/shaders/glsl.cpp
rename to shaders/glsl.cpp
index d5f50d68..e5eb5dd8 100644
--- a/gtk/src/shaders/glsl.cpp
+++ b/shaders/glsl.cpp
@@ -1,6 +1,7 @@
 #include "glsl.h"
 #include "../../conffile.h"
 #include "shader_helpers.h"
+#include "shader_platform.h"
 
 static const GLfloat tex_coords[16] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f,
                                         0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f };
diff --git a/gtk/src/shaders/glsl.h b/shaders/glsl.h
similarity index 100%
rename from gtk/src/shaders/glsl.h
rename to shaders/glsl.h
diff --git a/gtk/src/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp
similarity index 100%
rename from gtk/src/shaders/shader_helpers.cpp
rename to shaders/shader_helpers.cpp
diff --git a/gtk/src/shaders/shader_helpers.h b/shaders/shader_helpers.h
similarity index 100%
rename from gtk/src/shaders/shader_helpers.h
rename to shaders/shader_helpers.h
diff --git a/gtk/src/shaders/shader_platform.h b/shaders/shader_platform.h
similarity index 100%
rename from gtk/src/shaders/shader_platform.h
rename to shaders/shader_platform.h