diff --git a/Makefile.common b/Makefile.common
index 9e9d147471..9d7b5f77e7 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -117,8 +117,8 @@ OBJ += frontend/frontend.o \
 		conf/config_file_userdata.o \
 		screenshot.o \
 		gfx/scaler/scaler.o \
-		gfx/shader_common.o \
-		gfx/shader_parse.o \
+		gfx/shader/shader_common.o \
+		gfx/shader/shader_parse.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
 		gfx/scaler/scaler_filter.o \
@@ -413,7 +413,7 @@ ifeq ($(HAVE_OPENGL), 1)
       endif
    endif
 
-   OBJ += gfx/shader_glsl.o 
+   OBJ += gfx/shader/shader_glsl.o 
    DEFINES += -DHAVE_GLSL
 endif
 
@@ -472,7 +472,7 @@ endif
 
 ifeq ($(HAVE_CG), 1)
 	DEFINES += -DHAVE_CG
-   OBJ += gfx/shader_cg.o
+   OBJ += gfx/shader/shader_cg.o
    LIBS += $(CG_LIBS)
 endif
 
diff --git a/driver.h b/driver.h
index 0945e0968b..e11ec9f662 100644
--- a/driver.h
+++ b/driver.h
@@ -27,7 +27,7 @@
 #include "gfx/scaler/scaler.h"
 #include "gfx/image/image.h"
 #include "gfx/filters/softfilter.h"
-#include "gfx/shader_parse.h"
+#include "gfx/shader/shader_parse.h"
 #include "audio/dsp_filter.h"
 #include "input/overlay.h"
 #include "frontend/frontend_context.h"
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index ecf76c9c2b..142855db1d 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -29,12 +29,12 @@
 #include "../../../general.h"
 #include "../../../gfx/gfx_common.h"
 #include "../../../gfx/gl_common.h"
-#include "../../../gfx/shader_common.h"
+#include "../../../gfx/shader/shader_common.h"
 #include "../../../config.def.h"
 #include "../../../file.h"
 #include "../../../dynamic.h"
 #include "../../../compat/posix_string.h"
-#include "../../../gfx/shader_parse.h"
+#include "../../../gfx/shader/shader_parse.h"
 #include "../../../performance.h"
 #include "../../../input/input_common.h"
 
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index e0d2dc5852..5778c6e8d6 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -31,7 +31,7 @@
 #include "../../input/input_common.h"
 #include "../../input/keyboard_line.h"
 #include "../../performance.h"
-#include "../../gfx/shader_common.h"
+#include "../../gfx/shader/shader_common.h"
 
 #ifdef HAVE_RGUI
 #define MENU_TEXTURE_FULLSCREEN false
diff --git a/frontend/menu/menu_shader.c b/frontend/menu/menu_shader.c
index 5e2b82d18a..98840eb52d 100644
--- a/frontend/menu/menu_shader.c
+++ b/frontend/menu/menu_shader.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../gfx/shader_common.h"
+#include "../../gfx/shader/shader_common.h"
 #include "menu_action.h"
 #include "menu_common.h"
 #include "menu_entries.h"
diff --git a/frontend/menu/menu_shader.h b/frontend/menu/menu_shader.h
index 085265f65e..4db2d85029 100644
--- a/frontend/menu/menu_shader.h
+++ b/frontend/menu/menu_shader.h
@@ -21,7 +21,7 @@
 #define HAVE_SHADER_MANAGER
 #endif
 
-#include "../../gfx/shader_parse.h"
+#include "../../gfx/shader/shader_parse.h"
 
 void menu_shader_manager_init(void *data);
 
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index dc6f5a2658..774ff272a9 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -42,14 +42,14 @@
 #endif
 
 #ifdef HAVE_HLSL
-#include "../../gfx/shader_hlsl.h"
+#include "../../gfx/shader/shader_hlsl.h"
 #endif
 
 #include "d3d_defines.h"
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
 
 #ifdef HAVE_HLSL
-#include "../shader_hlsl.h"
+#include "../shader/shader_hlsl.h"
 #endif
 
 #endif
diff --git a/gfx/d3d/d3d.hpp b/gfx/d3d/d3d.hpp
index f08432fe04..0742ac8090 100644
--- a/gfx/d3d/d3d.hpp
+++ b/gfx/d3d/d3d.hpp
@@ -43,8 +43,8 @@
 #include "../../driver.h"
 
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
-#include "../shader_parse.h"
-#include "../shader_common.h"
+#include "../shader/shader_parse.h"
+#include "../shader/shader_common.h"
 #endif
 
 #include "../fonts/d3d_font.h"
diff --git a/gfx/d3d/render_chain.hpp b/gfx/d3d/render_chain.hpp
index 1d294ef3ca..b2f5e6b643 100644
--- a/gfx/d3d/render_chain.hpp
+++ b/gfx/d3d/render_chain.hpp
@@ -18,7 +18,7 @@
 
 #include "d3d.hpp"
 #include "../state_tracker.h"
-#include "../shader_parse.h"
+#include "../shader/shader_parse.h"
 
 struct Vertex
 {
diff --git a/gfx/fonts/gl_raster_font.c b/gfx/fonts/gl_raster_font.c
index 7a8f679e8f..2e4f8828f9 100644
--- a/gfx/fonts/gl_raster_font.c
+++ b/gfx/fonts/gl_raster_font.c
@@ -16,7 +16,7 @@
 
 #include "../gfx_common.h"
 #include "../gl_common.h"
-#include "../shader_common.h"
+#include "../shader/shader_common.h"
 
 #define emit(c, vx, vy) do { \
    font_vertex[     2 * (6 * i + c) + 0] = (x + (delta_x + off_x + vx * width) * scale) * inv_win_width; \
diff --git a/gfx/gl.c b/gfx/gl.c
index 9fd9106e04..a1346a09cc 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -42,14 +42,14 @@
 #include "../compat/strl.h"
 
 #ifdef HAVE_CG
-#include "shader_cg.h"
+#include "shader/shader_cg.h"
 #endif
 
 #ifdef HAVE_GLSL
-#include "shader_glsl.h"
+#include "shader/shader_glsl.h"
 #endif
 
-#include "shader_common.h"
+#include "shader/shader_common.h"
 
 /* Used for the last pass when rendering to the back buffer. */
 static const GLfloat vertexes_flipped[] = {
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index 69663d24e5..5558bd05a4 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -22,7 +22,7 @@
 #include "gfx_context.h"
 #include "scaler/scaler.h"
 #include "fonts/gl_font.h"
-#include "shader_parse.h"
+#include "shader/shader_parse.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/gfx/shader_cg.c b/gfx/shader/shader_cg.c
similarity index 99%
rename from gfx/shader_cg.c
rename to gfx/shader/shader_cg.c
index 923264e10a..70804ab01f 100644
--- a/gfx/shader_cg.c
+++ b/gfx/shader/shader_cg.c
@@ -22,15 +22,15 @@
 #include "shader_common.h"
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
-#include "../general.h"
+#include "../../general.h"
 #include <string.h>
-#include "../compat/strl.h"
-#include "../conf/config_file.h"
-#include "../dynamic.h"
-#include "../compat/posix_string.h"
-#include "../file.h"
+#include "../../compat/strl.h"
+#include "../../conf/config_file.h"
+#include "../../dynamic.h"
+#include "../../compat/posix_string.h"
+#include "../../file.h"
 
-#include "state_tracker.h"
+#include "../state_tracker.h"
 
 #if 0
 #define RARCH_CG_DEBUG
diff --git a/gfx/shader_cg.h b/gfx/shader/shader_cg.h
similarity index 100%
rename from gfx/shader_cg.h
rename to gfx/shader/shader_cg.h
diff --git a/gfx/shader_common.c b/gfx/shader/shader_common.c
similarity index 98%
rename from gfx/shader_common.c
rename to gfx/shader/shader_common.c
index c95d5b8fb4..3c56bc158e 100644
--- a/gfx/shader_common.c
+++ b/gfx/shader/shader_common.c
@@ -14,7 +14,7 @@
  */
 
 #include "shader_common.h"
-#include "../retroarch_logger.h"
+#include "../../retroarch_logger.h"
 
 #ifdef HAVE_OPENGL
 void gl_load_texture_data(GLuint obj, const struct texture_image *img,
diff --git a/gfx/shader_common.h b/gfx/shader/shader_common.h
similarity index 95%
rename from gfx/shader_common.h
rename to gfx/shader/shader_common.h
index bdecb45d41..d4ca10129d 100644
--- a/gfx/shader_common.h
+++ b/gfx/shader/shader_common.h
@@ -16,18 +16,18 @@
 #ifndef SHADER_COMMON_H__
 #define SHADER_COMMON_H__
 
-#include "../boolean.h"
+#include "../../boolean.h"
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
 #ifdef HAVE_OPENGL
-#include "gl_common.h"
+#include "../gl_common.h"
 #endif
 
-#include "gfx_context.h"
-#include "math/matrix.h"
+#include "../gfx_context.h"
+#include "../math/matrix.h"
 
 #if defined(_XBOX360)
 #define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL
diff --git a/gfx/shader_glsl.c b/gfx/shader/shader_glsl.c
similarity index 99%
rename from gfx/shader_glsl.c
rename to gfx/shader/shader_glsl.c
index 496b0e886b..31c0dc2572 100644
--- a/gfx/shader_glsl.c
+++ b/gfx/shader/shader_glsl.c
@@ -13,26 +13,26 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../boolean.h"
+#include "../../boolean.h"
 #include <string.h>
-#include "../general.h"
+#include "../../general.h"
 #include "shader_glsl.h"
-#include "../compat/strl.h"
-#include "../compat/posix_string.h"
-#include "state_tracker.h"
-#include "../dynamic.h"
-#include "../file.h"
+#include "../../compat/strl.h"
+#include "../../compat/posix_string.h"
+#include "../state_tracker.h"
+#include "../../dynamic.h"
+#include "../../file.h"
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
-#include "glsym/glsym.h"
+#include "../glsym/glsym.h"
 
-#include "gfx_context.h"
+#include "../gfx_context.h"
 #include <stdlib.h>
 
-#include "gl_common.h"
+#include "../gl_common.h"
 
 #ifdef HAVE_OPENGLES2
 #define BORDER_FUNC GL_CLAMP_TO_EDGE
diff --git a/gfx/shader_glsl.h b/gfx/shader/shader_glsl.h
similarity index 97%
rename from gfx/shader_glsl.h
rename to gfx/shader/shader_glsl.h
index 3f55104925..e820a84dec 100644
--- a/gfx/shader_glsl.h
+++ b/gfx/shader/shader_glsl.h
@@ -17,7 +17,7 @@
 #ifndef __RARCH_GLSL_H
 #define __RARCH_GLSL_H
 
-#include "../boolean.h"
+#include "../../boolean.h"
 #include "shader_common.h"
 
 void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*));
diff --git a/gfx/shader_hlsl.c b/gfx/shader/shader_hlsl.c
similarity index 99%
rename from gfx/shader_hlsl.c
rename to gfx/shader/shader_hlsl.c
index 477a55df5e..e0c850e574 100644
--- a/gfx/shader_hlsl.c
+++ b/gfx/shader/shader_hlsl.c
@@ -16,7 +16,7 @@
 
 #include "shader_hlsl.h"
 #include "shader_parse.h"
-#include "d3d/d3d.hpp"
+#include "../d3d/d3d.hpp"
 
 static const char *stock_hlsl_program =
       "void main_vertex\n"
diff --git a/gfx/shader_hlsl.h b/gfx/shader/shader_hlsl.h
similarity index 100%
rename from gfx/shader_hlsl.h
rename to gfx/shader/shader_hlsl.h
diff --git a/gfx/shader_parse.c b/gfx/shader/shader_parse.c
similarity index 99%
rename from gfx/shader_parse.c
rename to gfx/shader/shader_parse.c
index 765d7ba833..d6b6d9fcbb 100644
--- a/gfx/shader_parse.c
+++ b/gfx/shader/shader_parse.c
@@ -16,11 +16,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "shader_parse.h"
-#include "../compat/posix_string.h"
-#include "../msvc/msvc_compat.h"
-#include "../file.h"
-#include "../compat/strl.h"
-#include "../general.h"
+#include "../../compat/posix_string.h"
+#include "../../msvc/msvc_compat.h"
+#include "../../file.h"
+#include "../../compat/strl.h"
+#include "../../general.h"
 
 #define print_buf(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
 
diff --git a/gfx/shader_parse.h b/gfx/shader/shader_parse.h
similarity index 96%
rename from gfx/shader_parse.h
rename to gfx/shader/shader_parse.h
index 4d4d94c46b..4519a426e8 100644
--- a/gfx/shader_parse.h
+++ b/gfx/shader/shader_parse.h
@@ -16,10 +16,10 @@
 #ifndef SHADER_PARSE_H
 #define SHADER_PARSE_H
 
-#include "../boolean.h"
-#include "state_tracker.h"
-#include "../conf/config_file.h"
-#include "../miscellaneous.h"
+#include "../../boolean.h"
+#include "../state_tracker.h"
+#include "../../conf/config_file.h"
+#include "../../miscellaneous.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 17a71d092f..77d1368f7b 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -146,19 +146,19 @@ VIDEO CONTEXT
 VIDEO SHADERS
 ============================================================ */
 #ifdef HAVE_SHADERS
-#include "../gfx/shader_common.c"
-#include "../gfx/shader_parse.c"
+#include "../gfx/shader/shader_common.c"
+#include "../gfx/shader/shader_parse.c"
 
 #ifdef HAVE_CG
-#include "../gfx/shader_cg.c"
+#include "../gfx/shader/shader_cg.c"
 #endif
 
 #ifdef HAVE_HLSL
-#include "../gfx/shader_hlsl.c"
+#include "../gfx/shader/shader_hlsl.c"
 #endif
 
 #ifdef HAVE_GLSL
-#include "../gfx/shader_glsl.c"
+#include "../gfx/shader/shader_glsl.c"
 #endif
 
 #endif
diff --git a/settings_data.c b/settings_data.c
index ed72df5be0..e736c3aee0 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -16,7 +16,6 @@
 
 #include "settings_data.h"
 #include "file_path.h"
-#include "gfx/shader_common.h"
 #include "input/input_common.h"
 #include "config.def.h"
 #include "retroarch_logger.h"