shorten include list of utils a little

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@495 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/utils/pabrowse.c b/src/utils/pabrowse.c
index 290531e..344e328 100644 (file)
--- a/src/utils/pabrowse.c
+++ b/src/utils/pabrowse.c
@@ -30,7 +30,6 @@
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
 #include <polyp/browser.h>
-#include <polyp/typeid.h>
 
 static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
     fprintf(stderr, "Got signal, exiting\n");

diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index a4f3d3a..3c50402 100644 (file)
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -32,11 +32,9 @@
 #include <stdlib.h>
 #include <getopt.h>
 
-#include <polyp/polyplib.h>
-#include <polyp/error.h>
+#include <polyp/polypaudio.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
-#include <polyp/version.h>
 
 #if PA_API_VERSION != 8
 #error Invalid Polypaudio API version

diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 7d903eb..4c22c92 100644 (file)
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -35,11 +35,9 @@
 
 #include <sndfile.h>
 
-#include <polyp/polyplib.h>
-#include <polyp/error.h>
+#include <polyp/polypaudio.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
-#include <polyp/sample.h>
 
 #if PA_API_VERSION != 8
 #error Invalid Polypaudio API version

diff --git a/src/utils/paplay.c b/src/utils/paplay.c
index 1b3697f..9f73b83 100644 (file)
--- a/src/utils/paplay.c
+++ b/src/utils/paplay.c
@@ -34,11 +34,9 @@
 
 #include <sndfile.h>
 
-#include <polyp/polyplib.h>
-#include <polyp/error.h>
+#include <polyp/polypaudio.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
-#include <polyp/version.h>
 
 #if PA_API_VERSION != 8
 #error Invalid Polypaudio API version

diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 63ee482..908a350 100644 (file)
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -35,8 +35,8 @@
 #include <polypcore/log.h>
 #include <polypcore/authkey.h>
 #include <polypcore/native-common.h>
-#include <polyp/client-conf.h>
 #include <polypcore/x11prop.h>
+#include <polyp/client-conf.h>
 
 int main(int argc, char *argv[]) {
     const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;