diff --git a/Makefile.common b/Makefile.common
index 8ca26bb95a..6f8b3eeb4f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -218,7 +218,7 @@ OBJ += gfx/image/image.o
 
 ifeq ($(HAVE_IMAGEVIEWER), 1)
 DEFINES += -DHAVE_IMAGEVIEWER
-OBJ += cores/image_core.o
+OBJ += cores/libretro-imageviewer/image_core.o
 endif
 
 # Qt
diff --git a/cores/image_core.c b/cores/libretro-imageviewer/image_core.c
similarity index 99%
rename from cores/image_core.c
rename to cores/libretro-imageviewer/image_core.c
index ff9dc08246..866bcae534 100644
--- a/cores/image_core.c
+++ b/cores/libretro-imageviewer/image_core.c
@@ -20,11 +20,11 @@
 #define STBI_SUPPORT_ZLIB
 #endif
 
-#include "../deps/stb/stb_image.h"
+#include "../../deps/stb/stb_image.h"
 
 #ifdef RARCH_INTERNAL
 #include "internal_cores.h"
-#include "../libretro.h"
+#include "../../libretro.h"
 #define IMAGE_CORE_PREFIX(s) libretro_imageviewer_##s
 #else
 #include "libretro.h"
diff --git a/cores/libretro-imageviewer/internal_cores.h b/cores/libretro-imageviewer/internal_cores.h
new file mode 100644
index 0000000000..7e1a2aab98
--- /dev/null
+++ b/cores/libretro-imageviewer/internal_cores.h
@@ -0,0 +1 @@
+#include "../internal_cores.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d9ea65dbda..52ca2df197 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -196,7 +196,7 @@ VIDEO IMAGE
 #include "../libretro-common/formats/tga/rtga.c"
 
 #ifdef HAVE_IMAGEVIEWER
-#include "../cores/image_core.c"
+#include "../cores/libretro-imageviewer/image_core.c"
 #endif
 
 #ifdef HAVE_RPNG