Unify include paths, -I.. is in CFLAGS.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17145 b3059339-0415-0410-9bf9-f77b7e298cf2

30 files changed, 196 insertions, 196 deletions

diff --git a/Gui/app.c b/Gui/app.c
index 41f29768d4..5c3e3ef8e9 100644
--- a/Gui/app.c
+++ b/Gui/app.c
@@ -4,9 +4,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #include "app.h"
 #include "wm/wskeys.h"
diff --git a/Gui/bitmap.c b/Gui/bitmap.c
index e3c36d5359..4714cae563 100644
--- a/Gui/bitmap.c
+++ b/Gui/bitmap.c
@@ -4,8 +4,8 @@
 
 #include <png.h>
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "bitmap.h"
 
 int pngRead( unsigned char * fname,txSample * bf )
diff --git a/Gui/cfg.c b/Gui/cfg.c
index f7d2a68b3f..a2d6aeaa34 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -3,15 +3,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
-#include "../mixer.h"
-#include "../mplayer.h"
-#include "../m_config.h"
-#include "../m_option.h"
-
-#include "../../libvo/video_out.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
+#include "mixer.h"
+#include "mplayer.h"
+#include "m_config.h"
+#include "m_option.h"
+
+#include "libvo/video_out.h"
 
 #include "cfg.h"
 #include "app.h"
diff --git a/Gui/interface.c b/Gui/interface.c
index 58e85c4687..3e03e2a1ca 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -15,20 +15,20 @@
 #include "mplayer/mplayer.h"
 #include "mplayer/play.h"
 
-#include "../mplayer.h"
+#include "mplayer.h"
 #include "app.h"
 #include "cfg.h"
-#include "../help_mp.h"
-#include "../subreader.h"
-#include "../libvo/x11_common.h"
-#include "../libvo/video_out.h"
-#include "../libvo/font_load.h"
-#include "../libvo/sub.h"
-#include "../input/input.h"
-#include "../libao2/audio_out.h"
-#include "../mixer.h"
-#include "../libaf/af.h"
-#include "../libaf/equalizer.h"
+#include "help_mp.h"
+#include "subreader.h"
+#include "libvo/x11_common.h"
+#include "libvo/video_out.h"
+#include "libvo/font_load.h"
+#include "libvo/sub.h"
+#include "input/input.h"
+#include "libao2/audio_out.h"
+#include "mixer.h"
+#include "libaf/af.h"
+#include "libaf/equalizer.h"
 
 extern af_cfg_t af_cfg;
 
@@ -36,13 +36,13 @@ extern af_cfg_t af_cfg;
 #include <iconv.h>
 #endif
 
-#include "../libmpdemux/stream.h"
-#include "../libmpdemux/demuxer.h"
-#include "../libmpdemux/stheader.h"
-#include "../libmpcodecs/dec_video.h"
+#include "libmpdemux/stream.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
+#include "libmpcodecs/dec_video.h"
 
-#include "../m_config.h"
-#include "../m_option.h"
+#include "m_config.h"
+#include "m_option.h"
 
 extern mixer_t mixer; // mixer from mplayer.c
 
@@ -1195,7 +1195,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 
 #define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
 
-#include "../playtree.h"
+#include "playtree.h"
 
 //This function adds/inserts one file into the gui playlist
 
diff --git a/Gui/interface.h b/Gui/interface.h
index d3c3d2d313..a819a9fc8b 100644
--- a/Gui/interface.h
+++ b/Gui/interface.h
@@ -2,14 +2,14 @@
 #ifndef _INTERFACE_H
 #define _INTERFACE_H
 
-#include "../config.h"
+#include "config.h"
 #include "mplayer/play.h"
-#include "../mplayer.h"
-#include "../libvo/font_load.h"
+#include "mplayer.h"
+#include "libvo/font_load.h"
 #include "cfg.h"
 
 #ifdef USE_DVDREAD
- #include "../libmpdemux/stream.h"
+ #include "libmpdemux/stream.h"
 #endif
 
 typedef struct
diff --git a/Gui/mplayer/common.c b/Gui/mplayer/common.c
index 12ff1b8b47..dd92522e96 100644
--- a/Gui/mplayer/common.c
+++ b/Gui/mplayer/common.c
@@ -7,24 +7,24 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "../app.h"
-#include "../skin/font.h"
-#include "../skin/skin.h"
-#include "../wm/ws.h"
+#include "app.h"
+#include "skin/font.h"
+#include "skin/skin.h"
+#include "wm/ws.h"
 
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
+#include "../config.h"
+#include "../help_mp.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
 
-#include "../../libmpdemux/stream.h"
-#include "../../mixer.h"
-#include "../../libvo/sub.h"
-#include "../../mplayer.h"
+#include "../libmpdemux/stream.h"
+#include "../mixer.h"
+#include "../libvo/sub.h"
+#include "../mplayer.h"
 
-#include "../../libmpdemux/demuxer.h"
-#include "../../libmpdemux/stheader.h"
-#include "../../codec-cfg.h"
+#include "../libmpdemux/demuxer.h"
+#include "../libmpdemux/stheader.h"
+#include "../codec-cfg.h"
 
 
 #include "play.h"
diff --git a/Gui/mplayer/common.h b/Gui/mplayer/common.h
index 46181366fb..4cc6c7e152 100644
--- a/Gui/mplayer/common.h
+++ b/Gui/mplayer/common.h
@@ -7,9 +7,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "../app.h"
-#include "../bitmap.h"
-#include "../wm/ws.h"
+#include "app.h"
+#include "bitmap.h"
+#include "wm/ws.h"
 
 extern inline void TranslateFilename( int c,char * tmp );
 extern char * Translate( char * str );
diff --git a/Gui/mplayer/gtk/about.c b/Gui/mplayer/gtk/about.c
index 408c53adbe..f77586a0bb 100644
--- a/Gui/mplayer/gtk/about.c
+++ b/Gui/mplayer/gtk/about.c
@@ -1,7 +1,7 @@
 
-#include "../../app.h"
-#include "../../../config.h"
-#include "../../../help_mp.h"
+#include "../app.h"
+#include "../../config.h"
+#include "../../help_mp.h"
 
 #include "mplayer/pixmaps/about.xpm"
 #include "../widgets.h"
diff --git a/Gui/mplayer/gtk/eq.c b/Gui/mplayer/gtk/eq.c
index 11a044dd16..75e55d3e25 100644
--- a/Gui/mplayer/gtk/eq.c
+++ b/Gui/mplayer/gtk/eq.c
@@ -9,16 +9,16 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../../app.h"
-#include "../../cfg.h"
+#include "../app.h"
+#include "../cfg.h"
+#include "../help_mp.h"
+#include "../../config.h"
 #include "../../help_mp.h"
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../../mplayer.h"
-#include "../../../libaf/equalizer.h"
-#include "../../../libvo/video_out.h"
+#include "../../mplayer.h"
+#include "../../libaf/equalizer.h"
+#include "../../libvo/video_out.h"
 #include "../widgets.h"
-#include "../mplayer.h"
+#include "mplayer.h"
 
 #include "eq.h"
 #include "common.h"
diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c
index db1e431a82..00796f1dd9 100644
--- a/Gui/mplayer/gtk/fs.c
+++ b/Gui/mplayer/gtk/fs.c
@@ -12,11 +12,11 @@
 #include "mplayer/pixmaps/dir.xpm"
 #include "mplayer/pixmaps/file.xpm"
 
-#include "../../app.h"
-#include "../../interface.h"
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../../libmpdemux/stream.h"
+#include "../app.h"
+#include "../interface.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../libmpdemux/stream.h"
 
 #include "../widgets.h"
 #include "fs.h"
diff --git a/Gui/mplayer/gtk/mb.c b/Gui/mplayer/gtk/mb.c
index f075c65d2b..576f53a8b4 100644
--- a/Gui/mplayer/gtk/mb.c
+++ b/Gui/mplayer/gtk/mb.c
@@ -1,7 +1,7 @@
 
-#include "../../app.h"
-#include "../../../config.h"
-#include "../../../help_mp.h"
+#include "../app.h"
+#include "../../config.h"
+#include "../../help_mp.h"
 
 #include "../pixmaps/error.xpm"
 #include "../pixmaps/warning.xpm"
diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c
index 12e668ce59..24933a1fc9 100644
--- a/Gui/mplayer/gtk/menu.c
+++ b/Gui/mplayer/gtk/menu.c
@@ -3,19 +3,19 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../../mplayer.h"
-#include "../../../mixer.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../mplayer.h"
+#include "../../mixer.h"
 
-#include "../../app.h"
+#include "../app.h"
 
 #include "menu.h"
 #include "../widgets.h"
-#include "../app.h"
+#include "app.h"
 
-#include "../../../libmpdemux/stream.h"
-#include "../../../libmpdemux/demuxer.h"
+#include "../../libmpdemux/stream.h"
+#include "../../libmpdemux/demuxer.h"
 
 #include "../pixmaps/ab.xpm"
 #include "../pixmaps/half.xpm"
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index f940f65862..01974b05ae 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -7,15 +7,15 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../../mixer.h"
-#include "../../../libao2/audio_out.h"
-#include "../../../libvo/video_out.h"
-
-#include "../../app.h"
-#include "../../cfg.h"
-#include "../../interface.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../mixer.h"
+#include "../../libao2/audio_out.h"
+#include "../../libvo/video_out.h"
+
+#include "../app.h"
+#include "../cfg.h"
+#include "../interface.h"
 #include "../widgets.h"
 #include "opts.h"
 #include "fs.h"
@@ -25,8 +25,8 @@ typedef struct sh_video_t sh_video_t;
 typedef struct sh_audio_t sh_audio_t;
 
 // for mpcodecs_[av]d_drivers:
-#include "../../../libmpcodecs/vd.h"
-#include "../../../libmpcodecs/ad.h"
+#include "../../libmpcodecs/vd.h"
+#include "../../libmpcodecs/ad.h"
 
        GtkWidget * Preferences = NULL;
 static GtkWidget * AConfig;
diff --git a/Gui/mplayer/gtk/pl.c b/Gui/mplayer/gtk/pl.c
index 19d23d6f1a..1ae6989aa8 100644
--- a/Gui/mplayer/gtk/pl.c
+++ b/Gui/mplayer/gtk/pl.c
@@ -10,11 +10,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../libmpdemux/stream.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../libmpdemux/stream.h"
 
-#include "../../interface.h"
+#include "../interface.h"
 #include "../widgets.h"
 #include "pl.h"
 #include "common.h"
diff --git a/Gui/mplayer/gtk/sb.c b/Gui/mplayer/gtk/sb.c
index 72809f5196..3ee89b340c 100644
--- a/Gui/mplayer/gtk/sb.c
+++ b/Gui/mplayer/gtk/sb.c
@@ -9,12 +9,12 @@
 #include "sb.h"
 #include "common.h"
 
-#include "../../app.h"
-#include "../../../config.h"
-#include "../../../help_mp.h"
+#include "../app.h"
+#include "../../config.h"
+#include "../../help_mp.h"
 
 #include "../widgets.h"
-#include "../app.h"
+#include "app.h"
 
 GtkWidget * SkinList = NULL;
 char      * sbSelectedSkin=NULL;
diff --git a/Gui/mplayer/gtk/url.c b/Gui/mplayer/gtk/url.c
index 12af4a2805..4d9a37a26b 100644
--- a/Gui/mplayer/gtk/url.c
+++ b/Gui/mplayer/gtk/url.c
@@ -11,10 +11,10 @@
 
 #include "url.h"
 #include "common.h"
-#include "../../interface.h"
-#include "../../app.h"
+#include "../interface.h"
+#include "../app.h"
 #include "../widgets.h"
-#include "../../help_mp.h"
+#include "../help_mp.h"
 
 GtkWidget * URL = NULL;
 
diff --git a/Gui/mplayer/menu.c b/Gui/mplayer/menu.c
index 513746c19d..a203950e6f 100644
--- a/Gui/mplayer/menu.c
+++ b/Gui/mplayer/menu.c
@@ -3,10 +3,10 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include "../app.h"
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../mp_msg.h"
+#include "app.h"
+#include "../config.h"
+#include "../help_mp.h"
+#include "../mp_msg.h"
 
 #include "widgets.h"
 
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index be623488e9..b87cba41fa 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -7,24 +7,24 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "../app.h"
-#include "../skin/font.h"
-#include "../skin/skin.h"
-#include "../wm/ws.h"
-
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
-
-#include "../../libmpdemux/stream.h"
-#include "../../mixer.h"
-#include "../../libvo/sub.h"
-#include "../../mplayer.h"
-
-#include "../../libmpdemux/demuxer.h"
-#include "../../libmpdemux/stheader.h"
-#include "../../codec-cfg.h"
+#include "app.h"
+#include "skin/font.h"
+#include "skin/skin.h"
+#include "wm/ws.h"
+
+#include "../config.h"
+#include "../help_mp.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
+
+#include "../libmpdemux/stream.h"
+#include "../mixer.h"
+#include "../libvo/sub.h"
+#include "../mplayer.h"
+
+#include "../libmpdemux/demuxer.h"
+#include "../libmpdemux/stheader.h"
+#include "../codec-cfg.h"
 
 #define GUI_REDRAW_WAIT 375
 
diff --git a/Gui/mplayer/pb.c b/Gui/mplayer/pb.c
index c5c9fa7b0c..ead422a7f4 100644
--- a/Gui/mplayer/pb.c
+++ b/Gui/mplayer/pb.c
@@ -7,24 +7,24 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "../app.h"
-#include "../skin/font.h"
-#include "../skin/skin.h"
-#include "../wm/ws.h"
-
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
-
-#include "../../libmpdemux/stream.h"
-#include "../../mixer.h"
-#include "../../libvo/sub.h"
-#include "../../mplayer.h"
-
-#include "../../libmpdemux/demuxer.h"
-#include "../../libmpdemux/stheader.h"
-#include "../../codec-cfg.h"
+#include "app.h"
+#include "skin/font.h"
+#include "skin/skin.h"
+#include "wm/ws.h"
+
+#include "../config.h"
+#include "../help_mp.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
+
+#include "../libmpdemux/stream.h"
+#include "../mixer.h"
+#include "../libvo/sub.h"
+#include "../mplayer.h"
+
+#include "../libmpdemux/demuxer.h"
+#include "../libmpdemux/stheader.h"
+#include "../codec-cfg.h"
 
 #include "play.h"
 #include "widgets.h"
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index fec350203d..f5ae44654a 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -7,28 +7,28 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "../wm/ws.h"
-#include "../wm/wsxdnd.h"
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../mplayer.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/video_out.h"
-#include "../../input/input.h"
+#include "wm/ws.h"
+#include "wm/wsxdnd.h"
+#include "../config.h"
+#include "../help_mp.h"
+#include "../mplayer.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/video_out.h"
+#include "../input/input.h"
 
-#include "../app.h"
+#include "app.h"
 
-#include "../wm/wskeys.h"
-#include "../interface.h"
+#include "wm/wskeys.h"
+#include "interface.h"
 
 #include "widgets.h"
 #include "./mplayer.h"
 #include "play.h"
 
-#include "../skin/skin.h"
-#include "../skin/font.h"
+#include "skin/skin.h"
+#include "skin/font.h"
 
-#include "../libmpdemux/stream.h"
+#include "libmpdemux/stream.h"
 
 extern float rel_seek_secs;
 extern int abs_seek_pos;
diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h
index 60317cd479..97810e3be9 100644
--- a/Gui/mplayer/play.h
+++ b/Gui/mplayer/play.h
@@ -2,7 +2,7 @@
 #ifndef __GUI_PLAY_H
 #define __GUI_PLAY_H
 
-#include "../../config.h"
+#include "../config.h"
 
 #include "./mplayer.h"
 
diff --git a/Gui/mplayer/sw.c b/Gui/mplayer/sw.c
index ed14e6455f..20b6807cac 100644
--- a/Gui/mplayer/sw.c
+++ b/Gui/mplayer/sw.c
@@ -3,13 +3,13 @@
 
 #include <inttypes.h>
 
-#include "../../config.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
+#include "../config.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
 
-#include "../app.h"
-#include "../interface.h"
-#include "../../help_mp.h"
+#include "app.h"
+#include "interface.h"
+#include "../help_mp.h"
 #include "widgets.h"
 
 int             mplSubRender = 0;
diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c
index 907e7c990c..ac18b2d01a 100644
--- a/Gui/mplayer/widgets.c
+++ b/Gui/mplayer/widgets.c
@@ -18,17 +18,17 @@
 #include "widgets.h"
 
 #include "./mplayer.h"
-#include "../app.h"
-#include "../wm/ws.h"
+#include "app.h"
+#include "wm/ws.h"
 
 
 #include "gtk/menu.h"
 #include "play.h"
 #include "gtk/fs.h"
 
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../mp_msg.h"
+#include "../config.h"
+#include "../help_mp.h"
+#include "../mp_msg.h"
 
 GtkWidget     * PopUpMenu = NULL;
 
diff --git a/Gui/mplayer/widgets.h b/Gui/mplayer/widgets.h
index 6fe1313f77..4eebbf7f93 100644
--- a/Gui/mplayer/widgets.h
+++ b/Gui/mplayer/widgets.h
@@ -7,12 +7,12 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../../config.h"
-#include "../../osdep/shmem.h"
+#include "../config.h"
+#include "../osdep/shmem.h"
 #include "play.h"
 #include "mplayer.h"
-#include "../interface.h"
-#include "../wm/ws.h"
+#include "interface.h"
+#include "wm/ws.h"
 
 #define GTK_MB_SIMPLE 0
 #define GTK_MB_MODAL 1
diff --git a/Gui/skin/font.c b/Gui/skin/font.c
index 4ee6dfd85c..4743f100ab 100644
--- a/Gui/skin/font.c
+++ b/Gui/skin/font.c
@@ -5,11 +5,11 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../app.h"
+#include "app.h"
 #include "skin.h"
 #include "font.h"
 #include "cut.h"
-#include "../../mp_msg.h"
+#include "../mp_msg.h"
 
 int items;
 
diff --git a/Gui/skin/font.h b/Gui/skin/font.h
index 6e86edf10f..0c3fa62998 100644
--- a/Gui/skin/font.h
+++ b/Gui/skin/font.h
@@ -2,8 +2,8 @@
 #ifndef _FONT_H
 #define _FONT_H
 
-#include "../bitmap.h"
-#include "../app.h"
+#include "bitmap.h"
+#include "app.h"
 
 #define fntAlignLeft   0
 #define fntAlignCenter 1
diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c
index 5e27d5054e..b7b93073dc 100644
--- a/Gui/skin/skin.c
+++ b/Gui/skin/skin.c
@@ -5,12 +5,12 @@
 
 #include "cut.h"
 #include "font.h"
-#include "../app.h"
+#include "app.h"
 
-#include "../../config.h"
-#include "../../mp_msg.h"
-#include "../../help_mp.h"
-#include "../mplayer/widgets.h"
+#include "../config.h"
+#include "../mp_msg.h"
+#include "../help_mp.h"
+#include "mplayer/widgets.h"
 
 //#define MSGL_DBG2 MSGL_STATUS
 
diff --git a/Gui/skin/skin.h b/Gui/skin/skin.h
index 9cf8a5471a..ce9d47b1eb 100644
--- a/Gui/skin/skin.h
+++ b/Gui/skin/skin.h
@@ -2,7 +2,7 @@
 #ifndef __MY_SKIN
 #define __MY_SKIN
 
-#include "../app.h"
+#include "app.h"
 
 extern listItems     * skinAppMPlayer;
 
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index b216307a53..65fcd40ebc 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -18,18 +18,18 @@
 
 #include <inttypes.h>
 
-#include "../../config.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/video_out.h"
+#include "../config.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/video_out.h"
 #include "ws.h"
 #include "wsxdnd.h"
-#include "../../cpudetect.h"
-#include "../../postproc/swscale.h"
-#include "../../postproc/rgb2rgb.h"
-#include "../../libmpcodecs/vf_scale.h"
-#include "../../mp_msg.h"
-#include "../../help_mp.h"
-#include "../../mplayer.h"
+#include "../cpudetect.h"
+#include "../postproc/swscale.h"
+#include "../postproc/rgb2rgb.h"
+#include "../libmpcodecs/vf_scale.h"
+#include "../mp_msg.h"
+#include "../help_mp.h"
+#include "../mplayer.h"
 
 #include <X11/extensions/XShm.h>
 #ifdef HAVE_XSHAPE
diff --git a/Gui/wm/wsxdnd.c b/Gui/wm/wsxdnd.c
index 339108e03c..31646627db 100644
--- a/Gui/wm/wsxdnd.c
+++ b/Gui/wm/wsxdnd.c
@@ -11,8 +11,8 @@
 
 #include <X11/Xatom.h>
 
-#include "../../mp_msg.h"
-#include "../../help_mp.h"
+#include "../mp_msg.h"
+#include "../help_mp.h"
 
 #define XDND_VERSION 3L