# HG changeset patch
# User diego
# Date 1134079977 0
# Node ID 0e1471d9da743f1f8f5abffb130a8ea8043be12c
# Parent  6e44a1e05769dada4e66f938b91ac69023e788ea
Unify include paths, -I.. is in CFLAGS.

diff -r 6e44a1e05769 -r 0e1471d9da74 Gui/app.c
--- a/Gui/app.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/app.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/bitmap.c
--- a/Gui/bitmap.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/bitmap.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/cfg.c
--- a/Gui/cfg.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/cfg.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 "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 "libvo/video_out.h"
 
 #include "cfg.h"
 #include "app.h"
diff -r 6e44a1e05769 -r 0e1471d9da74 Gui/interface.c
--- a/Gui/interface.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/interface.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 @@
 #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 @@
 
 #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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/interface.h
--- a/Gui/interface.h	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/interface.h	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/common.c
--- a/Gui/mplayer/common.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/common.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/common.h
--- a/Gui/mplayer/common.h	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/common.h	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/about.c
--- a/Gui/mplayer/gtk/about.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/about.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/eq.c
--- a/Gui/mplayer/gtk/eq.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/eq.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/fs.c
--- a/Gui/mplayer/gtk/fs.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/fs.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/mb.c
--- a/Gui/mplayer/gtk/mb.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/mb.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/menu.c
--- a/Gui/mplayer/gtk/menu.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/menu.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/opts.c
--- a/Gui/mplayer/gtk/opts.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/opts.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 "../../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 "../app.h"
+#include "../cfg.h"
+#include "../interface.h"
 #include "../widgets.h"
 #include "opts.h"
 #include "fs.h"
@@ -25,8 +25,8 @@
 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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/pl.c
--- a/Gui/mplayer/gtk/pl.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/pl.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/sb.c
--- a/Gui/mplayer/gtk/sb.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/sb.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/gtk/url.c
--- a/Gui/mplayer/gtk/url.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/gtk/url.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/menu.c
--- a/Gui/mplayer/menu.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/menu.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/mw.c
--- a/Gui/mplayer/mw.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/mw.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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"
 
 #define GUI_REDRAW_WAIT 375
 
diff -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/pb.c
--- a/Gui/mplayer/pb.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/pb.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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"
 #include "widgets.h"
diff -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/play.c
--- a/Gui/mplayer/play.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/play.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/play.h
--- a/Gui/mplayer/play.h	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/play.h	Thu Dec 08 22:12:57 2005 +0000
@@ -2,7 +2,7 @@
 #ifndef __GUI_PLAY_H
 #define __GUI_PLAY_H
 
-#include "../../config.h"
+#include "../config.h"
 
 #include "./mplayer.h"
 
diff -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/sw.c
--- a/Gui/mplayer/sw.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/sw.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/widgets.c
--- a/Gui/mplayer/widgets.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/widgets.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/mplayer/widgets.h
--- a/Gui/mplayer/widgets.h	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/mplayer/widgets.h	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/skin/font.c
--- a/Gui/skin/font.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/skin/font.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/skin/font.h
--- a/Gui/skin/font.h	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/skin/font.h	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/skin/skin.c
--- a/Gui/skin/skin.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/skin/skin.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/skin/skin.h
--- a/Gui/skin/skin.h	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/skin/skin.h	Thu Dec 08 22:12:57 2005 +0000
@@ -2,7 +2,7 @@
 #ifndef __MY_SKIN
 #define __MY_SKIN
 
-#include "../app.h"
+#include "app.h"
 
 extern listItems     * skinAppMPlayer;
 
diff -r 6e44a1e05769 -r 0e1471d9da74 Gui/wm/ws.c
--- a/Gui/wm/ws.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/wm/ws.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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 -r 6e44a1e05769 -r 0e1471d9da74 Gui/wm/wsxdnd.c
--- a/Gui/wm/wsxdnd.c	Thu Dec 08 22:02:52 2005 +0000
+++ b/Gui/wm/wsxdnd.c	Thu Dec 08 22:12:57 2005 +0000
@@ -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