diff --git a/core_type.h b/core_type.h
new file mode 100644
index 0000000000..a14f009489
--- /dev/null
+++ b/core_type.h
@@ -0,0 +1,27 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CORE_TYPE_H
+#define __CORE_TYPE_H
+
+enum rarch_core_type 
+{
+   CORE_TYPE_PLAIN = 0,
+   CORE_TYPE_DUMMY,
+   CORE_TYPE_FFMPEG,
+   CORE_TYPE_IMAGEVIEWER
+};
+
+#endif
diff --git a/dynamic.c b/dynamic.c
index 0506c69ef7..a265907cba 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -29,7 +29,9 @@
 #include "config.h"
 #endif
 
+#include "dynamic.h"
 #include "command_event.h"
+
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"
 #include "location/location_driver.h"
diff --git a/dynamic.h b/dynamic.h
index 570414be36..f072f78a7a 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -19,20 +19,13 @@
 
 #include <boolean.h>
 
+#include "core_type.h"
 #include "libretro.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-enum rarch_core_type 
-{
-   CORE_TYPE_PLAIN = 0,
-   CORE_TYPE_DUMMY,
-   CORE_TYPE_FFMPEG,
-   CORE_TYPE_IMAGEVIEWER
-};
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libretro_version_1.c b/libretro_version_1.c
index 404402c3f5..20e3368065 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -25,6 +25,7 @@
 #include <boolean.h>
 #include <lists/string_list.h>
 
+#include "dynamic.h"
 #include "libretro.h"
 #include "libretro_version_1.h"
 #include "general.h"
diff --git a/retroarch.c b/retroarch.c
index c9b1645d13..4562fcf84d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -45,6 +45,7 @@
 #include <retro_assert.h>
 
 #include "content.h"
+#include "core_type.h"
 #include "core_info.h"
 #include "msg_hash.h"
 #include "movie.h"
diff --git a/runloop.h b/runloop.h
index 90b6afcc86..261c31a1a2 100644
--- a/runloop.h
+++ b/runloop.h
@@ -19,7 +19,6 @@
 #include <retro_miscellaneous.h>
 
 #include "configuration.h"
-#include "dynamic.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 8414bebab2..25e881e6b9 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -21,6 +21,7 @@
 
 #include <queues/task_queue.h>
 
+#include "../core_type.h"
 #include "../runloop.h"
 
 #ifdef __cplusplus