Useless #includes

modules/control/hotkeys.c

@@ -36,7 +36,7 @@
 #include <vlc_input.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
-#include <vlc_osd.h>
+#include <vlc_vout_osd.h>
 #include <vlc_playlist.h>
 #include <vlc_keys.h>
 #include "math.h"

modules/gui/macosx/CoreInteraction.m

@@ -29,7 +29,8 @@
 #import <vlc_playlist.h>
 #import <vlc_input.h>
 #import <vlc_keys.h>
-#import <vlc_osd.h>
+#import <vlc_vout.h>
+#import <vlc_vout_osd.h>
 #import <vlc/vlc.h>
 #import <vlc_strings.h>
 #import <vlc_url.h>

modules/gui/macosx/playlist.m

@@ -50,7 +50,6 @@
 #import "MainMenu.h"
 
 #include <vlc_keys.h>
-#import <vlc_osd.h>
 #import <vlc_interface.h>
 
 #include <vlc_url.h>

modules/gui/qt4/components/extended_panels.cpp

@@ -49,7 +49,6 @@
 #include "../../audio_filter/equalizer_presets.h"
 #include <vlc_intf_strings.h>
 #include <vlc_vout.h>
-#include <vlc_osd.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
 

modules/gui/skins2/commands/cmd_quit.cpp

@@ -26,7 +26,8 @@
 #   include "config.h"
 #endif
 
-#include <vlc_osd.h>
+#include <vlc_vout.h>
+#include <vlc_vout_osd.h>
 #include <vlc_playlist.h>
 
 #include "cmd_quit.hpp"

modules/lua/libs/osd.c

@@ -33,7 +33,7 @@
 #endif
 
 #include <vlc_vout.h>
-#include <vlc_osd.h>
+#include <vlc_vout_osd.h>
 
 #include "../vlc.h"
 #include "../libs.h"

modules/text_renderer/quartztext.c

@@ -33,7 +33,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_osd.h>
 #include <vlc_stream.h>
 #include <vlc_xml.h>
 #include <vlc_input.h>

modules/text_renderer/win32text.c

@@ -34,7 +34,6 @@
 #include <vlc_charset.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
-#include <vlc_osd.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
 

modules/video_filter/dynamicoverlay/dynamicoverlay.c

@@ -33,7 +33,6 @@
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>
-#include <vlc_osd.h>
 #include <vlc_fs.h>
 
 #include <ctype.h>

modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c

@@ -27,7 +27,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 
 #include <ctype.h>

modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c

@@ -30,7 +30,6 @@
 #include <vlc_arrays.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>
-#include <vlc_osd.h>
 
 #include <string.h>
 #include <ctype.h>

modules/video_filter/dynamicoverlay/dynamicoverlay_list.c

@@ -27,7 +27,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_osd.h>
 #include <vlc_memory.h>
 
 #include "dynamicoverlay.h"

modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c

@@ -27,7 +27,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_osd.h>
 
 #include "dynamicoverlay.h"
 

modules/video_filter/subsdelay.c

@@ -33,7 +33,6 @@
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_subpicture.h>
-#include <vlc_osd.h>
 #include <vlc_es.h>
 #include <stdlib.h>
 

src/misc/filter_chain.c

@@ -26,8 +26,8 @@
 #endif
 
 #include <vlc_filter.h>
-#include <vlc_osd.h>
 #include <vlc_modules.h>
+#include <vlc_spu.h>
 #include <libvlc.h>
 #include <assert.h>