diff --git a/Makefile.common b/Makefile.common
index 06c93475d7..8990771f76 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -122,7 +122,6 @@ OBJ += frontend/frontend.o \
        intl/msg_hash_pt.o \
        intl/msg_hash_us.o \
        runloop.o \
-       runloop_data.o \
        tasks/tasks.o \
        tasks/task_file_transfer.o \
        content.o \
diff --git a/command_event.c b/command_event.c
index b2ad163ccd..ad5a002a27 100644
--- a/command_event.c
+++ b/command_event.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "verbosity.h"
-#include "runloop_data.h"
+#include "runloop.h"
 #include "configuration.h"
 #include "input/input_remapping.h"
 
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index f0e5b894c2..c266eeedda 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -24,7 +24,6 @@
 #include "../frontend.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../runloop_data.h"
 #include "../frontend_driver.h"
 
 static void emscripten_mainloop(void)
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 8b7af73ba1..e898bff698 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -28,7 +28,6 @@
 #include "../driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"
-#include "../runloop_data.h"
 #include "../verbosity.h"
 
 #define MAX_ARGS 32
diff --git a/griffin/griffin.c b/griffin/griffin.c
index f117d754c7..d1b7c8d33e 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -703,7 +703,6 @@ RETROARCH
 #include "../libretro_version_1.c"
 #include "../retroarch.c"
 #include "../runloop.c"
-#include "../runloop_data.c"
 #include "../system.c"
 #include "../tasks/tasks.c"
 
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index f9bbbd2a43..736cf7173f 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -24,7 +24,6 @@
 #include "../menu_hash.h"
 
 #include "../../general.h"
-#include "../../runloop_data.h"
 #include "../../tasks/tasks.h"
 #include "../../input/input_remapping.h"
 #include "../../system.h"
diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c
index dc78028605..e4586d9712 100644
--- a/menu/cbs/menu_cbs_scan.c
+++ b/menu/cbs/menu_cbs_scan.c
@@ -21,7 +21,7 @@
 #include "../menu_entry.h"
 #include "../menu_setting.h"
 
-#include "../../runloop_data.h"
+#include "../../runloop.h"
 #include "../../tasks/tasks.h"
 
 #ifndef BIND_ACTION_SCAN
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index dedc634dc5..972a5dea93 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -18,7 +18,7 @@
 #include "../menu_cbs.h"
 #include "../menu_setting.h"
 
-#include "../../runloop_data.h"
+#include "../../runloop.h"
 
 #ifndef BIND_ACTION_SELECT
 #define BIND_ACTION_SELECT(cbs, name) \
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 4387bd93ad..44ee6b47f0 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -38,7 +38,6 @@
 
 #include "../../configuration.h"
 #include "../../runloop.h"
-#include "../../runloop_data.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks.h"
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 411c7680c6..e76c8d8b7e 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -45,7 +45,6 @@
 #include "../../file_ext.h"
 
 #include "../../runloop.h"
-#include "../../runloop_data.h"
 #include "../../tasks/tasks.h"
 
 #ifndef XMB_THEME
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 8833977ed7..02c1616d94 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -40,7 +40,7 @@
 #include "../menu_entry.h"
 #include "../menu_display.h"
 #include "../menu_hash.h"
-#include "../../runloop_data.h"
+#include "../../runloop.h"
 
 #include "../../gfx/font_driver.h"
 
diff --git a/menu/menu.c b/menu/menu.c
index 3b89c02c90..5d4d7dd3bf 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -24,7 +24,6 @@
 
 #include "../general.h"
 #include "../frontend/frontend.h"
-#include "../runloop_data.h"
 
 static void menu_environment_get(int *argc, char *argv[],
       void *args, void *params_data)
diff --git a/retroarch.c b/retroarch.c
index 10d439e57b..aca08751cf 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -44,7 +44,7 @@
 #include "libretro_version_1.h"
 #include "configuration.h"
 #include "general.h"
-#include "runloop_data.h"
+#include "runloop.h"
 #include "tasks/tasks.h"
 #include "performance.h"
 #include "cheats.h"
diff --git a/runloop.c b/runloop.c
index be2297ab3c..e6ce174b1d 100644
--- a/runloop.c
+++ b/runloop.c
@@ -36,11 +36,11 @@
 #include "performance.h"
 #include "retroarch.h"
 #include "runloop.h"
-#include "runloop_data.h"
 #include "audio/audio_driver.h"
 
 #include "msg_hash.h"
 
+#include "tasks/tasks.h"
 #include "input/input_keyboard.h"
 #include "input/input_driver.h"
 #include "ui/ui_companion_driver.h"
@@ -1182,3 +1182,24 @@ end:
 
    return 0;
 }
+
+void rarch_main_data_deinit(void)
+{
+   rarch_task_deinit();
+}
+
+void rarch_main_data_iterate(void)
+{
+   rarch_task_check();
+}
+
+void rarch_main_data_clear_state(void)
+{
+   rarch_main_data_deinit();
+   rarch_task_init();
+}
+
+void data_runloop_osd_msg(const char *msg, size_t len)
+{
+   rarch_main_msg_queue_push(msg, 1, 10, true);
+}
diff --git a/runloop.h b/runloop.h
index 6e848345cd..6c57385df6 100644
--- a/runloop.h
+++ b/runloop.h
@@ -352,6 +352,14 @@ const char *rarch_main_msg_queue_pull(void);
 
 bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data);
 
+typedef int (*transfer_cb_t)(void *data, size_t len);
+
+void rarch_main_data_clear_state(void);
+
+void rarch_main_data_iterate(void);
+
+void rarch_main_data_deinit(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/runloop_data.c b/runloop_data.c
deleted file mode 100644
index 500e7e28b1..0000000000
--- a/runloop_data.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  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/>.
- */
-
-#include <compat/strl.h>
-
-#include "runloop_data.h"
-#include "runloop.h"
-
-#include "tasks/tasks.h"
-
-void rarch_main_data_deinit(void)
-{
-   rarch_task_deinit();
-}
-
-void rarch_main_data_iterate(void)
-{
-   rarch_task_check();
-}
-
-void rarch_main_data_clear_state(void)
-{
-   rarch_main_data_deinit();
-   rarch_task_init();
-}
-
-void data_runloop_osd_msg(const char *msg, size_t len)
-{
-   rarch_main_msg_queue_push(msg, 1, 10, true);
-}
diff --git a/runloop_data.h b/runloop_data.h
deleted file mode 100644
index ed28825326..0000000000
--- a/runloop_data.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  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 <retro_miscellaneous.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef int (*transfer_cb_t)(void *data, size_t len);
-
-void rarch_main_data_clear_state(void);
-
-void rarch_main_data_iterate(void);
-
-void rarch_main_data_deinit(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/tasks/tasks.h b/tasks/tasks.h
index 92bd0b86c4..285a7d6856 100644
--- a/tasks/tasks.h
+++ b/tasks/tasks.h
@@ -21,7 +21,7 @@
 
 #include <queues/message_queue.h>
 
-#include "../runloop_data.h"
+#include "../runloop.h"
 
 #define MAX_TOKEN_LEN 255
 
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 410c4f54e2..a4ce4b0ec3 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -28,7 +28,7 @@
 #include "../../input/drivers/cocoa_input.h"
 #include "../../input/drivers_keyboard/keyboard_event_apple.h"
 #include "../../frontend/frontend.h"
-#include "../../runloop_data.h"
+#include "../../runloop.h"
 
 static id apple_platform;
 
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index ecf7d20e62..56be6e52fd 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -30,7 +30,7 @@
 #include "../../retroarch.h"
 
 #include "../../frontend/frontend.h"
-#include "../../runloop_data.h"
+#include "../../runloop.h"
 
 static char msg_old[PATH_MAX_LENGTH];
 static id apple_platform;