From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Sat, 10 Jan 2009 17:15:34 +0000 (+0200)
Subject: Include vlc_services_discovery.h only where needed
X-Git-Tag: 1.0.0-pre1~1428
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7ab4f13d30c26e769f8ae7f48499109e3b177ab8;p=vlc

Include vlc_services_discovery.h only where needed
---

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 1b0d34866a..4a885e55ee 100644
--- 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 f18835a94a..32fda56655 100644
--- 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 a22bbe8aa6..5c7f8405cd 100644
--- 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 a4ef703207..2765b007f5 100644
--- 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 ceaf68f027..aa96ea5a4b 100644
--- 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 09bce0f79d..aed508ba66 100644
--- 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 03b11caef5..6bf8638fe2 100644
--- 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"