diff --git a/Makefile.common b/Makefile.common
index d8c0874d1d..f662157823 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -130,7 +130,7 @@ OBJ += frontend/frontend.o \
 		configuration.o \
 		libretro-common/dynamic/dylib.o \
 		dynamic.o \
-		dynamic_dummy.o \
+		cores/dynamic_dummy.o \
 		libretro-common/queues/message_queue.o \
 		rewind.o \
 		gfx/drivers_font_renderer/bitmapfont.o \
diff --git a/dynamic_dummy.c b/cores/dynamic_dummy.c
similarity index 99%
rename from dynamic_dummy.c
rename to cores/dynamic_dummy.c
index b475eceb63..17d84a0444 100644
--- a/dynamic_dummy.c
+++ b/cores/dynamic_dummy.c
@@ -15,7 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libretro.h"
+#include "../libretro.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/dynamic_dummy.h b/cores/dynamic_dummy.h
similarity index 99%
rename from dynamic_dummy.h
rename to cores/dynamic_dummy.h
index 48cf282a1a..a588303b55 100644
--- a/dynamic_dummy.h
+++ b/cores/dynamic_dummy.h
@@ -19,7 +19,7 @@
 #define DYNAMIC_DUMMY_H__
 
 #include <boolean.h>
-#include "libretro.h"
+#include "../libretro.h"
 
 void libretro_dummy_retro_init(void);
 
diff --git a/libretro-test-gl/Makefile b/cores/libretro-test-gl/Makefile
similarity index 100%
rename from libretro-test-gl/Makefile
rename to cores/libretro-test-gl/Makefile
diff --git a/libretro-test-gl/jni/Android.mk b/cores/libretro-test-gl/jni/Android.mk
similarity index 100%
rename from libretro-test-gl/jni/Android.mk
rename to cores/libretro-test-gl/jni/Android.mk
diff --git a/libretro-test-gl/jni/Application.mk b/cores/libretro-test-gl/jni/Application.mk
similarity index 100%
rename from libretro-test-gl/jni/Application.mk
rename to cores/libretro-test-gl/jni/Application.mk
diff --git a/libretro-test-gl/libretro-test.c b/cores/libretro-test-gl/libretro-test.c
similarity index 100%
rename from libretro-test-gl/libretro-test.c
rename to cores/libretro-test-gl/libretro-test.c
diff --git a/libretro-test-gl/link.T b/cores/libretro-test-gl/link.T
similarity index 100%
rename from libretro-test-gl/link.T
rename to cores/libretro-test-gl/link.T
diff --git a/libretro-test/Makefile b/cores/libretro-test/Makefile
similarity index 100%
rename from libretro-test/Makefile
rename to cores/libretro-test/Makefile
diff --git a/libretro-test/jni/Android.mk b/cores/libretro-test/jni/Android.mk
similarity index 100%
rename from libretro-test/jni/Android.mk
rename to cores/libretro-test/jni/Android.mk
diff --git a/libretro-test/jni/Application.mk b/cores/libretro-test/jni/Application.mk
similarity index 100%
rename from libretro-test/jni/Application.mk
rename to cores/libretro-test/jni/Application.mk
diff --git a/libretro-test/libretro-test.c b/cores/libretro-test/libretro-test.c
similarity index 100%
rename from libretro-test/libretro-test.c
rename to cores/libretro-test/libretro-test.c
diff --git a/libretro-test/link.T b/cores/libretro-test/link.T
similarity index 100%
rename from libretro-test/link.T
rename to cores/libretro-test/link.T
diff --git a/dynamic.c b/dynamic.c
index f7e84e9c0f..766aab064c 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -29,7 +29,7 @@
 
 #include <boolean.h>
 #include "libretro_private.h"
-#include "dynamic_dummy.h"
+#include "cores/dynamic_dummy.h"
 #include "retroarch.h"
 #include "runloop.h"
 #include "configuration.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 613b5c8d77..99afd9eda0 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -548,7 +548,7 @@ DYNAMIC
 ============================================================ */
 #include "../libretro-common/dynamic/dylib.c"
 #include "../dynamic.c"
-#include "../dynamic_dummy.c"
+#include "../cores/dynamic_dummy.c"
 #include "../gfx/video_filter.c"
 #include "../audio/audio_dsp_filter.c"