From 642310e08a5a6b479a78be998f51172da0bf4ebe Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 2 Dec 2016 06:19:27 +0100
Subject: [PATCH] Remove runloop.h header include from many files

---
 menu/cbs/menu_cbs_scan.c    |  1 -
 menu/cbs/menu_cbs_select.c  |  2 --
 menu/drivers/menu_generic.c |  1 -
 menu/drivers/xmb.c          | 17 ++++-------------
 tasks/task_wifi.c           |  1 -
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c
index 38c9aafdf1..dc49656dac 100644
--- a/menu/cbs/menu_cbs_scan.c
+++ b/menu/cbs/menu_cbs_scan.c
@@ -25,7 +25,6 @@
 #include "../menu_setting.h"
 
 #include "../../configuration.h"
-#include "../../runloop.h"
 #include "../../tasks/tasks_internal.h"
 
 #ifndef BIND_ACTION_SCAN
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 97a62dd642..a3fd587761 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -24,8 +24,6 @@
 #include "../menu_cbs.h"
 #include "../menu_setting.h"
 
-#include "../../runloop.h"
-
 #ifndef BIND_ACTION_SELECT
 #define BIND_ACTION_SELECT(cbs, name) \
    cbs->action_select = name; \
diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 304298d3a6..c5bac95d81 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -28,7 +28,6 @@
 #include "../widgets/menu_input_bind_dialog.h"
 
 #include "../../verbosity.h"
-#include "../../runloop.h"
 #include "../../content.h"
 #include "../../retroarch.h"
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 939c00c055..0db55c408f 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2531,19 +2531,10 @@ static void xmb_frame(void *data)
          xmb->margins.title.top, 1, 1, TEXT_ALIGN_LEFT,
          width, height, xmb->font);
 
-/* uncomment to print the messages on the XMB status line
-   if (string_is_empty(runloop_msg_queue_pull()))
-   {*/
-      if (menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0)
-         xmb_draw_text(xmb, title_msg, xmb->margins.title.left,
-               height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT,
-               width, height, xmb->font);
-/*   }
-   else
-      xmb_draw_text(xmb, runloop_msg_queue_pull(), xmb->margins.title.left,
-         height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT,
-         width, height);
-*/
+   if (menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0)
+      xmb_draw_text(xmb, title_msg, xmb->margins.title.left,
+            height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT,
+            width, height, xmb->font);
 
    rotate_draw.matrix       = &mymat;
    rotate_draw.rotation     = 0;
diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c
index 86476e7fb5..95b71108f6 100644
--- a/tasks/task_wifi.c
+++ b/tasks/task_wifi.c
@@ -26,7 +26,6 @@
 
 #include "tasks_internal.h"
 #include "../verbosity.h"
-#include "../runloop.h"
 #include "../wifi/wifi_driver.h"
 #include "../menu/menu_entries.h"
 #include "../menu/menu_driver.h"