changeset 35702:a1d362602a70

Clean up #includes. Group and order them. Remove unnecessary ones.

--- a/gui/wm/ws.c	Sat Jan 19 21:47:31 2013 +0000
+++ b/gui/wm/ws.c	Sun Jan 20 00:11:55 2013 +0000
@@ -19,50 +19,38 @@
  *           written by pontscho/fresh!mindworkz
  */
 
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
-#include <X11/Xatom.h>
-
-#include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <errno.h>
+#include <sys/ipc.h>
+#include <X11/Xatom.h>
 
-#include <stdint.h>
+#include "ws.h"
+#include "wsxdnd.h"
+#include "gui/interface.h"
 
-#include "gui/interface.h"
 #include "config.h"
-#include "libvo/x11_common.h"
+#include "help_mp.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/pixfmt.h"
+#include "libswscale/swscale.h"
 #include "libvo/video_out.h"
-#include "cpudetect.h"
-#include "libswscale/swscale.h"
-#include "libavutil/imgutils.h"
-#include "libmpcodecs/vf_scale.h"
+#include "libvo/x11_common.h"
+#include "mpbswap.h"
 #include "mp_core.h"
 #include "mp_msg.h"
-#include "help_mp.h"
-#include "mplayer.h"
-#include "mpbswap.h"
 #include "osdep/timer.h"
-#include "ws.h"
-#include "wsxdnd.h"
 
+#ifdef HAVE_SHM
+#include <sys/shm.h>
+#endif
 #ifdef CONFIG_XSHAPE
 #include <X11/extensions/shape.h>
 #endif
-
 #ifdef CONFIG_XF86VM
 #include <X11/extensions/xf86vmode.h>
 #endif
 
-#include <sys/ipc.h>
-#ifdef HAVE_SHM
-#include <sys/shm.h>
-#endif
-
 #define MOUSEHIDE_DELAY 1000   // in milliseconds
 
 static wsWindow *mouse_win;

--- a/gui/wm/ws.h	Sat Jan 19 21:47:31 2013 +0000
+++ b/gui/wm/ws.h	Sun Jan 20 00:11:55 2013 +0000
@@ -22,12 +22,13 @@
 #ifndef MPLAYER_GUI_WS_H
 #define MPLAYER_GUI_WS_H
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include "gui/dialog/dialog.h"
 
 #include "config.h"
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #ifdef HAVE_SHM
 #include <X11/extensions/XShm.h>
 #endif