diff --git a/runloop_data.c b/runloop_data.c
index d39ee0220f..ae2bda4f1d 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -14,14 +14,17 @@
  */
 
 #include <retro_miscellaneous.h>
-#include "runloop_data.h"
-#include "general.h"
-#include "input/input_overlay.h"
-
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
 #endif
 
+#include "general.h"
+
+#include "runloop_data.h"
+#include "tasks/tasks.h"
+#include "input/input_overlay.h"
+
+
 #ifdef HAVE_MENU
 #include "menu/menu.h"
 #include "menu/menu_entries.h"
diff --git a/runloop_data.h b/runloop_data.h
index e88ad73fbd..c2363b1e3d 100644
--- a/runloop_data.h
+++ b/runloop_data.h
@@ -16,12 +16,10 @@
 #ifndef __RETROARCH_DATA_RUNLOOP_H
 #define __RETROARCH_DATA_RUNLOOP_H
 
-#include <queues/message_queue.h>
 #include <retro_miscellaneous.h>
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
 #endif
-#include "tasks/tasks.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tasks/tasks.h b/tasks/tasks.h
index 8c74906891..68275f4dae 100644
--- a/tasks/tasks.h
+++ b/tasks/tasks.h
@@ -18,6 +18,9 @@
 
 #include <stdint.h>
 #include <boolean.h>
+
+#include <queues/message_queue.h>
+
 #include "../runloop_data.h"
 
 #ifdef __cplusplus