Unify include path handling, -I.. is in CFLAGS.

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

151 files changed, 430 insertions, 430 deletions

diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c
index d405c1e7ef..9f358dfcfa 100644
--- a/libmpcodecs/ad_faad.c
+++ b/libmpcodecs/ad_faad.c
@@ -27,7 +27,7 @@ LIBAD_EXTERN(faad)
 #ifndef USE_INTERNAL_FAAD
 #include <faad.h>
 #else
-#include "../libfaad2/faad.h"
+#include "libfaad2/faad.h"
 #endif
 
 /* configure maximum supported channels, *
diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c
index cb587e31a5..329c8ca62b 100644
--- a/libmpcodecs/ad_hwac3.c
+++ b/libmpcodecs/ad_hwac3.c
@@ -18,7 +18,7 @@
 
 #include "ad_internal.h"
 
-#include "../liba52/a52.h"
+#include "liba52/a52.h"
 
 
 static int isdts = -1;
diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h
index 91890ebdb4..dafed1eb11 100644
--- a/libmpcodecs/ad_internal.h
+++ b/libmpcodecs/ad_internal.h
@@ -1,6 +1,6 @@
 
 #include "codec-cfg.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
 #include "stream.h"
 #include "demuxer.h"
diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c
index 066c433d5d..a8a8317deb 100644
--- a/libmpcodecs/ad_liba52.c
+++ b/libmpcodecs/ad_liba52.c
@@ -14,10 +14,10 @@
 
 #include "cpudetect.h"
 
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
-#include "../liba52/a52.h"
-#include "../liba52/mm_accel.h"
+#include "liba52/a52.h"
+#include "liba52/mm_accel.h"
 
 static sample_t * a52_samples;
 static a52_state_t a52_state;
diff --git a/libmpcodecs/ad_mp3lib.c b/libmpcodecs/ad_mp3lib.c
index 6ef422961b..2605bb08f2 100644
--- a/libmpcodecs/ad_mp3lib.c
+++ b/libmpcodecs/ad_mp3lib.c
@@ -18,7 +18,7 @@ static ad_info_t info =
 
 LIBAD_EXTERN(mp3lib)
 
-#include "../mp3lib/mp3.h"
+#include "mp3lib/mp3.h"
 
 extern int fakemono;
 
diff --git a/libmpcodecs/ad_mpc.c b/libmpcodecs/ad_mpc.c
index 98671f14f4..d318c0b111 100644
--- a/libmpcodecs/ad_mpc.c
+++ b/libmpcodecs/ad_mpc.c
@@ -13,8 +13,8 @@
 
 #include "config.h"
 #include "ad_internal.h"
-#include "../libaf/af_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/fastmemcpy.h"
 
 static ad_info_t info = 
 {
diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c
index 7e67c938ae..3af366bfb3 100644
--- a/libmpcodecs/ad_pcm.c
+++ b/libmpcodecs/ad_pcm.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 #include "ad_internal.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
 static ad_info_t info = 
 {
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c
index c865b68568..9caea3cf78 100644
--- a/libmpcodecs/ad_qtaudio.c
+++ b/libmpcodecs/ad_qtaudio.c
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #if defined(USE_QTX_CODECS) || defined(MACOSX)
 #include "wine/windef.h"
diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c
index 6d6d6a4acc..18039d49b6 100644
--- a/libmpcodecs/ad_realaud.c
+++ b/libmpcodecs/ad_realaud.c
@@ -158,7 +158,7 @@ static int load_syms_linux(char *path)
 #ifdef USE_WIN32DLL
 
 #ifdef WIN32_LOADER
-#include "../loader/ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 void* WINAPI LoadLibraryA(char* name);
 void* WINAPI GetProcAddress(void* handle,char *func);
diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c
index f0779516bf..8059106ced 100644
--- a/libmpcodecs/ad_twin.c
+++ b/libmpcodecs/ad_twin.c
@@ -7,9 +7,9 @@
 
 #include "ad_internal.h"
 #include "vqf.h"
-#include "../../loader/ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #include "wine/windef.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
 #include "help_mp.h"
 
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c
index 307e3ae599..fc50965d08 100644
--- a/libmpcodecs/ae.c
+++ b/libmpcodecs/ae.c
@@ -9,7 +9,7 @@
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae.h"
-#include "../config.h"
+#include "config.h"
 
 #include "ae_pcm.h"
 
diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c
index 2deca5932f..46041ec489 100644
--- a/libmpcodecs/ae_faac.c
+++ b/libmpcodecs/ae_faac.c
@@ -5,9 +5,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include <faac.h>
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c
index d062ff37a7..d47e91dc0f 100644
--- a/libmpcodecs/ae_lame.c
+++ b/libmpcodecs/ae_lame.c
@@ -5,14 +5,14 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 #include "muxer.h"
-#include "../help_mp.h"
+#include "help_mp.h"
 #include "ae_pcm.h"
-#include "../libaf/af_format.h"
-#include "../libmpdemux/mp3_hdr.h"
+#include "libaf/af_format.h"
+#include "libmpdemux/mp3_hdr.h"
 
 #undef CDECL
 #include <lame/lame.h>
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index ce6ca9766d..d4048403c6 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -5,14 +5,14 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_lavc.h"
 #include "help_mp.h"
-#include "../config.h"
-#include "../libaf/af_format.h"
+#include "config.h"
+#include "libaf/af_format.h"
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #else
diff --git a/libmpcodecs/ae_pcm.c b/libmpcodecs/ae_pcm.c
index a6d8fab2ed..c862b3ed57 100644
--- a/libmpcodecs/ae_pcm.c
+++ b/libmpcodecs/ae_pcm.c
@@ -5,9 +5,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_pcm.h"
diff --git a/libmpcodecs/ae_toolame.c b/libmpcodecs/ae_toolame.c
index 9b106e4f53..dfc21d92df 100644
--- a/libmpcodecs/ae_toolame.c
+++ b/libmpcodecs/ae_toolame.c
@@ -5,13 +5,13 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_toolame.h"
-#include "../libmpdemux/mp3_hdr.h"
+#include "libmpdemux/mp3_hdr.h"
 
 
 static int 
diff --git a/libmpcodecs/ae_twolame.c b/libmpcodecs/ae_twolame.c
index 3c485c20ba..b42b84ff05 100644
--- a/libmpcodecs/ae_twolame.c
+++ b/libmpcodecs/ae_twolame.c
@@ -5,13 +5,13 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_twolame.h"
-#include "../libmpdemux/mp3_hdr.h"
+#include "libmpdemux/mp3_hdr.h"
 
 
 static int 
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index 7fb87e1cd4..7ce5ad6657 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -14,9 +14,9 @@
 
 #include "dec_audio.h"
 #include "ad.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
-#include "../libaf/af.h"
+#include "libaf/af.h"
 
 #ifdef DYNAMIC_PLUGINS
 #include <dlfcn.h>
diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c
index 566d707426..e7157be301 100644
--- a/libmpcodecs/native/nuppelvideo.c
+++ b/libmpcodecs/native/nuppelvideo.c
@@ -15,7 +15,7 @@
 #include "mp_msg.h"
 #include "bswap.h"
 
-#include "../../libvo/fastmemcpy.h"
+#include "../libvo/fastmemcpy.h"
 
 #include "libmpdemux/nuppelvideo.h" 
 #include "RTjpegN.h"
diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c
index 2b367e0544..debbbb0e5f 100644
--- a/libmpcodecs/vd_libmpeg2.c
+++ b/libmpcodecs/vd_libmpeg2.c
@@ -27,7 +27,7 @@ LIBVD_EXTERN(libmpeg2)
 #include "libmpeg2/attributes.h"
 #include "libmpeg2/mpeg2_internal.h"
 
-#include "../cpudetect.h"
+#include "cpudetect.h"
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index 960fd09f19..8bf9015436 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -23,7 +23,7 @@ static vd_info_t info = {
 
 LIBVD_EXTERN(qtvideo)
 
-#include "../bswap.h"
+#include "bswap.h"
 
 #ifdef MACOSX
 #include <QuickTime/ImageCodec.h>
diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c
index 36a87f33c6..f0f917ea1e 100644
--- a/libmpcodecs/vd_realvid.c
+++ b/libmpcodecs/vd_realvid.c
@@ -151,7 +151,7 @@ static int load_syms_linux(char *path) {
 #ifdef USE_WIN32DLL
 
 #ifdef WIN32_LOADER
-#include "../loader/ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 void* WINAPI LoadLibraryA(char* name);
 void* WINAPI GetProcAddress(void* handle,char* func);
diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c
index 640c2992ca..4409a10e45 100644
--- a/libmpcodecs/ve.c
+++ b/libmpcodecs/ve.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c
index 29612ce0b4..79daf1e67e 100644
--- a/libmpcodecs/ve_divx4.c
+++ b/libmpcodecs/ve_divx4.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_DIVX4ENCORE
 
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 549a927e79..3af29e37fc 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -8,12 +8,12 @@
 #define INFINITY HUGE_VAL
 #endif
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #include "codec-cfg.h"
 #include "stream.h"
diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c
index 3e910d0dcf..ab7b2ec727 100644
--- a/libmpcodecs/ve_libdv.c
+++ b/libmpcodecs/ve_libdv.c
@@ -5,8 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_LIBDV095
 
diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c
index 1cff1bfb42..2cc96cbc54 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "m_option.h"
 
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index 866e635066..5652ac99b2 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -8,16 +8,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../bswap.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "bswap.h"
 
 #ifdef WIN32_LOADER 
 #include "ldt_keeper.h" 
 #endif 
 
 #ifdef USE_QTX_CODECS
-#include "../loader/qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
 #include "wine/windef.h"
 
 #include "codec-cfg.h"
diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c
index fe4470017a..206b5fdf40 100644
--- a/libmpcodecs/ve_raw.c
+++ b/libmpcodecs/ve_raw.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "codec-cfg.h"
 #include "stream.h"
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index 511aa42e2d..063aa12535 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "../config.h"
+#include "config.h"
 #ifdef USE_WIN32DLL
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include "codec-cfg.h"
 //#include "stream.h"
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index bfa15b4aa0..8d4c499e69 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_X264
 
diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c
index d2979dddb2..45fcacf68f 100644
--- a/libmpcodecs/ve_xvid.c
+++ b/libmpcodecs/ve_xvid.c
@@ -9,8 +9,8 @@
 #define INFINITY HUGE_VAL
 #endif
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_XVID3
 
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index a636cdc183..d0016b5cd2 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -33,8 +33,8 @@
 #include <limits.h>
 #include <time.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_XVID4
 
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 28b4fab476..00414474ba 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
@@ -11,17 +11,17 @@
 #include <assert.h>
 #endif
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "mp_msg.h"
+#include "help_mp.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 extern vf_info_t vf_info_vo;
 extern vf_info_t vf_info_rectangle;
diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c
index f1c9e5920d..400ddda781 100644
--- a/libmpcodecs/vf_1bpp.c
+++ b/libmpcodecs/vf_1bpp.c
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../postproc/rgb2rgb.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c
index 21a8f48ab9..338ecd387b 100644
--- a/libmpcodecs/vf_2xsai.c
+++ b/libmpcodecs/vf_2xsai.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_bmovl.c b/libmpcodecs/vf_bmovl.c
index 5b06448bdb..1dbf8abcf7 100644
--- a/libmpcodecs/vf_bmovl.c
+++ b/libmpcodecs/vf_bmovl.c
@@ -66,13 +66,13 @@
 #include "mp_image.h"
 #include "vf.h"
 #include "img_format.h"
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_NO_POSIX_SELECT
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define IS_RAWIMG	0x100
 #define IS_IMG		0x200
diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c
index 7e23ec308e..75cb633725 100644
--- a/libmpcodecs/vf_boxblur.c
+++ b/libmpcodecs/vf_boxblur.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 //===========================================================================//
diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c
index e73b8e9fb7..ff27c5f085 100644
--- a/libmpcodecs/vf_crop.c
+++ b/libmpcodecs/vf_crop.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c
index 016644a3d9..04468349c6 100644
--- a/libmpcodecs/vf_cropdetect.c
+++ b/libmpcodecs/vf_cropdetect.c
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int x1,y1,x2,y2;
diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c
index 1a80e9dd07..ff58f9c5a3 100644
--- a/libmpcodecs/vf_decimate.c
+++ b/libmpcodecs/vf_decimate.c
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 struct vf_priv_s {
diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c
index 90aa9abf2d..178bd8cb62 100644
--- a/libmpcodecs/vf_delogo.c
+++ b/libmpcodecs/vf_delogo.c
@@ -24,9 +24,9 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -35,7 +35,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c
index ca124b6c5d..ac2ab13742 100644
--- a/libmpcodecs/vf_denoise3d.c
+++ b/libmpcodecs/vf_denoise3d.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define PARAM1_DEFAULT 4.0
 #define PARAM2_DEFAULT 3.0
diff --git a/libmpcodecs/vf_detc.c b/libmpcodecs/vf_detc.c
index 57893fccc0..a18d30f312 100644
--- a/libmpcodecs/vf_detc.c
+++ b/libmpcodecs/vf_detc.c
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct metrics {
 	int even;
diff --git a/libmpcodecs/vf_dint.c b/libmpcodecs/vf_dint.c
index 7bd1385797..9408dd3855 100644
--- a/libmpcodecs/vf_dint.c
+++ b/libmpcodecs/vf_dint.c
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../libvo/fastmemcpy.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "libvo/fastmemcpy.h"
 
 #include "mp_image.h"
 #include "img_format.h"
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index 9ac2687fde..9c8b2c6575 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/libmpcodecs/vf_divtc.c
@@ -4,16 +4,16 @@
 #include <limits.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
-#include "../bswap.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
+#include "bswap.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 vf_info_t vf_info_divtc;
 
diff --git a/libmpcodecs/vf_down3dright.c b/libmpcodecs/vf_down3dright.c
index a8f3939208..488c7b26cf 100644
--- a/libmpcodecs/vf_down3dright.c
+++ b/libmpcodecs/vf_down3dright.c
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
 	int skipline;
diff --git a/libmpcodecs/vf_dsize.c b/libmpcodecs/vf_dsize.c
index c6de0e73ee..a4b432e296 100644
--- a/libmpcodecs/vf_dsize.c
+++ b/libmpcodecs/vf_dsize.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_dvbscale.c b/libmpcodecs/vf_dvbscale.c
index 3dcdb1b3fa..6f6280a1a5 100644
--- a/libmpcodecs/vf_dvbscale.c
+++ b/libmpcodecs/vf_dvbscale.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c
index 5b27e5250c..721eae9765 100644
--- a/libmpcodecs/vf_eq.c
+++ b/libmpcodecs/vf_eq.c
@@ -3,17 +3,17 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/video_out.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index ab7b71aff0..dd2ffa47f0 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -4,18 +4,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #ifdef OSD_SUPPORT
-#include "../libvo/sub.h"
-#include "../libvo/osd.h"
+#include "libvo/sub.h"
+#include "libvo/osd.h"
 #endif
 
 #include "m_option.h"
diff --git a/libmpcodecs/vf_fame.c b/libmpcodecs/vf_fame.c
index fc23bfaf7d..56dfaf8abd 100644
--- a/libmpcodecs/vf_fame.c
+++ b/libmpcodecs/vf_fame.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 //#ifdef USE_LIBFAME
 
@@ -15,7 +15,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-//#include "../libvo/fastmemcpy.h"
+//#include "libvo/fastmemcpy.h"
 #include <fame.h>
 
 struct vf_priv_s {
diff --git a/libmpcodecs/vf_field.c b/libmpcodecs/vf_field.c
index a774250933..68f68b160a 100644
--- a/libmpcodecs/vf_field.c
+++ b/libmpcodecs/vf_field.c
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
     int field;
diff --git a/libmpcodecs/vf_fil.c b/libmpcodecs/vf_fil.c
index ec14635b88..25e6656a17 100644
--- a/libmpcodecs/vf_fil.c
+++ b/libmpcodecs/vf_fil.c
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
     int interleave;
diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c
index 90e25b8423..b9235949f7 100644
--- a/libmpcodecs/vf_filmdint.c
+++ b/libmpcodecs/vf_filmdint.c
@@ -4,16 +4,16 @@
 #include <signal.h>
 #include <sys/time.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 #include "cmmx.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define NUM_STORED 4
 
diff --git a/libmpcodecs/vf_flip.c b/libmpcodecs/vf_flip.c
index bca671c686..981c1df6c7 100644
--- a/libmpcodecs/vf_flip.c
+++ b/libmpcodecs/vf_flip.c
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
+#include "libvo/video_out.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_format.c b/libmpcodecs/vf_format.c
index bb4fb4d5a9..f9a1c0a096 100644
--- a/libmpcodecs/vf_format.c
+++ b/libmpcodecs/vf_format.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_framestep.c b/libmpcodecs/vf_framestep.c
index 3586a99103..62be7e70a0 100644
--- a/libmpcodecs/vf_framestep.c
+++ b/libmpcodecs/vf_framestep.c
@@ -51,15 +51,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 /* Uncomment if you want to print some info on the format */
 // #define DUMP_FORMAT_DATA
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c
index 7055e4f33f..f6ba41547c 100644
--- a/libmpcodecs/vf_fspp.c
+++ b/libmpcodecs/vf_fspp.c
@@ -36,19 +36,19 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/dsputil.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -58,7 +58,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 #define BLOCKSZ 12
@@ -690,7 +690,7 @@ vf_info_t vf_info_fspp = {
 //Specific spp's dct, idct and threshold functions
 //I'd prefer to have them in the separate file.
 
-#include "../mangle.h"
+#include "mangle.h"
 //#define MANGLE(a) #a
 
 //typedef int16_t DCTELEM; //! only int16_t
diff --git a/libmpcodecs/vf_halfpack.c b/libmpcodecs/vf_halfpack.c
index f01728a7fd..9da32942ff 100644
--- a/libmpcodecs/vf_halfpack.c
+++ b/libmpcodecs/vf_halfpack.c
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
 	int field;
diff --git a/libmpcodecs/vf_harddup.c b/libmpcodecs/vf_harddup.c
index ca3f778971..31e47ea123 100644
--- a/libmpcodecs/vf_harddup.c
+++ b/libmpcodecs/vf_harddup.c
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	mp_image_t *last_mpi;
diff --git a/libmpcodecs/vf_hqdn3d.c b/libmpcodecs/vf_hqdn3d.c
index 461e5371e2..bfc9c26969 100644
--- a/libmpcodecs/vf_hqdn3d.c
+++ b/libmpcodecs/vf_hqdn3d.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define PARAM1_DEFAULT 4.0
 #define PARAM2_DEFAULT 3.0
diff --git a/libmpcodecs/vf_hue.c b/libmpcodecs/vf_hue.c
index e281d9c51e..4a1eae84fe 100644
--- a/libmpcodecs/vf_hue.c
+++ b/libmpcodecs/vf_hue.c
@@ -4,15 +4,15 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
+#include "libvo/video_out.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c
index 1cbf1135ec..e2700b1c79 100644
--- a/libmpcodecs/vf_il.c
+++ b/libmpcodecs/vf_il.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 //===========================================================================//
diff --git a/libmpcodecs/vf_ilpack.c b/libmpcodecs/vf_ilpack.c
index 43c6bad218..fdc44b1fa5 100644
--- a/libmpcodecs/vf_ilpack.c
+++ b/libmpcodecs/vf_ilpack.c
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
 	unsigned char *u, unsigned char *v, int w, int us, int vs);
diff --git a/libmpcodecs/vf_ivtc.c b/libmpcodecs/vf_ivtc.c
index 3fb00e5f7b..c487a167a3 100644
--- a/libmpcodecs/vf_ivtc.c
+++ b/libmpcodecs/vf_ivtc.c
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 struct metrics {
diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c
index accb370bfe..7cc5d46c61 100644
--- a/libmpcodecs/vf_kerndeint.c
+++ b/libmpcodecs/vf_kerndeint.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c
index 97f68e32b0..11e79d5cae 100644
--- a/libmpcodecs/vf_lavc.c
+++ b/libmpcodecs/vf_lavc.c
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #ifdef USE_LIBAVCODEC
 
@@ -13,7 +13,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-//#include "../libvo/fastmemcpy.h"
+//#include "libvo/fastmemcpy.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
diff --git a/libmpcodecs/vf_lavcdeint.c b/libmpcodecs/vf_lavcdeint.c
index 7b4188eefe..392fa79d50 100644
--- a/libmpcodecs/vf_lavcdeint.c
+++ b/libmpcodecs/vf_lavcdeint.c
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #ifdef USE_LIBAVCODEC
 
@@ -13,7 +13,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-//#include "../libvo/fastmemcpy.h"
+//#include "libvo/fastmemcpy.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
diff --git a/libmpcodecs/vf_mirror.c b/libmpcodecs/vf_mirror.c
index 3d77730e12..97b6dd5164 100644
--- a/libmpcodecs/vf_mirror.c
+++ b/libmpcodecs/vf_mirror.c
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 
 static void mirror(unsigned char* dst,unsigned char* src,int dststride,int srcstride,int w,int h,int bpp,unsigned int fmt){
diff --git a/libmpcodecs/vf_noformat.c b/libmpcodecs/vf_noformat.c
index 0fd44885ca..8c857d9d4e 100644
--- a/libmpcodecs/vf_noformat.c
+++ b/libmpcodecs/vf_noformat.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c
index c8f669bffa..b0dfe88359 100644
--- a/libmpcodecs/vf_noise.c
+++ b/libmpcodecs/vf_noise.c
@@ -22,9 +22,9 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -33,7 +33,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define MAX_NOISE 4096
 #define MAX_SHIFT 1024
diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c
index 70322caf1b..f3ee53dc10 100644
--- a/libmpcodecs/vf_palette.c
+++ b/libmpcodecs/vf_palette.c
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../postproc/rgb2rgb.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_perspective.c b/libmpcodecs/vf_perspective.c
index 59e2f3f467..e07ca29dc7 100644
--- a/libmpcodecs/vf_perspective.c
+++ b/libmpcodecs/vf_perspective.c
@@ -23,8 +23,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -33,7 +33,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define SUB_PIXEL_BITS 8
 #define SUB_PIXELS (1<<SUB_PIXEL_BITS)
diff --git a/libmpcodecs/vf_phase.c b/libmpcodecs/vf_phase.c
index 1415d3dfdb..f8a1163f36 100644
--- a/libmpcodecs/vf_phase.c
+++ b/libmpcodecs/vf_phase.c
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <limits.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 enum mode { PROGRESSIVE, TOP_FIRST, BOTTOM_FIRST,
 	    TOP_FIRST_ANALYZE, BOTTOM_FIRST_ANALYZE,
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c
index 2147ce6afe..f2fee138f0 100644
--- a/libmpcodecs/vf_pp.c
+++ b/libmpcodecs/vf_pp.c
@@ -4,9 +4,9 @@
 #include <inttypes.h>
 #include <errno.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -20,10 +20,10 @@
 
 #define EMU_OLD
 
-#include "../libavcodec/libpostproc/postprocess.h"
+#include "libavcodec/libpostproc/postprocess.h"
 
 #ifdef EMU_OLD
-#include "../libavcodec/libpostproc/postprocess_internal.h"
+#include "libavcodec/libpostproc/postprocess_internal.h"
 #endif
 
 struct vf_priv_s {
diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c
index 16bed77e3e..243a9c29ab 100644
--- a/libmpcodecs/vf_pp7.c
+++ b/libmpcodecs/vf_pp7.c
@@ -23,10 +23,10 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -35,7 +35,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define XMIN(a,b) ((a) < (b) ? (a) : (b))
 
diff --git a/libmpcodecs/vf_pullup.c b/libmpcodecs/vf_pullup.c
index c25c9a1b7d..d452a14617 100644
--- a/libmpcodecs/vf_pullup.c
+++ b/libmpcodecs/vf_pullup.c
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #include "pullup.h"
 
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c
index aa7716b8d5..68c692b8ab 100644
--- a/libmpcodecs/vf_qp.c
+++ b/libmpcodecs/vf_qp.c
@@ -22,12 +22,12 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #if 1
 double ff_eval(char *s, double *const_value, const char **const_name,
@@ -44,9 +44,9 @@ double ff_eval(char *s, double *const_value, const char **const_name,
 #include <ffmpeg/dsputil.h>
 #include <ffmpeg/common.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
-#include "../libavutil/common.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavutil/common.h"
 #endif
 
 /* FIXME: common.h defines printf away when HAVE_AV_CONFIG
@@ -61,7 +61,7 @@ double ff_eval(char *s, double *const_value, const char **const_name,
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 struct vf_priv_s {
diff --git a/libmpcodecs/vf_rectangle.c b/libmpcodecs/vf_rectangle.c
index 3b118e5138..9eb72ee661 100644
--- a/libmpcodecs/vf_rectangle.c
+++ b/libmpcodecs/vf_rectangle.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mp_image.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
     int x, y, w, h;
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c
index 9c1c8d6206..b4a44bf0ad 100644
--- a/libmpcodecs/vf_remove_logo.c
+++ b/libmpcodecs/vf_remove_logo.c
@@ -90,9 +90,9 @@ __________________________________________________________________________
 #include <ctype.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../libvo/fastmemcpy.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "libvo/fastmemcpy.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_rgb2bgr.c b/libmpcodecs/vf_rgb2bgr.c
index 0db4b2c4d2..fa64f9bb3d 100644
--- a/libmpcodecs/vf_rgb2bgr.c
+++ b/libmpcodecs/vf_rgb2bgr.c
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_rgbtest.c b/libmpcodecs/vf_rgbtest.c
index d918397076..7862eb233d 100644
--- a/libmpcodecs/vf_rgbtest.c
+++ b/libmpcodecs/vf_rgbtest.c
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_rotate.c b/libmpcodecs/vf_rotate.c
index 5cb42a86ae..f45306fb03 100644
--- a/libmpcodecs/vf_rotate.c
+++ b/libmpcodecs/vf_rotate.c
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int direction;
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c
index 6c2ddb81c3..f7a65bb9e8 100644
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,8 +32,8 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "vf_scale.h"
 
 
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index cef76b99d1..bc83b0b1f6 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "vf_scale.h"
 
 #include "m_option.h"
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
index 78ba1cbf78..8fbb4b5cba 100644
--- a/libmpcodecs/vf_screenshot.c
+++ b/libmpcodecs/vf_screenshot.c
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 #ifdef HAVE_PNG
 
 #include <stdio.h>
@@ -15,16 +15,16 @@
 
 #include <png.h>
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 #include "vf_scale.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int frameno;
diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c
index b445e58018..4b75e4ead8 100644
--- a/libmpcodecs/vf_smartblur.c
+++ b/libmpcodecs/vf_smartblur.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,8 +32,8 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "vf_scale.h"
 
 //===========================================================================//
diff --git a/libmpcodecs/vf_softpulldown.c b/libmpcodecs/vf_softpulldown.c
index 924d088595..ccba3a365b 100644
--- a/libmpcodecs/vf_softpulldown.c
+++ b/libmpcodecs/vf_softpulldown.c
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../libvo/sub.h"
+#include "libvo/fastmemcpy.h"
+#include "libvo/sub.h"
 
 struct vf_priv_s {
 	int state;
diff --git a/libmpcodecs/vf_softskip.c b/libmpcodecs/vf_softskip.c
index 1ef864f73f..dfbede5484 100644
--- a/libmpcodecs/vf_softskip.c
+++ b/libmpcodecs/vf_softskip.c
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int skipflag;
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c
index 7637081822..a4e55795f0 100644
--- a/libmpcodecs/vf_spp.c
+++ b/libmpcodecs/vf_spp.c
@@ -30,19 +30,19 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/dsputil.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -52,7 +52,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define XMIN(a,b) ((a) < (b) ? (a) : (b))
 
diff --git a/libmpcodecs/vf_swapuv.c b/libmpcodecs/vf_swapuv.c
index b09178c500..cfbd44df2a 100644
--- a/libmpcodecs/vf_swapuv.c
+++ b/libmpcodecs/vf_swapuv.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 //===========================================================================//
diff --git a/libmpcodecs/vf_telecine.c b/libmpcodecs/vf_telecine.c
index b29f72cf45..fb6080bedb 100644
--- a/libmpcodecs/vf_telecine.c
+++ b/libmpcodecs/vf_telecine.c
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int frame;
diff --git a/libmpcodecs/vf_test.c b/libmpcodecs/vf_test.c
index d4adfdef9d..22ba824dd2 100644
--- a/libmpcodecs/vf_test.c
+++ b/libmpcodecs/vf_test.c
@@ -21,14 +21,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c
index c79d15b780..f474d4a5df 100644
--- a/libmpcodecs/vf_tfields.c
+++ b/libmpcodecs/vf_tfields.c
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int mode;
diff --git a/libmpcodecs/vf_tile.c b/libmpcodecs/vf_tile.c
index ef9c2fcda1..f02410d960 100644
--- a/libmpcodecs/vf_tile.c
+++ b/libmpcodecs/vf_tile.c
@@ -37,15 +37,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 /* external */
 extern int verbose;
diff --git a/libmpcodecs/vf_tinterlace.c b/libmpcodecs/vf_tinterlace.c
index 872b762575..697096030b 100644
--- a/libmpcodecs/vf_tinterlace.c
+++ b/libmpcodecs/vf_tinterlace.c
@@ -20,14 +20,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int mode;
diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c
index 4989e2e658..f04647e796 100644
--- a/libmpcodecs/vf_unsharp.c
+++ b/libmpcodecs/vf_unsharp.c
@@ -23,9 +23,9 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -34,7 +34,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #ifndef MIN
 #define        MIN(a,b) (((a)<(b))?(a):(b))
diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c
index 9a646f493b..c2fee8a971 100644
--- a/libmpcodecs/vf_uspp.c
+++ b/libmpcodecs/vf_uspp.c
@@ -22,19 +22,19 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/dsputil.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -44,7 +44,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define XMIN(a,b) ((a) < (b) ? (a) : (b))
 
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 08e3d12064..380e55f30d 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
+#include "libvo/video_out.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_yuvcsp.c b/libmpcodecs/vf_yuvcsp.c
index 387f2f8011..a033a302aa 100644
--- a/libmpcodecs/vf_yuvcsp.c
+++ b/libmpcodecs/vf_yuvcsp.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c
index 5f4767b08c..ac22e3721b 100644
--- a/libmpcodecs/vf_yuy2.c
+++ b/libmpcodecs/vf_yuy2.c
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 #include "vf_scale.h"
 
 //===========================================================================//
diff --git a/libmpcodecs/vf_yvu9.c b/libmpcodecs/vf_yvu9.c
index 480b8a09f5..6afc20e2a6 100644
--- a/libmpcodecs/vf_yvu9.c
+++ b/libmpcodecs/vf_yvu9.c
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c
index d40c1c5c97..4f7932a569 100644
--- a/libmpcodecs/vf_zrmjpeg.c
+++ b/libmpcodecs/vf_zrmjpeg.c
@@ -14,23 +14,23 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
 #ifdef USE_FASTMEMCPY
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 #endif
 
 /* We need this #define because we need ../libavcodec/common.h to #define 
  * be2me_32, otherwise the linker will complain that it doesn't exist */
 #define HAVE_AV_CONFIG_H
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
-#include "../libavcodec/mpegvideo.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 #undef malloc
 #undef free
diff --git a/libmpcodecs/vqf.h b/libmpcodecs/vqf.h
index c35bbe7ded..84bcdc2bc2 100644
--- a/libmpcodecs/vqf.h
+++ b/libmpcodecs/vqf.h
@@ -156,7 +156,7 @@ typedef struct {
 /*************************************************/
 /*** Definitions about TwinVQ bitstream header ***/
 /*************************************************/
-//#include "../declib_src/tvq_hdr.h"
+//#include "declib_src/tvq_hdr.h"
 //#ifndef	BUFSIZ
 //#define	BUFSIZ		1024
 //#endif
diff --git a/libmpdemux/cache2.c b/libmpdemux/cache2.c
index 6735b79f05..1e67e47cda 100644
--- a/libmpdemux/cache2.c
+++ b/libmpdemux/cache2.c
@@ -17,10 +17,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../osdep/timer.h"
+#include "osdep/timer.h"
 #ifndef WIN32
 #include <sys/wait.h>
-#include "../osdep/shmem.h"
+#include "osdep/shmem.h"
 #else
 #include <windows.h>
 static DWORD WINAPI ThreadProc(void* s);
diff --git a/libmpdemux/cdda.c b/libmpdemux/cdda.c
index 81950f5940..8d082adf36 100644
--- a/libmpdemux/cdda.c
+++ b/libmpdemux/cdda.c
@@ -3,9 +3,9 @@
 #ifdef HAVE_CDDA
 
 #include "stream.h"
-#include "../m_option.h"
-#include "../m_struct.h"
-#include "../bswap.h"
+#include "m_option.h"
+#include "m_struct.h"
+#include "bswap.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libmpdemux/cddb.c b/libmpdemux/cddb.c
index 63868ada6a..2ec483e28a 100644
--- a/libmpdemux/cddb.c
+++ b/libmpdemux/cddb.c
@@ -48,7 +48,7 @@
 #endif
 
 #include "cdd.h"
-#include "../version.h"
+#include "version.h"
 #include "stream.h"
 #include "network.h"
 
diff --git a/libmpdemux/cue_read.c b/libmpdemux/cue_read.c
index 46ef5f3652..4485f2ddc3 100644
--- a/libmpdemux/cue_read.c
+++ b/libmpdemux/cue_read.c
@@ -17,8 +17,8 @@
 
 #include "cue_read.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #define byte    unsigned char
 #define SIZERAW 2352
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index a8ed8b9016..ae1d9df77d 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -12,7 +12,7 @@
 #include "asf.h"
 #include "demuxer.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 /*
  * Load 16/32-bit values in little endian byte order
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index cae8850a1c..a472455ca2 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -1,6 +1,6 @@
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index de7598c762..6491354dff 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -20,8 +20,8 @@
 #include "matroska.h"
 #include "bswap.h"
 
-#include "../subreader.h"
-#include "../libvo/sub.h"
+#include "subreader.h"
+#include "libvo/sub.h"
 
 #ifdef USE_QTX_CODECS
 #include "qtx/qtxsdk/components.h"
@@ -34,7 +34,7 @@
 #ifdef USE_LIBLZO
 #include <lzo1x.h>
 #else
-#include "../libmpcodecs/native/minilzo.h"
+#include "libmpcodecs/native/minilzo.h"
 #endif
 
 #if !defined(MIN)
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 6b061560f7..52879ee435 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -40,7 +40,7 @@
 #include <QuickTime/ImageCompression.h>
 #include <QuickTime/ImageCodec.h>
 #else
-#include "../loader/qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
 #endif
 
 #ifdef HAVE_ZLIB
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index e3f4965c40..818275905a 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -9,8 +9,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
@@ -161,8 +161,8 @@ extern int demux_aid_vid_mismatch;
 //-------- subtitle support - should be moved to decoder layer, and queue
 //                          - subtitles up in demuxer buffer...
 
-#include "../subreader.h"
-#include "../libvo/sub.h"
+#include "subreader.h"
+#include "libvo/sub.h"
 #define OGG_SUB_MAX_LINE 128
 
 static subtitle ogg_sub;
diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c
index 8c374bc255..2da02ce955 100644
--- a/libmpdemux/demux_rawaudio.c
+++ b/libmpdemux/demux_rawaudio.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../m_option.h"
+#include "m_option.h"
 
 #include "stream.h"
 #include "demuxer.h"
diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c
index 1bfc616dbb..b6cec47ef1 100644
--- a/libmpdemux/demux_rawvideo.c
+++ b/libmpdemux/demux_rawvideo.c
@@ -6,13 +6,13 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../m_option.h"
+#include "m_option.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libmpcodecs/img_format.h"
+#include "libmpcodecs/img_format.h"
 
 extern int demuxer_type;
 static int format = IMGFMT_I420;
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index a9a48dfc6a..b329e9ff71 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -35,7 +35,7 @@
 #include "stheader.h"
 
 #include "bswap.h"
-#include "../unrarlib.h"
+#include "unrarlib.h"
 #include "ms_hdr.h"
 #include "mpeg_hdr.h"
 
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index e7f5bd6136..f23d4000b5 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -43,7 +43,7 @@
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"
-#include "../sub_cc.h"
+#include "sub_cc.h"
 
 extern void skip_audio_frame( sh_audio_t *sh_audio );
 extern int sub_justify;
diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c
index 3e5ec2667d..17f27e429f 100644
--- a/libmpdemux/demux_ty_osd.c
+++ b/libmpdemux/demux_ty_osd.c
@@ -22,9 +22,9 @@
 //#include "parse_es.h"
 //#include "stheader.h"
 //#include "mp3_hdr.h"
-//#include "../subreader.h"
-#include "../sub_cc.h"
-#include "../libvo/sub.h"
+//#include "subreader.h"
+#include "sub_cc.h"
+#include "libvo/sub.h"
 
 //#include "dvdauth.h"
 
diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c
index 7e862b86db..092b0d6cd9 100644
--- a/libmpdemux/demux_vqf.c
+++ b/libmpdemux/demux_vqf.c
@@ -7,7 +7,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../libmpcodecs/vqf.h"
+#include "libmpcodecs/vqf.h"
 
 static int demux_probe_vqf(demuxer_t* demuxer) 
 {
diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c
index fb736a7b3f..bda2d6a0b8 100644
--- a/libmpdemux/demux_xmms.c
+++ b/libmpdemux/demux_xmms.c
@@ -12,8 +12,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "../m_option.h"
-#include "../libaf/af_format.h"
+#include "m_option.h"
+#include "libaf/af_format.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 44a6b14a8f..70ae47db4b 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -11,15 +11,15 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "../m_config.h"
+#include "m_config.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "mf.h"
 
-#include "../libaf/af_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/fastmemcpy.h"
 
 extern void resync_audio_stream(sh_audio_t *sh_audio);
 
diff --git a/libmpdemux/dvb_tune.c b/libmpdemux/dvb_tune.c
index d5ec1a12ae..75f16d04bf 100644
--- a/libmpdemux/dvb_tune.c
+++ b/libmpdemux/dvb_tune.c
@@ -53,7 +53,7 @@
 #endif
 
 #include "dvbin.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 
 
diff --git a/libmpdemux/dvbin.c b/libmpdemux/dvbin.c
index 0d9d4cc81c..d40073937c 100644
--- a/libmpdemux/dvbin.c
+++ b/libmpdemux/dvbin.c
@@ -44,8 +44,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "stream.h"
 #include "demuxer.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include "dvbin.h"
 
diff --git a/libmpdemux/dvdnav_stream.c b/libmpdemux/dvdnav_stream.c
index fe26f32247..4edf06350a 100644
--- a/libmpdemux/dvdnav_stream.c
+++ b/libmpdemux/dvdnav_stream.c
@@ -7,14 +7,14 @@
 #include <unistd.h>
 #include <string.h>
 #include "mp_msg.h"
-#include "../osdep/timer.h"
-#include "../input/input.h"
+#include "osdep/timer.h"
+#include "input/input.h"
 #include "stream.h"
 #include "dvdnav_stream.h"
-#include "../libvo/video_out.h"
-#include "../spudec.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "libvo/video_out.h"
+#include "spudec.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   int track;
diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c
index a033557777..ed11acbd7f 100644
--- a/libmpdemux/mf.c
+++ b/libmpdemux/mf.c
@@ -14,7 +14,7 @@
 #ifdef HAVE_GLOB
 #include <glob.h>
 #else
-#include "../osdep/glob.h"
+#include "osdep/glob.h"
 #endif
 
 #include "mp_msg.h"
diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c
index 591e04d570..cb59878466 100644
--- a/libmpdemux/mp3_hdr.c
+++ b/libmpdemux/mp3_hdr.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 //----------------------- mp3 audio frame header parser -----------------------
 
diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c
index 014bca5da9..fae7f453d3 100644
--- a/libmpdemux/muxer.c
+++ b/libmpdemux/muxer.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 #include "aviheader.h"
 #include "ms_hdr.h"
diff --git a/libmpdemux/muxer_avi.c b/libmpdemux/muxer_avi.c
index c156fe89bc..1585d5de55 100644
--- a/libmpdemux/muxer_avi.c
+++ b/libmpdemux/muxer_avi.c
@@ -6,7 +6,7 @@
 #include <limits.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 #include "stream.h"
 #include "demuxer.h"
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index 664a6085e5..98f4b2dc96 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -4,8 +4,8 @@
 #include <sys/types.h>
 #include <inttypes.h>
 #include "config.h"
-#include "../version.h"
-#include "../mp_msg.h"
+#include "version.h"
+#include "mp_msg.h"
 
 #include "bswap.h"
 #include "aviheader.h"
@@ -15,7 +15,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../m_option.h"
+#include "m_option.h"
 #include "avformat.h"
 
 extern unsigned int codec_get_wav_tag(int id);
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 3479d921f3..edd9b75ee6 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -5,8 +5,8 @@
 #include <sys/types.h>
 
 #include "config.h"
-#include "../version.h"
-#include "../mp_msg.h"
+#include "version.h"
+#include "mp_msg.h"
 
 #include "bswap.h"
 
@@ -17,7 +17,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../m_option.h"
+#include "m_option.h"
 #include "mpeg_hdr.h"
 
 #define PACK_HEADER_START_CODE 0x01ba
diff --git a/libmpdemux/muxer_rawvideo.c b/libmpdemux/muxer_rawvideo.c
index eff3eb019f..9ef82c3ab1 100644
--- a/libmpdemux/muxer_rawvideo.c
+++ b/libmpdemux/muxer_rawvideo.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 //#include "stream.h"
 //#include "demuxer.h"
diff --git a/libmpdemux/network.c b/libmpdemux/network.c
index 12982ca1d2..e172454a49 100644
--- a/libmpdemux/network.c
+++ b/libmpdemux/network.c
@@ -25,14 +25,14 @@
 
 #include "stream.h"
 #include "demuxer.h"
-#include "../m_config.h"
+#include "m_config.h"
 
 #include "network.h"
 #include "http.h"
 #include "cookies.h"
 #include "url.h"
 
-#include "../version.h"
+#include "version.h"
 
 extern int verbose;
 extern int stream_cache_size;
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index d1723c7b80..9d813d63f7 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -15,7 +15,7 @@
 #include <sys/cdrio.h>
 #endif
 
-#include "../m_option.h"
+#include "m_option.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "mf.h"
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index 05a4607d3b..84babf0ed5 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -23,13 +23,13 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "../osdep/shmem.h"
+#include "osdep/shmem.h"
 
 #include "stream.h"
 #include "demuxer.h"
 
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 
 extern int verbose; // defined in mplayer.c
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index da3f71e0f3..19c9e7a3fc 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -275,15 +275,15 @@ extern char * audio_stream;
 
 #ifdef USE_MPDVDKIT
 #if (USE_MPDVDKIT == 2)
-#include "../libmpdvdkit2/dvd_reader.h"
-#include "../libmpdvdkit2/ifo_types.h"
-#include "../libmpdvdkit2/ifo_read.h"
-#include "../libmpdvdkit2/nav_read.h"
+#include "libmpdvdkit2/dvd_reader.h"
+#include "libmpdvdkit2/ifo_types.h"
+#include "libmpdvdkit2/ifo_read.h"
+#include "libmpdvdkit2/nav_read.h"
 #else
-#include "../libmpdvdkit/dvd_reader.h"
-#include "../libmpdvdkit/ifo_types.h"
-#include "../libmpdvdkit/ifo_read.h"
-#include "../libmpdvdkit/nav_read.h"
+#include "libmpdvdkit/dvd_reader.h"
+#include "libmpdvdkit/ifo_types.h"
+#include "libmpdvdkit/ifo_read.h"
+#include "libmpdvdkit/nav_read.h"
 #endif
 #else
 #include <dvdread/dvd_reader.h>
diff --git a/libmpdemux/stream_dvd.c b/libmpdemux/stream_dvd.c
index 0da08459bc..eb0048b5a2 100644
--- a/libmpdemux/stream_dvd.c
+++ b/libmpdemux/stream_dvd.c
@@ -22,8 +22,8 @@
 #define FIRST_PCM_AID 160
 
 #include "stream.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 /// We keep these 2 for the gui atm, but they will be removed.
 int dvd_title=0;
diff --git a/libmpdemux/stream_file.c b/libmpdemux/stream_file.c
index b6c1028f5f..ba2c3b133c 100644
--- a/libmpdemux/stream_file.c
+++ b/libmpdemux/stream_file.c
@@ -10,8 +10,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   char* filename;
diff --git a/libmpdemux/stream_ftp.c b/libmpdemux/stream_ftp.c
index 19693dbaee..7cc01004b6 100644
--- a/libmpdemux/stream_ftp.c
+++ b/libmpdemux/stream_ftp.c
@@ -21,8 +21,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   char* user;
diff --git a/libmpdemux/stream_netstream.c b/libmpdemux/stream_netstream.c
index e054a25412..5316f0512f 100644
--- a/libmpdemux/stream_netstream.c
+++ b/libmpdemux/stream_netstream.c
@@ -60,9 +60,9 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
-#include "../bswap.h"
+#include "m_option.h"
+#include "m_struct.h"
+#include "bswap.h"
 
 #include "netstream.h"
 
diff --git a/libmpdemux/stream_smb.c b/libmpdemux/stream_smb.c
index d641e38f37..c92b1da432 100644
--- a/libmpdemux/stream_smb.c
+++ b/libmpdemux/stream_smb.c
@@ -9,8 +9,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
 } stream_priv_dflts = {
diff --git a/libmpdemux/stream_vcd.c b/libmpdemux/stream_vcd.c
index ed4cd84834..2e765d5d12 100644
--- a/libmpdemux/stream_vcd.c
+++ b/libmpdemux/stream_vcd.c
@@ -5,8 +5,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/libmpdemux/stream_vstream.c b/libmpdemux/stream_vstream.c
index b2967706ea..f32144f93a 100644
--- a/libmpdemux/stream_vstream.c
+++ b/libmpdemux/stream_vstream.c
@@ -51,8 +51,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include <vstream-client.h>
 
diff --git a/libmpdemux/test.c b/libmpdemux/test.c
index 9369b7e649..7e7ebd9d65 100644
--- a/libmpdemux/test.c
+++ b/libmpdemux/test.c
@@ -25,7 +25,7 @@ int mp_input_check_interrupt(int time){
 }
 
 // for libmpdvdkit2:
-#include "../get_path.c"
+#include "get_path.c"
 
 int verbose=5; // must be global!
 
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index 4070da7ac2..678d8c584b 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -29,9 +29,9 @@ int tv_param_on = 0;
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
+#include "libvo/fastmemcpy.h"
 
 #include "tv.h"
 
diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h
index df57161ade..10b4221ab4 100644
--- a/libmpdemux/tv.h
+++ b/libmpdemux/tv.h
@@ -4,9 +4,9 @@
 extern int tv_param_on;
 
 #ifdef USE_TV
-//#include "../libao2/afmt.h"
-//#include "../libvo/img_format.h"
-//#include "../libvo/fastmemcpy.h"
+//#include "libao2/afmt.h"
+//#include "libvo/img_format.h"
+//#include "libvo/fastmemcpy.h"
 //#include "mp_msg.h"
 
 extern char *tv_param_freq;
diff --git a/libmpdemux/tvi_bsdbt848.c b/libmpdemux/tvi_bsdbt848.c
index bebe4b635a..bd6f0253ef 100644
--- a/libmpdemux/tvi_bsdbt848.c
+++ b/libmpdemux/tvi_bsdbt848.c
@@ -64,8 +64,8 @@
 #endif
 #endif
 
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
 #include "tv.h"
 
 /* information about this file */
diff --git a/libmpdemux/tvi_dummy.c b/libmpdemux/tvi_dummy.c
index 6efb2db415..151d102489 100644
--- a/libmpdemux/tvi_dummy.c
+++ b/libmpdemux/tvi_dummy.c
@@ -7,7 +7,7 @@
 #ifdef USE_TV
 
 #include <stdio.h>
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "tv.h"
 
 /* information about this file */
diff --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c
index b3f962b302..0b376b4d9d 100644
--- a/libmpdemux/tvi_v4l.c
+++ b/libmpdemux/tvi_v4l.c
@@ -41,10 +41,10 @@
 #endif
 
 #include "mp_msg.h"
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
-#include "../libvo/videodev_mjpeg.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
+#include "libvo/fastmemcpy.h"
+#include "libvo/videodev_mjpeg.h"
 
 #include "tv.h"
 
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c
index 1d406606f6..9e67c9c4f1 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/libmpdemux/tvi_v4l2.c
@@ -42,9 +42,9 @@ known issues:
 #endif
 #include <linux/types.h>
 #include <linux/videodev2.h>
-#include "../mp_msg.h"
-#include "../libvo/img_format.h"
-#include "../libaf/af_format.h"
+#include "mp_msg.h"
+#include "libvo/img_format.h"
+#include "libaf/af_format.h"
 #include "tv.h"
 #include "audio_in.h"
 
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index 8a2f09c588..0c73bc7774 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -20,7 +20,7 @@
 #include "mpeg_hdr.h"
 
 /* sub_cc (closed captions)*/
-#include "../sub_cc.h"
+#include "sub_cc.h"
 
 /* biCompression constant */
 #define BI_RGB        0L