diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index 3c1debba52..09da37dd83 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -22,7 +22,7 @@
 #include "menu_navigation.h"
 
 #include "../retroarch.h"
-#include "../runloop.h"
+#include "../runloop_data.h"
 
 #include "../input/input_remapping.h"
 
diff --git a/retroarch.c b/retroarch.c
index 7ee5a39774..14aa9b4bbd 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -30,6 +30,7 @@
 #include "general.h"
 #include "retroarch.h"
 #include "runloop.h"
+#include "runloop_data.h"
 #include <compat/strl.h>
 #include "screenshot.h"
 #include "performance.h"
diff --git a/runloop.c b/runloop.c
index 888757af3b..17271ec6cf 100644
--- a/runloop.c
+++ b/runloop.c
@@ -24,6 +24,7 @@
 #include "intl/intl.h"
 #include "retroarch.h"
 #include "runloop.h"
+#include "runloop_data.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"
diff --git a/runloop.h b/runloop.h
index 2d1420cc0d..acccac7c5c 100644
--- a/runloop.h
+++ b/runloop.h
@@ -1,5 +1,4 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -17,9 +16,6 @@
 #ifndef __RETROARCH_RUNLOOP_H
 #define __RETROARCH_RUNLOOP_H
 
-#include <file/nbio.h>
-#include <formats/image.h>
-#include <formats/rpng.h>
 #include <queues/message_queue.h>
 #include <setjmp.h>
 #include "libretro.h"
@@ -43,17 +39,6 @@
 extern "C" {
 #endif
 
-enum runloop_data_type
-{
-   DATA_TYPE_NONE = 0,
-   DATA_TYPE_FILE,
-   DATA_TYPE_IMAGE,
-   DATA_TYPE_HTTP,
-#ifdef HAVE_OVERLAY
-   DATA_TYPE_OVERLAY,
-#endif
-};
-
 /* All libretro runloop-related globals go here. */
 
 typedef struct runloop
@@ -466,10 +451,6 @@ void rarch_main_msg_queue_free(void);
 
 void rarch_main_msg_queue_init(void);
 
-void rarch_main_data_msg_queue_push(unsigned type,
-      const char *msg, const char *msg2,
-      unsigned prio, unsigned duration, bool flush);
-
 void rarch_main_clear_state(void);
 
 bool rarch_main_verbosity(void);
@@ -478,20 +459,10 @@ FILE *rarch_main_log_file(void);
 
 bool rarch_main_is_idle(void);
 
-void rarch_main_data_clear_state(void);
-
-void rarch_main_data_iterate(void);
-
 void rarch_main_state_free(void);
 
 void rarch_main_global_free(void);
 
-void rarch_main_data_deinit(void);
-
-void rarch_main_data_free(void);
-
-void rarch_main_data_init_queues(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/runloop_data.c b/runloop_data.c
index c65e9dbf5f..d196c21b5f 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -14,7 +14,7 @@
  */
 
 #include <retro_miscellaneous.h>
-#include "runloop.h"
+#include "runloop_data.h"
 #include "general.h"
 #include "input/input_overlay.h"
 
diff --git a/runloop_data.h b/runloop_data.h
new file mode 100644
index 0000000000..fcfcb7cbd9
--- /dev/null
+++ b/runloop_data.h
@@ -0,0 +1,57 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2015 - 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 __RETROARCH_DATA_RUNLOOP_H
+#define __RETROARCH_DATA_RUNLOOP_H
+
+#include <file/nbio.h>
+#include <formats/image.h>
+#include <formats/rpng.h>
+#include <queues/message_queue.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum runloop_data_type
+{
+   DATA_TYPE_NONE = 0,
+   DATA_TYPE_FILE,
+   DATA_TYPE_IMAGE,
+   DATA_TYPE_HTTP,
+#ifdef HAVE_OVERLAY
+   DATA_TYPE_OVERLAY,
+#endif
+};
+
+void rarch_main_data_msg_queue_push(unsigned type,
+      const char *msg, const char *msg2,
+      unsigned prio, unsigned duration, bool flush);
+
+void rarch_main_data_clear_state(void);
+
+void rarch_main_data_iterate(void);
+
+void rarch_main_data_deinit(void);
+
+void rarch_main_data_free(void);
+
+void rarch_main_data_init_queues(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif