diff --git a/Makefile b/Makefile
index c4405f4e6a..0599260196 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ OBJ = frontend/frontend.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
 		gfx/scaler/filter.o \
-		gfx/image.o \
+		gfx/image/image.o \
 		gfx/fonts/fonts.o \
 		gfx/fonts/bitmapfont.o \
 		audio/resampler.o \
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 319ce2b79b..a39bf8c8eb 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -35,7 +35,7 @@ OBJ = frontend/platform/platform_emscripten.o \
 		gfx/shader_parse.o \
 		gfx/fonts/fonts.o \
 		gfx/fonts/bitmapfont.o \
-		gfx/image.o \
+		gfx/image/image.o \
 		audio/resampler.o \
 		audio/sinc.o \
 		audio/null.o \
diff --git a/Makefile.win b/Makefile.win
index 5c6198c6e4..bedd89219f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -40,7 +40,7 @@ OBJ = frontend/frontend.o \
 		gfx/shader_parse.o \
 		gfx/fonts/fonts.o \
 		gfx/fonts/bitmapfont.o \
-		gfx/image.o \
+		gfx/image/image.o \
 		audio/resampler.o \
 		audio/sinc.o \
 		performance.o
diff --git a/driver.h b/driver.h
index 0cd587bcf4..a8aed837d4 100644
--- a/driver.h
+++ b/driver.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "msvc/msvc_compat.h"
 #include "gfx/scaler/scaler.h"
-#include "gfx/image.h"
+#include "gfx/image/image.h"
 #include "input/overlay.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c
index 72efb60cb9..6ebbbdc811 100644
--- a/gfx/context/androidegl_ctx.c
+++ b/gfx/context/androidegl_ctx.c
@@ -22,7 +22,7 @@
 #include <EGL/egl.h>
 
 #include "../../frontend/platform/platform_android.h"
-#include "../image.h"
+#include "../image/image.h"
 
 #include "../fonts/gl_font.h"
 #include <stdint.h>
diff --git a/gfx/context/apple_gl_ctx.c b/gfx/context/apple_gl_ctx.c
index 6d2c916027..10977c2a65 100644
--- a/gfx/context/apple_gl_ctx.c
+++ b/gfx/context/apple_gl_ctx.c
@@ -17,7 +17,7 @@
 #include "../../driver.h"
 #include "../gfx_common.h"
 #include "../gl_common.h"
-#include "../image.h"
+#include "../image/image.h"
 
 #include "../fonts/gl_font.h"
 #include <stdint.h>
diff --git a/gfx/context/bbqnx_ctx.c b/gfx/context/bbqnx_ctx.c
index 54affea66e..3aebf3e718 100644
--- a/gfx/context/bbqnx_ctx.c
+++ b/gfx/context/bbqnx_ctx.c
@@ -27,7 +27,7 @@
 #include <sys/platform.h>
 #include <GLES2/gl2.h>
 
-#include "../image.h"
+#include "../image/image.h"
 
 #include "../fonts/gl_font.h"
 #include <stdint.h>
diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index cd54f244eb..92b612cba7 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -37,7 +37,6 @@
 #endif
 
 #include "../gl_common.h"
-#include "../image.h"
 
 #include "../gfx_context.h"
 #include "../fonts/gl_font.h"
diff --git a/gfx/context/x11_common.c b/gfx/context/x11_common.c
index 4d3bd35b65..e492c2320b 100644
--- a/gfx/context/x11_common.c
+++ b/gfx/context/x11_common.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
-#include "../image.h"
+#include "../image/image.h"
 #include "../../general.h"
 #include "../../input/input_common.h"
 #include "../../input/keyboard_line.h"
diff --git a/gfx/gl.c b/gfx/gl.c
index b6367240de..de07b38f5c 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -22,7 +22,7 @@
 #include "../driver.h"
 #include "../performance.h"
 #include "scaler/scaler.h"
-#include "image.h"
+#include "image/image.h"
 #include "../file.h"
 
 #include <stdint.h>
diff --git a/gfx/image.c b/gfx/image/image.c
similarity index 98%
rename from gfx/image.c
rename to gfx/image/image.c
index 73b348fdb4..c1bb249d22 100644
--- a/gfx/image.c
+++ b/gfx/image/image.c
@@ -14,17 +14,17 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
 #include "image.h"
-#include "../file.h"
+#include "../../file.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
-#include "../general.h"
-#include "rpng/rpng.h"
+#include "../../general.h"
+#include "../rpng/rpng.h"
 
 #ifdef HAVE_SDL_IMAGE
 
diff --git a/gfx/image.h b/gfx/image/image.h
similarity index 95%
rename from gfx/image.h
rename to gfx/image/image.h
index 990017fc64..aee2bc7e1a 100644
--- a/gfx/image.h
+++ b/gfx/image/image.h
@@ -17,11 +17,11 @@
 #define __RARCH_IMAGE_H
 
 #include <stdint.h>
-#include "../boolean.h"
+#include "../../boolean.h"
 
 #ifdef _XBOX1
 #include <xtl.h>
-#include "../xdk/xdk_defines.h"
+#include "../../xdk/xdk_defines.h"
 #endif
 
 struct texture_image
diff --git a/ps3/image.c b/gfx/image/image_ps3.c
similarity index 98%
rename from ps3/image.c
rename to gfx/image/image_ps3.c
index 6b743fb083..229ca56c08 100644
--- a/ps3/image.c
+++ b/gfx/image/image_ps3.c
@@ -15,17 +15,17 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
-#include "../gfx/image.h"
+#include "image.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
-#include "../general.h"
+#include "../../general.h"
 
-#include "sdk_defines.h"
+#include "../../ps3/sdk_defines.h"
 
 #ifdef __PSL1GHT__
 #include <ppu-asm.h>
diff --git a/xdk/image.c b/gfx/image/image_xdk1.c
similarity index 97%
rename from xdk/image.c
rename to gfx/image/image_xdk1.c
index a83a7324e3..484f1964cf 100644
--- a/xdk/image.c
+++ b/gfx/image/image_xdk1.c
@@ -14,8 +14,8 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../gfx/image.h"
-#include "xdk_d3d.h"
+#include "image.h"
+#include "../../xdk/xdk_d3d.h"
 
 bool texture_image_load(const char *path, struct texture_image *out_img)
 {
@@ -62,4 +62,3 @@ void texture_image_free(struct texture_image *img)
       img->pixels->Release();
    memset(img, 0, sizeof(*img));
 }
-
diff --git a/gfx/shader_cg.c b/gfx/shader_cg.c
index 02ade8e19d..e1a162cf10 100644
--- a/gfx/shader_cg.c
+++ b/gfx/shader_cg.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include "../compat/strl.h"
 #include "../conf/config_file.h"
-#include "image.h"
+#include "image/image.h"
 #include "../dynamic.h"
 #include "../compat/posix_string.h"
 #include "../file.h"
diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c
index e8572fbb6a..1fa63718f7 100644
--- a/gfx/shader_glsl.c
+++ b/gfx/shader_glsl.c
@@ -55,7 +55,7 @@
 #include <stdlib.h>
 
 #include "gl_common.h"
-#include "image.h"
+#include "image/image.h"
 
 #ifdef HAVE_OPENGLES2
 #define BORDER_FUNC GL_CLAMP_TO_EDGE
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 90f5edc83a..ce7d9692f8 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -159,11 +159,11 @@ VIDEO IMAGE
 ============================================================ */
 
 #if defined(__CELLOS_LV2__)
-#include "../ps3/image.c"
+#include "../gfx/image/image_ps3.c"
 #elif defined(_XBOX1)
-#include "../xdk/image.c"
+#include "../gfx/image/image_xdk1.c"
 #else
-#include "../gfx/image.c"
+#include "../gfx/image/image.c"
 #endif
 
 #if defined(WANT_RPNG) || defined(RARCH_MOBILE)
diff --git a/input/overlay.c b/input/overlay.c
index bae349ce2c..ddb1b1754f 100644
--- a/input/overlay.c
+++ b/input/overlay.c
@@ -17,7 +17,7 @@
 #include "../general.h"
 #include "../driver.h"
 #include "../libretro.h"
-#include "../gfx/image.h"
+#include "../gfx/image/image.h"
 #include "../conf/config_file.h"
 #include "../compat/posix_string.h"
 #include "input_common.h"
diff --git a/xdk/xdk_d3d.h b/xdk/xdk_d3d.h
index 347924a723..9655491cd0 100644
--- a/xdk/xdk_d3d.h
+++ b/xdk/xdk_d3d.h
@@ -21,7 +21,7 @@
 #ifdef _XBOX1
 #include <xfont.h>
 #endif
-#include "../gfx/image.h"
+#include "../gfx/image/image.h"
 #include "../gfx/fonts/d3d_font.h"
 
 #include "../gfx/gfx_context.h"