Useless #includes

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 10d2ccc3f2802b00226c444f2e88cda478cd794c..b454e030d980e9bf5965818cf4651c7714c748e0 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/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"

diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m
index b3552a74f9c823ed70cbdd2347d0f4f622ba5ebd..5145205dc3a56258a2e5c2965777c22bc02620eb 100644 (file)
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/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>

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 4995d95f04bc578e1005c66fa7d0b1c4e92c23be..c4360b8bc76f97d8e8355ac61885b04f69ca706d 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/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>

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index f6b28c92bce05854a112d948ee194be3e5040e7f..0ab2c3bcf1b43999f1cadb9f9f32f292bbd57721 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/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>
 

diff --git a/modules/gui/skins2/commands/cmd_quit.cpp b/modules/gui/skins2/commands/cmd_quit.cpp
index 92a4b7465b7963a1244c76893bacbd90b52ab430..e8961f5b53d28ab7d14459814b67b503ba0b0c15 100644 (file)
--- a/modules/gui/skins2/commands/cmd_quit.cpp
+++ b/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"

diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c
index 5870cb09211d1b06c42ebfc17f37be4010e16bca..2d3ee1f94a2a2ac5123854c2b50d425875ee8505 100644 (file)
--- a/modules/lua/libs/osd.c
+++ b/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"

diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
index 4f6a204daa5299e80aeb8ae169679c3103dd986f..f0da83683faebd6bb0b8a2d164e0c8afc61613bf 100644 (file)
--- a/modules/text_renderer/quartztext.c
+++ b/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>

diff --git a/modules/text_renderer/win32text.c b/modules/text_renderer/win32text.c
index 95eb8775b391217090b39107df174c5a204c2aeb..f759085bf1b4673fae8eec3b1d0f64bfab9b8fdb 100644 (file)
--- a/modules/text_renderer/win32text.c
+++ b/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>
 

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
index 9476500516ec05f14166ffd9884f6d3a719fd84e..789c272c21d676bfe8da313a7688fa8101b9dfcd 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c
+++ b/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>

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c
index ca79eea9d40b53187d6ab06b6cb13292c5fc54d7..9d0fc34cd5409e4c311e6eb2f3d1b727cd8b7b38 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c
+++ b/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>

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
index c77a2f8ec8e80ff08ab4a738460f290cf613f504..855b9d62d8b8e1046e6c2e44495c5309c50fbb62 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
+++ b/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>

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
index 2d911e87bcc39a83db5fe70e58d57a623a5550df..1eca32d64eca893b884caee2eaed9845e58e5025 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
+++ b/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"

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
index d92ac5d35c75c8fb45942853f01041e13243f278..7f27d4af5c6af49c1aa6dca41b674e1da24a5ce2 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_osd.h>
 
 #include "dynamicoverlay.h"
 

diff --git a/modules/video_filter/subsdelay.c b/modules/video_filter/subsdelay.c
index d693db8373c41812e9ec01da7a4c70d8d4d53ce9..6395db23da4d4bcb288ebd9d86e22760b0fc6f8c 100644 (file)
--- a/modules/video_filter/subsdelay.c
+++ b/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>
 

diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index e58551be0456f6c751bdd5b3275d1397b0eab410..d4c09410393001737ab08116c49e4b6f5b9585f4 100644 (file)
--- a/src/misc/filter_chain.c
+++ b/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>