# HG changeset patch
# User ib
# Date 1364771374 0
# Node ID c667e34fb941ace75442b66b12be2538e9d1b28c
# Parent  8ae2e20462a7624346eb0b7cfb52edb007bd4e19
Cosmetic: Rearrange #includes.

diff -r 8ae2e20462a7 -r c667e34fb941 gui/app/cfg.c
--- a/gui/app/cfg.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/app/cfg.c	Sun Mar 31 23:09:34 2013 +0000
@@ -28,11 +28,6 @@
 
 #include "config.h"
 #include "help_mp.h"
-#include "libavutil/common.h"
-#include "libmpcodecs/vd.h"
-#include "libmpdemux/demuxer.h"
-#include "libvo/video_out.h"
-#include "libvo/x11_common.h"
 #include "mixer.h"
 #include "mp_core.h"
 #include "mp_msg.h"
@@ -40,6 +35,11 @@
 #include "mplayer.h"
 #include "parser-cfg.h"
 #include "path.h"
+#include "libavutil/common.h"
+#include "libmpcodecs/vd.h"
+#include "libmpdemux/demuxer.h"
+#include "libvo/video_out.h"
+#include "libvo/x11_common.h"
 #include "stream/stream.h"
 #include "sub/ass_mp.h"
 #include "sub/font_load.h"
diff -r 8ae2e20462a7 -r c667e34fb941 gui/dialog/fileselect.c
--- a/gui/dialog/fileselect.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/dialog/fileselect.c	Sun Mar 31 23:09:34 2013 +0000
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <unistd.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "fileselect.h"
 #include "dialog.h"
@@ -30,10 +30,10 @@
 #include "pixmaps/dir.xpm"
 #include "pixmaps/file.xpm"
 #include "pixmaps/up.xpm"
+#include "gui/interface.h"
 #include "gui/app/app.h"
 #include "gui/app/cfg.h"
 #include "gui/app/gui.h"
-#include "gui/interface.h"
 #include "gui/ui/actions.h"
 #include "gui/util/list.h"
 #include "gui/util/mem.h"
@@ -44,8 +44,8 @@
 
 #include "config.h"
 #include "help_mp.h"
+#include "mpcommon.h"
 #include "libavutil/common.h"
-#include "mpcommon.h"
 #include "stream/stream.h"
 
 #ifdef __linux__
diff -r 8ae2e20462a7 -r c667e34fb941 gui/dialog/url.c
--- a/gui/dialog/url.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/dialog/url.c	Sun Mar 31 23:09:34 2013 +0000
@@ -23,8 +23,8 @@
 #include "url.h"
 #include "dialog.h"
 #include "tools.h"
+#include "gui/interface.h"
 #include "gui/app/app.h"
-#include "gui/interface.h"
 #include "gui/ui/actions.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"
diff -r 8ae2e20462a7 -r c667e34fb941 gui/interface.c
--- a/gui/interface.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/interface.c	Sun Mar 31 23:09:34 2013 +0000
@@ -38,6 +38,11 @@
 #include "codec-cfg.h"
 #include "config.h"
 #include "help_mp.h"
+#include "mixer.h"
+#include "mp_msg.h"
+#include "mpcommon.h"
+#include "mplayer.h"
+#include "path.h"
 #include "input/input.h"
 #include "libaf/equalizer.h"
 #include "libavutil/common.h"
@@ -47,11 +52,6 @@
 #include "libmpcodecs/vf.h"
 #include "libvo/video_out.h"
 #include "libvo/x11_common.h"
-#include "mixer.h"
-#include "mp_msg.h"
-#include "mpcommon.h"
-#include "mplayer.h"
-#include "path.h"
 #ifdef CONFIG_DVDREAD
 #include "stream/stream_dvd.h"
 #endif
diff -r 8ae2e20462a7 -r c667e34fb941 gui/interface.h
--- a/gui/interface.h	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/interface.h	Sun Mar 31 23:09:34 2013 +0000
@@ -19,11 +19,11 @@
 #ifndef MPLAYER_GUI_INTERFACE_H
 #define MPLAYER_GUI_INTERFACE_H
 
-#include "libaf/af.h"
-#include "libmpdemux/stheader.h"
 #include "m_config.h"
 #include "mp_core.h"
 #include "playtree.h"
+#include "libaf/af.h"
+#include "libmpdemux/stheader.h"
 #include "stream/stream.h"
 
 // These are in support of the non-GUI files that interact with
diff -r 8ae2e20462a7 -r c667e34fb941 gui/skin/font.c
--- a/gui/skin/font.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/skin/font.c	Sun Mar 31 23:09:34 2013 +0000
@@ -32,8 +32,8 @@
 #include "gui/util/mem.h"
 #include "gui/util/string.h"
 
+#include "mp_msg.h"
 #include "libavutil/avstring.h"
-#include "mp_msg.h"
 
 #define MAX_FONTS 25
 
diff -r 8ae2e20462a7 -r c667e34fb941 gui/skin/skin.c
--- a/gui/skin/skin.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/skin/skin.c	Sun Mar 31 23:09:34 2013 +0000
@@ -26,17 +26,17 @@
 
 #include "skin.h"
 #include "font.h"
+#include "gui/interface.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/dialog/dialog.h"
-#include "gui/interface.h"
 #include "gui/util/cut.h"
 #include "gui/util/string.h"
 
 #include "help_mp.h"
+#include "mp_msg.h"
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
-#include "mp_msg.h"
 
 typedef struct {
     const char *name;
diff -r 8ae2e20462a7 -r c667e34fb941 gui/ui/actions.c
--- a/gui/ui/actions.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/ui/actions.c	Sun Mar 31 23:09:34 2013 +0000
@@ -26,11 +26,11 @@
 
 #include "actions.h"
 #include "ui.h"
+#include "gui/interface.h"
 #include "gui/app/app.h"
 #include "gui/app/cfg.h"
 #include "gui/app/gui.h"
 #include "gui/dialog/dialog.h"
-#include "gui/interface.h"
 #include "gui/skin/skin.h"
 #include "gui/util/list.h"
 #include "gui/util/mem.h"
@@ -41,18 +41,18 @@
 #include "access_mpcontext.h"
 #include "config.h"
 #include "help_mp.h"
+#include "m_property.h"
+#include "mixer.h"
+#include "mp_core.h"
+#include "mp_msg.h"
+#include "mpcommon.h"
+#include "mplayer.h"
 #include "input/input.h"
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/demuxer.h"
 #include "libvo/video_out.h"
 #include "libvo/wskeys.h"
 #include "libvo/x11_common.h"
-#include "m_property.h"
-#include "mixer.h"
-#include "mp_core.h"
-#include "mp_msg.h"
-#include "mpcommon.h"
-#include "mplayer.h"
 #include "osdep/timer.h"
 #include "stream/stream.h"
 #include "sub/sub.h"
diff -r 8ae2e20462a7 -r c667e34fb941 gui/ui/render.c
--- a/gui/ui/render.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/ui/render.c	Sun Mar 31 23:09:34 2013 +0000
@@ -27,8 +27,8 @@
 #include "gui/util/string.h"
 
 #include "access_mpcontext.h"
+#include "mixer.h"
 #include "libavutil/avstring.h"
-#include "mixer.h"
 #include "osdep/timer.h"
 #include "stream/stream.h"
 
diff -r 8ae2e20462a7 -r c667e34fb941 gui/util/bitmap.c
--- a/gui/util/bitmap.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/util/bitmap.c	Sun Mar 31 23:09:34 2013 +0000
@@ -30,11 +30,11 @@
 #include "gui/app/gui.h"
 
 #include "help_mp.h"
+#include "mp_msg.h"
 #include "libavcodec/avcodec.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libvo/fastmemcpy.h"
-#include "mp_msg.h"
 
 /**
  * @brief Check whether a (PNG) file exists.
diff -r 8ae2e20462a7 -r c667e34fb941 gui/util/string.c
--- a/gui/util/string.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/util/string.c	Sun Mar 31 23:09:34 2013 +0000
@@ -25,8 +25,8 @@
 #include <string.h>
 
 #include "string.h"
+#include "gui/interface.h"
 #include "gui/app/gui.h"
-#include "gui/interface.h"
 
 #include "config.h"
 #include "help_mp.h"
diff -r 8ae2e20462a7 -r c667e34fb941 gui/wm/ws.c
--- a/gui/wm/ws.c	Sun Mar 31 22:45:25 2013 +0000
+++ b/gui/wm/ws.c	Sun Mar 31 23:09:34 2013 +0000
@@ -31,15 +31,15 @@
 
 #include "config.h"
 #include "help_mp.h"
+#include "mp_core.h"
+#include "mp_msg.h"
+#include "mpbswap.h"
+#include "mplayer.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/pixfmt.h"
 #include "libswscale/swscale.h"
 #include "libvo/video_out.h"
 #include "libvo/x11_common.h"
-#include "mpbswap.h"
-#include "mplayer.h"
-#include "mp_core.h"
-#include "mp_msg.h"
 #include "osdep/timer.h"
 
 #ifdef HAVE_SHM