77 files changed, 97 insertions, 101 deletions
diff --git a/Makefile b/Makefile
index 15bbfbc31c..40f3251419 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ SRCS_AUDIO_INPUT-$(ALSA1X)           += stream/ai_alsa1x.c
 SRCS_AUDIO_INPUT-$(ALSA9)            += stream/ai_alsa.c
 SRCS_AUDIO_INPUT-$(OSS)              += stream/ai_oss.c
 SRCS_COMMON-$(AUDIO_INPUT)           += $(SRCS_AUDIO_INPUT-yes)
-SRCS_COMMON-$(BITMAP_FONT)           += libvo/font_load.c
+SRCS_COMMON-$(BITMAP_FONT)           += sub/font_load.c
 SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c \
                                         stream/cdinfo.c
 SRCS_COMMON-$(CDDB)                  += stream/stream_cddb.c
@@ -101,7 +101,6 @@ SRCS_COMMON-$(FASTMEMCPY)            += libvo/aclib.c
 SRCS_COMMON-$(FFMPEG)                += libmpcodecs/vf_pp.c \
                                         av_opts.c \
                                         libaf/af_lavcac3enc.c \
-                                        av_sub.c \
                                         libaf/af_lavcresample.c \
                                         libmpcodecs/ad_ffmpeg.c \
                                         libmpcodecs/vd_ffmpeg.c \
@@ -111,6 +110,7 @@ SRCS_COMMON-$(FFMPEG)                += libmpcodecs/vf_pp.c \
                                         libmpcodecs/vf_uspp.c \
                                         libmpdemux/demux_lavf.c \
                                         stream/stream_ffmpeg.c \
+                                        sub/av_sub.c \
 
 # Requires a new enough libavutil that installs eval.h
 SRCS_COMMON-$(FFMPEG_EVAL_API)          += libmpcodecs/vf_geq.c \
@@ -122,7 +122,7 @@ SRCS_COMMON-$(FFMPEG_INTERNALS)      += libmpcodecs/vf_fspp.c \
                                         libmpcodecs/vf_qp.c \
                                         libmpcodecs/vf_spp.c \
 
-SRCS_COMMON-$(FREETYPE)              += libvo/font_load_ft.c
+SRCS_COMMON-$(FREETYPE)              += sub/font_load_ft.c
 SRCS_COMMON-$(FTP)                   += stream/stream_ftp.c
 SRCS_COMMON-$(GIF)                   += libmpdemux/demux_gif.c
 SRCS_COMMON-$(HAVE_POSIX_SELECT)     += libmpcodecs/vf_bmovl.c
@@ -130,8 +130,8 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += libaf/af_export.c osdep/mmap_anon.c
 SRCS_COMMON-$(JPEG)                  += libmpcodecs/vd_ijpg.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
 SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c
-SRCS_COMMON-$(LIBASS)                += ass_mp.c \
-                                        libmpcodecs/vf_ass.c \
+SRCS_COMMON-$(LIBASS)                += libmpcodecs/vf_ass.c \
+                                        sub/ass_mp.c \
                                         sub/sd_ass.c \
 
 SRCS_COMMON-$(LIBBLURAY)             += stream/stream_bluray.c
@@ -269,7 +269,7 @@ SRCS_COMMON-$(TV_DSHOW)              += stream/tvi_dshow.c \
 
 SRCS_COMMON-$(TV_V4L1)               += stream/tvi_v4l.c  stream/audio_in.c
 SRCS_COMMON-$(TV_V4L2)               += stream/tvi_v4l2.c stream/audio_in.c
-SRCS_COMMON-$(UNRAR_EXEC)            += unrar_exec.c
+SRCS_COMMON-$(UNRAR_EXEC)            += sub/unrar_exec.c
 SRCS_COMMON-$(VCD)                   += stream/stream_vcd.c
 SRCS_COMMON-$(VORBIS)                += libmpcodecs/ad_libvorbis.c \
                                         libmpdemux/demux_ogg.c
@@ -328,7 +328,6 @@ SRCS_COMMON = asxparser.c \
               cpudetect.c \
               defaultopts.c \
               edl.c \
-              find_sub.c \
               fmt-conversion.c \
               m_config.c \
               m_option.c \
@@ -339,12 +338,8 @@ SRCS_COMMON = asxparser.c \
               path.c \
               playtree.c \
               playtreeparser.c \
-              spudec.c \
-              sub_cc.c \
               subopt-helper.c \
-              subreader.c \
               talloc.c \
-              vobsub.c \
               libaf/af.c \
               libaf/af_center.c \
               libaf/af_channels.c \
@@ -504,7 +499,6 @@ SRCS_COMMON = asxparser.c \
               libmpdemux/yuv4mpeg.c \
               libmpdemux/yuv4mpeg_ratio.c \
               libvo/osd.c \
-              libvo/sub.c \
               osdep/findfiles.c \
               osdep/numcores.c \
               osdep/$(GETCH) \
@@ -516,8 +510,14 @@ SRCS_COMMON = asxparser.c \
               stream/stream_mf.c \
               stream/stream_null.c \
               stream/url.c \
+              sub/sub.c \
+              sub/sub_cc.c \
               sub/dec_sub.c \
+              sub/find_sub.c \
+              sub/spudec.c \
               sub/subassconvert.c \
+              sub/subreader.c \
+              sub/vobsub.c \
               $(SRCS_COMMON-yes)
 
 
@@ -917,8 +917,8 @@ toolsclean:
 
 TOOLS/bmovl-test$(EXESUF): -lSDL_image
 
-TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \
-    libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS)
+TOOLS/subrip$(EXESUF): sub/vobsub.o sub/spudec.o sub/unrar_exec.o \
+    libvo/aclib.o \ libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS)
 
 TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32
 
diff --git a/TOOLS/subrip.c b/TOOLS/subrip.c
index 85ee1c78e0..fb9395c413 100644
--- a/TOOLS/subrip.c
+++ b/TOOLS/subrip.c
@@ -31,8 +31,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "libvo/video_out.h"
-#include "vobsub.h"
-#include "spudec.h"
+#include "sub/vobsub.h"
+#include "sub/spudec.h"
 
 /* linking hacks */
 char *mplayer_version;
diff --git a/command.c b/command.c
index 0cb5c35f15..c00112114e 100644
--- a/command.c
+++ b/command.c
@@ -31,7 +31,7 @@
 #include "libmpdemux/stheader.h"
 #include "codec-cfg.h"
 #include "mplayer.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "sub/dec_sub.h"
 #include "m_option.h"
 #include "m_property.h"
@@ -41,7 +41,7 @@
 #include "libmpcodecs/vd.h"
 #include "mp_osd.h"
 #include "libvo/video_out.h"
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
 #include "playtree.h"
 #include "libao2/audio_out.h"
 #include "mpcommon.h"
@@ -49,10 +49,10 @@
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_teletext.h"
-#include "vobsub.h"
-#include "spudec.h"
+#include "sub/vobsub.h"
+#include "sub/spudec.h"
 #include "path.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "stream/pvr.h"
diff --git a/libmenu/menu.c b/libmenu/menu.c
index 8a9cb28872..f537cd1671 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -26,8 +26,8 @@
 #include <unistd.h>
 
 #include "libvo/osd.h"
-#include "libvo/font_load.h"
-#include "libvo/sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
 #include "osdep/keycodes.h"
 #include "asxparser.h"
 #include "stream/stream.h"
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c
index 5b7812be5e..14026d04c4 100644
--- a/libmenu/menu_cmdlist.c
+++ b/libmenu/menu_cmdlist.c
@@ -33,7 +33,7 @@
 #include "menu.h"
 #include "menu_list.h"
 
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
 
 #include "input/input.h"
 
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index dd706b65cb..eb8595e9ab 100644
--- a/libmenu/menu_console.c
+++ b/libmenu/menu_console.c
@@ -38,7 +38,7 @@
 #include "m_option.h"
 #include "menu.h"
 
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
 #include "osdep/keycodes.h"
 #include "input/input.h"
 #include "osdep/timer.h"
diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c
index 28264ce04c..37f10d123e 100644
--- a/libmenu/menu_list.c
+++ b/libmenu/menu_list.c
@@ -29,7 +29,7 @@
 #include "m_struct.h"
 #include "menu.h"
 
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
 #include "osdep/keycodes.h"
 
 #define IMPL 1
diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c
index 308d9547c0..0170320884 100644
--- a/libmenu/menu_txt.c
+++ b/libmenu/menu_txt.c
@@ -30,7 +30,7 @@
 #include "m_option.h"
 #include "menu.h"
 
-#include "libvo/font_load.h"
+#include "sub/font_load.h"
 #include "osdep/keycodes.h"
 
 struct menu_priv_s {
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 1a5d003e94..994c7134ea 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -32,8 +32,8 @@
 
 #include "libvo/fastmemcpy.h"
 #include "libvo/video_out.h"
-#include "libvo/font_load.h"
-#include "libvo/sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
 #include "input/input.h"
 #include "m_struct.h"
 #include "menu.h"
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 39e5d8f3c5..4047316a50 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -33,14 +33,14 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 
 #include "libvo/fastmemcpy.h"
 
 #include "m_option.h"
 #include "m_struct.h"
 
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
 
 #define _r(c)  ((c)>>24)
 #define _g(c)  (((c)>>16)&0xFF)
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index 57226acb93..95580b9f26 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -35,7 +35,7 @@
 #include "libavutil/avutil.h"
 
 #ifdef OSD_SUPPORT
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "libvo/osd.h"
 #endif
 
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 4d94569ef3..8bbaf465b3 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -29,8 +29,8 @@
 
 #include "libvo/video_out.h"
 
-#include "ass_mp.h"
-#include "libvo/sub.h"
+#include "sub/ass_mp.h"
+#include "sub/sub.h"
 
 //===========================================================================//
 
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index c84a17e4e3..904cd1434b 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -36,7 +36,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 #include "m_option.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 
 #include "libavformat/avformat.h"
 #include "libavformat/avio.h"
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 499c664360..7432b59d46 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -41,11 +41,7 @@
 
 #include "mp_msg.h"
 
-#include "vobsub.h"
-#include "subreader.h"
-#include "libvo/sub.h"
-
-#include "ass_mp.h"
+#include "sub/sub.h"
 
 #include "libavutil/common.h"
 
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 3175ae34bd..5ecb076698 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -64,7 +64,7 @@
 #include "libavutil/common.h"
 #include "ffmpeg_files/intreadwrite.h"
 
-#include "libvo/sub.h"
+#include "sub/sub.h"
 
 #include "demux_mov.h"
 #include "qtpalette.h"
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 1883c36cd1..3ba2627414 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -166,8 +166,8 @@ typedef struct ogg_demuxer {
 //-------- subtitle support - should be moved to decoder layer, and queue
 //                          - subtitles up in demuxer buffer...
 
-#include "subreader.h"
-#include "libvo/sub.h"
+#include "sub/subreader.h"
+#include "sub/sub.h"
 #define OGG_SUB_MAX_LINE 128
 
 static subtitle ogg_sub;
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index 3120404d49..df4c6c34fd 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -44,7 +44,7 @@
 #include "demux_ty_osd.h"
 #include "parse_es.h"
 #include "stheader.h"
-#include "sub_cc.h"
+#include "sub/sub_cc.h"
 #include "libavutil/avstring.h"
 #include "ffmpeg_files/intreadwrite.h"
 
diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c
index 0d419b0813..983c243f98 100644
--- a/libmpdemux/demux_ty_osd.c
+++ b/libmpdemux/demux_ty_osd.c
@@ -23,8 +23,8 @@
 //#include "stheader.h"
 //#include "mp3_hdr.h"
 //#include "subreader.h"
-#include "sub_cc.h"
-#include "libvo/sub.h"
+#include "sub/sub_cc.h"
+#include "sub/sub.h"
 #include "demux_ty_osd.h"
 
 //#include "dvdauth.h"
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index bda6e661ae..400a995d57 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -38,7 +38,7 @@
 #include "mpeg_hdr.h"
 
 /* sub_cc (closed captions)*/
-#include "sub_cc.h"
+#include "sub/sub_cc.h"
 
 /* biCompression constant */
 #define BI_RGB        0L
diff --git a/libvo/old_vo_wrapper.c b/libvo/old_vo_wrapper.c
index bdbc8b8349..a99511d831 100644
--- a/libvo/old_vo_wrapper.c
+++ b/libvo/old_vo_wrapper.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include "old_vo_wrapper.h"
 #include "video_out.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 struct vo *global_vo;
 struct osd_state *global_osd;
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c
index 4f4c796250..f5cbab4757 100644
--- a/libvo/vesa_lvo.c
+++ b/libvo/vesa_lvo.c
@@ -39,7 +39,7 @@
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "libmpcodecs/vfcap.h"
 
 #define WIDTH_ALIGN 32 /* should be 16 for rage:422 and 32 for rage:420 */
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 3e55803982..99e313d399 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -39,8 +39,8 @@
 #include "aspect.h"
 #include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
-#include "font_load.h"
-#include "sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
 
 #include "osdep/keycodes.h"
 #include <aalib.h>
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c
index 75e862ef91..2a5ebad4e7 100644
--- a/libvo/vo_caca.c
+++ b/libvo/vo_caca.c
@@ -35,7 +35,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "osdep/keycodes.h"
 #include "mp_msg.h"
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index 585898a076..a964de7e57 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -40,7 +40,7 @@
 #include "mp_msg.h"
 #include "m_option.h"
 #include "mp_fifo.h"
-#include "libvo/sub.h"
+#include "sub/sub.h"
 #include "subopt-helper.h"
 
 #include "input/input.h"
diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c
index a0a9d07760..b83f3c5e52 100644
--- a/libvo/vo_dfbmga.c
+++ b/libvo/vo_dfbmga.c
@@ -31,7 +31,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 #include "aspect.h"
 #include "mp_fifo.h"
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index 879831761d..94d42774a8 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -333,7 +333,7 @@ static void check_events(void)
 
 //---------------------------------------------------------
 
-#include "sub.h"
+#include "sub/sub.h"
 
 static void draw_osd(void)
 {
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c
index 384dcb477b..65f5a6c2d1 100644
--- a/libvo/vo_direct3d.c
+++ b/libvo/vo_direct3d.c
@@ -30,8 +30,8 @@
 #include "aspect.h"
 #include "w32_common.h"
 #include "libavutil/common.h"
-#include "font_load.h"
-#include "sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
 
 static const vo_info_t info =
 {
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index 1fb5577075..c011d20225 100644
--- a/libvo/vo_directfb2.c
+++ b/libvo/vo_directfb2.c
@@ -33,7 +33,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 #include "aspect.h"
 #include "subopt-helper.h"
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index b80f0bdc01..494d6c8424 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -37,7 +37,7 @@
 #include "aspect.h"
 #include "geometry.h"
 #include "mp_fifo.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #ifndef WM_XBUTTONDOWN
 # define WM_XBUTTONDOWN    0x020B
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c
index 00d5d2f3c0..71c402cd9a 100644
--- a/libvo/vo_dxr2.c
+++ b/libvo/vo_dxr2.c
@@ -34,7 +34,7 @@
 #include "video_out_internal.h"
 #include "mp_msg.h"
 #include "m_option.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "path.h"
 #include "libmpdemux/mpeg_packetizer.h"
 #include "x11_common.h"
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 3494e25f00..8f7b471306 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -42,7 +42,7 @@
 #include "video_out_internal.h"
 #include "aspect.h"
 #include "spuenc.h"
-#include "sub.h"
+#include "sub/sub.h"
 #ifdef CONFIG_X11
 #include "x11_common.h"
 #endif
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 991673a9cd..2d422af269 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -39,7 +39,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "geometry.h"
 #ifdef CONFIG_VIDIX
 #include "vosub_vidix.h"
diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c
index a4929afe13..612b145464 100644
--- a/libvo/vo_fbdev2.c
+++ b/libvo/vo_fbdev2.c
@@ -34,7 +34,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 
 static const vo_info_t info = {
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 8ffd82b6fd..c062614d3a 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -31,13 +31,13 @@
 #include "subopt-helper.h"
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "font_load.h"
-#include "sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
 
 #include "gl_common.h"
 #include "aspect.h"
 #include "fastmemcpy.h"
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
 
 #ifdef CONFIG_GL_SDL
 #ifdef CONFIG_SDL_SDL_H
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 14137f76a6..957125069b 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -29,7 +29,7 @@
 #include "subopt-helper.h"
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "gl_common.h"
 #include "aspect.h"
diff --git a/libvo/vo_kva.c b/libvo/vo_kva.c
index 7994fe9143..155a779e4e 100644
--- a/libvo/vo_kva.c
+++ b/libvo/vo_kva.c
@@ -47,7 +47,7 @@
 #include "input/input.h"
 #include "input/mouse.h"
 #include "subopt-helper.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "cpudetect.h"
 #include "libswscale/swscale.h"
diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c
index d398ec001a..df99251847 100644
--- a/libvo/vo_mga.c
+++ b/libvo/vo_mga.c
@@ -34,7 +34,7 @@
 #include <linux/fb.h>
 
 #include "drivers/mga_vid.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 static const vo_info_t info =
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index 07edf2538d..65797c988b 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -48,7 +48,7 @@
 #include "m_option.h"
 #include "mp_fifo.h"
 #include "mpbswap.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "input/input.h"
 #include "input/mouse.h"
diff --git a/libvo/vo_s3fb.c b/libvo/vo_s3fb.c
index 5b884b75b8..a0d54e0ca9 100644
--- a/libvo/vo_s3fb.c
+++ b/libvo/vo_s3fb.c
@@ -44,7 +44,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "aspect.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 static const vo_info_t info =
   {
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 9715dd98fb..be6e741295 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -63,7 +63,7 @@
 #include "video_out_internal.h"
 
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 #include "libmpcodecs/vfcap.h"
 
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index c74cf61089..d44821df05 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -59,7 +59,7 @@ TODO:
 #include "vosub_vidix.h"
 #endif
 
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "mp_msg.h"
 //#include "mp_image.h"
diff --git a/libvo/vo_tdfxfb.c b/libvo/vo_tdfxfb.c
index b9255eaf8f..6e14f600b7 100644
--- a/libvo/vo_tdfxfb.c
+++ b/libvo/vo_tdfxfb.c
@@ -62,7 +62,7 @@
 #include "video_out_internal.h"
 #include "drivers/3dfx.h"
 #include "aspect.h"
-#include "sub.h"
+#include "sub/sub.h"
 
 static const vo_info_t info =
 {
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 68ff7c2573..210fe797dc 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -41,7 +41,7 @@
 #include "video_out.h"
 #include "x11_common.h"
 #include "aspect.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "subopt-helper.h"
 #include "libmpcodecs/vfcap.h"
 #include "libmpcodecs/mp_image.h"
@@ -49,12 +49,12 @@
 
 #include "libavcodec/vdpau.h"
 
-#include "font_load.h"
+#include "sub/font_load.h"
 
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
 
 #define WRAP_ADD(x, a, m) ((a) < 0 \
                            ? ((x)+(a)+(m) < (m) ? (x)+(a)+(m) : (x)+(a)) \
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index 8c367586ee..698b9f033a 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -48,7 +48,7 @@
 #include "video_out_internal.h"
 
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
 #include "aspect.h"
diff --git a/libvo/vo_wii.c b/libvo/vo_wii.c
index 148e641bdb..b7c07fc6cb 100644
--- a/libvo/vo_wii.c
+++ b/libvo/vo_wii.c
@@ -51,7 +51,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 
 static const vo_info_t info = {
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index bdf561cb53..ec85c7b747 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -46,7 +46,7 @@ static int gXErrorFlag;
 static int CompletionType = -1;
 #endif
 
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 9072c8b3a2..cc6cd1cd0e 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -46,7 +46,7 @@
 #endif
 
 #include "x11_common.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 #ifdef SHOW_TIME
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 63221782e2..67d1cffb95 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -56,7 +56,7 @@ Buffer allocation:
 #include "x11_common.h"
 
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 #include "subopt-helper.h"
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 252a2cf87f..21a279beaa 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -45,7 +45,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/xvmc.h"
 
-#include "sub.h"
+#include "sub/sub.h"
 #include "aspect.h"
 
 #include "subopt-helper.h"
diff --git a/libvo/vo_xvr100.c b/libvo/vo_xvr100.c
index 7a82c436fb..fcd3b35b54 100644
--- a/libvo/vo_xvr100.c
+++ b/libvo/vo_xvr100.c
@@ -48,7 +48,7 @@
 #include "aspect.h"
 #include "geometry.h"
 #include "fastmemcpy.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "mp_msg.h"
 
 
diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c
index 5901cce2c2..67013eaa90 100644
--- a/libvo/vo_yuv4mpeg.c
+++ b/libvo/vo_yuv4mpeg.c
@@ -51,7 +51,7 @@
 
 #include "mp_msg.h"
 
-#include "sub.h"
+#include "sub/sub.h"
 
 #include "fastmemcpy.h"
 #include "libavutil/rational.h"
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index b06306e98b..f4add7db4c 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -41,7 +41,7 @@
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
-#include "sub.h"
+#include "sub/sub.h"
 #include "vosub_vidix.h"
 #include "old_vo_wrapper.h"
 
diff --git a/mp_core.h b/mp_core.h
index 5ad01a0964..825718f161 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -23,7 +23,7 @@
 
 #include "options.h"
 #include "mixer.h"
-#include "subreader.h"
+#include "sub/subreader.h"
 
 // definitions used internally by the core player code
 
diff --git a/mplayer.c b/mplayer.c
index 1d8b74892c..5618bd4777 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -71,16 +71,16 @@
 
 #include "libavutil/avstring.h"
 
-#include "subreader.h"
+#include "sub/subreader.h"
 #include "sub/dec_sub.h"
 
 #include "mp_osd.h"
 #include "libvo/video_out.h"
 
-#include "libvo/font_load.h"
-#include "libvo/sub.h"
+#include "sub/font_load.h"
+#include "sub/sub.h"
 #include "ffmpeg_files/intreadwrite.h"
-#include "av_sub.h"
+#include "sub/av_sub.h"
 #include "libmpcodecs/dec_teletext.h"
 #include "cpudetect.h"
 #include "version.h"
@@ -95,8 +95,8 @@
 
 #include "edl.h"
 
-#include "spudec.h"
-#include "vobsub.h"
+#include "sub/spudec.h"
+#include "sub/vobsub.h"
 
 #include "osdep/getch2.h"
 #include "osdep/timer.h"
@@ -335,7 +335,7 @@ char *vobsub_name=NULL;
 int   subcc_enabled=0;
 int suboverlap_enabled = 1;
 
-#include "ass_mp.h"
+#include "sub/ass_mp.h"
 
 char* current_module=NULL; // for debugging
 
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index bbd2b2085b..21522f8b6b 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -33,7 +33,7 @@
 #include "stream_dvdnav.h"
 #include "libvo/video_out.h"
 #include "libavutil/common.h"
-#include "spudec.h"
+#include "sub/spudec.h"
 #include "m_option.h"
 #include "m_struct.h"
 #include "stream_dvd_common.h"
diff --git a/ass_mp.c b/sub/ass_mp.c
index 98602ace03..98602ace03 100644
--- a/ass_mp.c
+++ b/sub/ass_mp.c
diff --git a/ass_mp.h b/sub/ass_mp.h
index 965b063403..965b063403 100644
--- a/ass_mp.h
+++ b/sub/ass_mp.h
diff --git a/av_sub.c b/sub/av_sub.c
index 49e5d5baaf..a68fbce083 100644
--- a/av_sub.c
+++ b/sub/av_sub.c
@@ -19,7 +19,7 @@
 #include <libavcodec/avcodec.h>
 
 #include "libmpdemux/stheader.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "spudec.h"
 #include "av_sub.h"
 
diff --git a/av_sub.h b/sub/av_sub.h
index af3edc4d34..af3edc4d34 100644
--- a/av_sub.h
+++ b/sub/av_sub.h
diff --git a/find_sub.c b/sub/find_sub.c
index 7eeefda9d1..97c232b1db 100644
--- a/find_sub.c
+++ b/sub/find_sub.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "subreader.h"
 
 #include "mp_msg.h"
diff --git a/libvo/font_load.c b/sub/font_load.c
index e9980b8e41..e9980b8e41 100644
--- a/libvo/font_load.c
+++ b/sub/font_load.c
diff --git a/libvo/font_load.h b/sub/font_load.h
index 7efe067aaf..7efe067aaf 100644
--- a/libvo/font_load.h
+++ b/sub/font_load.h
diff --git a/libvo/font_load_ft.c b/sub/font_load_ft.c
index 41a0f886cb..41a0f886cb 100644
--- a/libvo/font_load_ft.c
+++ b/sub/font_load_ft.c
diff --git a/libvo/osd_font.h b/sub/osd_font.h
index 6be45bc1fa..6be45bc1fa 100644
--- a/libvo/osd_font.h
+++ b/sub/osd_font.h
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index be2740bfa6..ba5710611e 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -25,7 +25,7 @@
 
 #include "mpcommon.h"
 #include "libmpdemux/stheader.h"
-#include "libvo/sub.h"
+#include "sub.h"
 #include "ass_mp.h"
 #include "sd.h"
 #include "subassconvert.h"
diff --git a/spudec.c b/sub/spudec.c
index f48d47fd2a..f48d47fd2a 100644
--- a/spudec.c
+++ b/sub/spudec.c
diff --git a/spudec.h b/sub/spudec.h
index 2b3828c34c..2b3828c34c 100644
--- a/spudec.h
+++ b/sub/spudec.h
diff --git a/libvo/sub.c b/sub/sub.c
index 2c0f29d485..75d43c2c48 100644
--- a/libvo/sub.c
+++ b/sub/sub.c
@@ -35,7 +35,7 @@
 #include "talloc.h"
 #include "mplayer.h"
 #include "mp_msg.h"
-#include "video_out.h"
+#include "libvo/video_out.h"
 #include "font_load.h"
 #include "sub.h"
 #include "spudec.h"
diff --git a/libvo/sub.h b/sub/sub.h
index 8309613ea6..8309613ea6 100644
--- a/libvo/sub.h
+++ b/sub/sub.h
diff --git a/sub_cc.c b/sub/sub_cc.c
index 2422518355..f18fa28c54 100644
--- a/sub_cc.c
+++ b/sub/sub_cc.c
@@ -38,7 +38,7 @@
 #include "subreader.h"
 
 #include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "sub.h"
 
 
 #define CC_MAX_LINE_LENGTH 64
diff --git a/sub_cc.h b/sub/sub_cc.h
index f5f6924057..f5f6924057 100644
--- a/sub_cc.h
+++ b/sub/sub_cc.h
diff --git a/subreader.c b/sub/subreader.c
index 10794b2ff5..1f9294ec47 100644
--- a/subreader.c
+++ b/sub/subreader.c
@@ -33,7 +33,7 @@
 #include "mp_msg.h"
 #include "subreader.h"
 #include "mpcommon.h"
-#include "sub/subassconvert.h"
+#include "subassconvert.h"
 #include "options.h"
 #include "stream/stream.h"
 #include "libavutil/common.h"
diff --git a/subreader.h b/sub/subreader.h
index 9c7465d71a..9c7465d71a 100644
--- a/subreader.h
+++ b/sub/subreader.h
diff --git a/unrar_exec.c b/sub/unrar_exec.c
index 6de8c59bef..6de8c59bef 100644
--- a/unrar_exec.c
+++ b/sub/unrar_exec.c
diff --git a/unrar_exec.h b/sub/unrar_exec.h
index 5754083fd7..5754083fd7 100644
--- a/unrar_exec.h
+++ b/sub/unrar_exec.h
diff --git a/vobsub.c b/sub/vobsub.c
index 08efa3acec..08efa3acec 100644
--- a/vobsub.c
+++ b/sub/vobsub.c
diff --git a/vobsub.h b/sub/vobsub.h
index b076e4b6bc..b076e4b6bc 100644
--- a/vobsub.h
+++ b/sub/vobsub.h