From edc7f21cfeb328671288b55cb2571a1b9c4c20ce Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 5 Jun 2015 18:22:15 +0200
Subject: [PATCH] Cleanups

---
 menu/drivers/glui.c   | 5 +++--
 menu/drivers/rgui.c   | 7 ++++---
 menu/drivers/rmenu.c  | 3 ++-
 menu/drivers/xmb.c    | 6 +++---
 menu/menu_animation.c | 3 ++-
 menu/menu_driver.c    | 1 +
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 325d0134e9..a0ae3b96b1 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -21,17 +21,18 @@
 #include <string.h>
 #include <limits.h>
 
+#include <compat/posix_string.h>
+#include <file/file_path.h>
+
 #include "../menu.h"
 #include "../menu_driver.h"
 #include "../menu_entry.h"
 #include "../menu_display.h"
 #include "../../runloop_data.h"
 
-#include <file/file_path.h>
 #include "../../gfx/video_thread_wrapper.h"
 #include "../../gfx/font_driver.h"
 #include "../../gfx/video_texture.h"
-#include <compat/posix_string.h>
 #include "../../retroarch_logger.h"
 
 #include "shared.h"
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 9a001b0c4f..460d1b32ab 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -21,13 +21,14 @@
 #include <string.h>
 #include <limits.h>
 
-#include "../menu.h"
-#include "../menu_entry.h"
-#include "../menu_display.h"
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <retro_inline.h>
 
+#include "../menu.h"
+#include "../menu_entry.h"
+#include "../menu_display.h"
+
 #include "../../gfx/drivers_font_renderer/bitmap.h"
 
 #include "shared.h"
diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c
index da756fad3f..09fdf04c2b 100644
--- a/menu/drivers/rmenu.c
+++ b/menu/drivers/rmenu.c
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <limits.h>
 
+#include <compat/posix_string.h>
+
 #include "../menu_driver.h"
 #include "../menu_entry.h"
 #include "../menu_input.h"
@@ -28,7 +30,6 @@
 #include "../menu.h"
 #include "../../general.h"
 #include "../../config.def.h"
-#include <compat/posix_string.h>
 #include "../../performance.h"
 
 #include "../../screenshot.h"
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 49fac882aa..6a519a69c4 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -20,6 +20,9 @@
 #include <string.h>
 #include <limits.h>
 
+#include <file/file_path.h>
+#include <compat/posix_string.h>
+#include <string/stdstring.h>
 #include <rhash.h>
 
 #include "../menu.h"
@@ -30,12 +33,9 @@
 
 #include "../menu_entries_cbs.h"
 
-#include <file/file_path.h>
 #include "../../gfx/video_thread_wrapper.h"
 #include "../../gfx/font_driver.h"
 #include "../../gfx/video_texture.h"
-#include <compat/posix_string.h>
-#include <string/stdstring.h>
 
 #include "../../runloop_data.h"
 
diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index d74605dc5b..c8667f91ec 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -14,11 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "menu_animation.h"
 #include <math.h>
 #include <string.h>
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
+
+#include "menu_animation.h"
 #include "../runloop.h"
 
 /* from https://github.com/kikito/tween.lua/blob/master/tween.lua */
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 2dd6e1bd25..0127446860 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -16,6 +16,7 @@
 
 #include <string.h>
 #include <string/string_list.h>
+
 #include "menu_driver.h"
 #include "menu.h"
 #include "menu_entries_cbs.h"