Include vlc_services_discovery.h only where needed

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 1b0d34866a1eec108388055d05ecda52bcc21b81..4a885e55ee3acc77e8fbaa762100815f7e07acd3 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -30,9 +30,6 @@ extern "C" {
 
 #include <vlc_input.h>
 #include <vlc_events.h>
-#include <vlc_services_discovery.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t);
 

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index f18835a94af1927ced788e8e9f7d10f5c564c0ee..32fda56655a902a54978fe8b037a0aeb7adbc934 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include <vlc_intf_strings.h>
+#include <vlc_services_discovery.h>
 
 #include "menus.hpp"
 

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index a22bbe8aa6f48faf50a130c3f12f907e6def0821..5c7f8405cd45dc2b651d473e025951ce8d4aa67d 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -33,6 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_arrays.h>
+#include <vlc_services_discovery.h>
 
 #include <avahi-client/client.h>
 #include <avahi-client/publish.h>

diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c
index a4ef70320758279d6d35a35801755cb42cd5ea0c..2765b007f575af5c1c0259adb8444db4837c7b96 100644 (file)
--- a/modules/services_discovery/hal.c
+++ b/modules/services_discovery/hal.c
@@ -30,6 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
+#include <vlc_services_discovery.h>
 
 #include <vlc_network.h>
 

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index ceaf68f027f089cf39749d2a6cfbdb14b443bf8f..aa96ea5a4b5050a2032ccd7445b2096c7b86e533 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -32,6 +32,8 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
+#include <vlc_services_discovery.h>
+
 #include <vlc_network.h>
 #include <assert.h>
 

diff --git a/modules/services_discovery/upnp_cc.cpp b/modules/services_discovery/upnp_cc.cpp
index 09bce0f79dba5bbf4828148aacfd12c19cdfeb16..aed508ba66a720f2d593176f5c4f7f392346c89a 100644 (file)
--- a/modules/services_discovery/upnp_cc.cpp
+++ b/modules/services_discovery/upnp_cc.cpp
@@ -39,6 +39,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
+#include <vlc_services_discovery.h>
 
 /* FIXME: thread-safety ?? */
 /* FIXME: playlist locking */

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 03b11caef566673ee2bc2e690494f1bbe11c112c..6bf8638fe2d383843318dc9f9ecceda6a3f29e00 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -28,6 +28,7 @@
 #include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "vlc_events.h"
+#include <vlc_services_discovery.h>
 #include "playlist_internal.h"
 #include "../libvlc.h"