Cleaned up the includes after the restructuring. Indicate which headers are

public and which are internal through <> vs "".


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

21 files changed, 64 insertions, 38 deletions

diff --git a/src/polyp/browser.c b/src/polyp/browser.c
index 80051d54..482bab81 100644
--- a/src/polyp/browser.c
+++ b/src/polyp/browser.c
@@ -22,11 +22,12 @@
 #include <assert.h>
 #include <howl.h>
 
-#include "browser.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 
+#include "browser.h"
+
 #define SERVICE_NAME_SINK "_polypaudio-sink._tcp."
 #define SERVICE_NAME_SOURCE "_polypaudio-source._tcp."
 #define SERVICE_NAME_SERVER "_polypaudio-server._tcp."
diff --git a/src/polyp/browser.h b/src/polyp/browser.h
index 3bb0d264..043b818a 100644
--- a/src/polyp/browser.h
+++ b/src/polyp/browser.h
@@ -25,7 +25,6 @@
 #include <polyp/mainloop-api.h>
 #include <polyp/sample.h>
 #include <polyp/cdecl.h>
-#include <polyp/typeid.h>
 
 PA_C_DECL_BEGIN
 
diff --git a/src/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c
index 83d0bd2e..9e863bc7 100644
--- a/src/polyp/client-conf-x11.c
+++ b/src/polyp/client-conf-x11.c
@@ -29,12 +29,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include "client-conf-x11.h"
 #include <polypcore/x11prop.h>
 #include <polypcore/log.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
+#include "client-conf-x11.h"
+
 int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
     Display *d = NULL;
     int ret = -1;
diff --git a/src/polyp/client-conf-x11.h b/src/polyp/client-conf-x11.h
index 80841171..64459224 100644
--- a/src/polyp/client-conf-x11.h
+++ b/src/polyp/client-conf-x11.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include <polyp/client-conf.h>
+#include "client-conf.h"
 
 /* Load client configuration data from the specified X11 display,
  * overwriting the current settings in *c */
diff --git a/src/polyp/client-conf.c b/src/polyp/client-conf.c
index 2df201ce..328d01c9 100644
--- a/src/polyp/client-conf.c
+++ b/src/polyp/client-conf.c
@@ -35,7 +35,7 @@
 #include <polypcore/util.h>
 #include <polypcore/authkey.h>
 
-#include <polyp/client-conf.h>
+#include "client-conf.h"
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
diff --git a/src/polyp/client-conf.h b/src/polyp/client-conf.h
index 2d8a019f..de3efae7 100644
--- a/src/polyp/client-conf.h
+++ b/src/polyp/client-conf.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "../polypcore/native-common.h"
+#include <polypcore/native-common.h>
 
 /* A structure containing configuration data for polypaudio clients. */
 
diff --git a/src/polyp/context.c b/src/polyp/context.c
index 4ac11caa..b7f7eb99 100644
--- a/src/polyp/context.c
+++ b/src/polyp/context.c
@@ -45,11 +45,10 @@
 #include <netdb.h>
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
+
+#include <polyp/version.h>
 
-#include "internal.h"
-#include "context.h"
-#include "version.h"
 #include <polypcore/native-common.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/pstream.h>
@@ -59,13 +58,18 @@
 #include <polypcore/util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
-#include <polyp/client-conf.h>
 #include <polypcore/socket-util.h>
 
+#include "internal.h"
+
+#include "client-conf.h"
+
 #ifdef HAVE_X11
 #include "client-conf-x11.h"
 #endif
 
+#include "context.h"
+
 #define AUTOSPAWN_LOCK "autospawn.lock"
 
 static const pa_pdispatch_callback command_table[PA_COMMAND_MAX] = {
diff --git a/src/polyp/error.c b/src/polyp/error.c
index a137ab49..ece77bf2 100644
--- a/src/polyp/error.c
+++ b/src/polyp/error.c
@@ -26,9 +26,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "error.h"
 #include <polypcore/native-common.h>
 
+#include "error.h"
+
 static const char* const errortab[PA_ERROR_MAX] = {
     [PA_ERROR_OK] = "OK",
     [PA_ERROR_ACCESS] = "Access denied",
diff --git a/src/polyp/glib-mainloop.c b/src/polyp/glib-mainloop.c
index 962eb574..3937a1a9 100644
--- a/src/polyp/glib-mainloop.c
+++ b/src/polyp/glib-mainloop.c
@@ -25,12 +25,13 @@
 
 #include <assert.h>
 
-#include <polyp/glib-mainloop.h>
 #include <polypcore/idxset.h>
 #include <polypcore/xmalloc.h>
-#include "glib.h"
 #include <polypcore/util.h>
 
+#include "glib.h"
+#include "glib-mainloop.h"
+
 struct pa_io_event  {
     pa_glib_mainloop *mainloop;
     int dead;
diff --git a/src/polyp/glib12-mainloop.c b/src/polyp/glib12-mainloop.c
index 80a02b1c..5ad23adb 100644
--- a/src/polyp/glib12-mainloop.c
+++ b/src/polyp/glib12-mainloop.c
@@ -25,11 +25,12 @@
 
 #include <assert.h>
 
-#include <polyp/glib-mainloop.h>
 #include <polypcore/idxset.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
+#include "glib-mainloop.h"
+
 /* A mainloop implementation based on GLIB 1.2 */
 
 struct pa_io_event {
diff --git a/src/polyp/internal.h b/src/polyp/internal.h
index bdfd5d8e..762688c9 100644
--- a/src/polyp/internal.h
+++ b/src/polyp/internal.h
@@ -23,20 +23,21 @@
 ***/
 
 #include <polyp/mainloop-api.h>
+#include <polyp/context.h>
+#include <polyp/stream.h>
+#include <polyp/operation.h>
+
 #include <polypcore/socket-client.h>
 #include <polypcore/pstream.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/dynarray.h>
-
-#include "context.h"
-#include "stream.h"
-#include "operation.h"
 #include <polypcore/llist.h>
 #include <polypcore/native-common.h>
-#include <polyp/client-conf.h>
 #include <polypcore/strlist.h>
 #include <polypcore/mcalign.h>
 
+#include "client-conf.h"
+
 #define DEFAULT_TIMEOUT (10)
 
 struct pa_context {
diff --git a/src/polyp/introspect.c b/src/polyp/introspect.c
index d89eb9ed..4af724b4 100644
--- a/src/polyp/introspect.c
+++ b/src/polyp/introspect.c
@@ -25,11 +25,14 @@
 
 #include <assert.h>
 
-#include "introspect.h"
-#include "context.h"
-#include "internal.h"
-#include <polypcore/pstream-util.h>
+#include <polyp/context.h>
+
 #include <polypcore/gccmacro.h>
+#include <polypcore/pstream-util.h>
+
+#include "internal.h"
+
+#include "introspect.h"
 
 /*** Statistics ***/
 
diff --git a/src/polyp/mainloop-api.c b/src/polyp/mainloop-api.c
index a3eaee9c..71f55c05 100644
--- a/src/polyp/mainloop-api.c
+++ b/src/polyp/mainloop-api.c
@@ -26,9 +26,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "mainloop-api.h"
-#include <polypcore/xmalloc.h>
 #include <polypcore/gccmacro.h>
+#include <polypcore/xmalloc.h>
+
+#include "mainloop-api.h"
 
 struct once_info {
     void (*callback)(pa_mainloop_api*m, void *userdata);
diff --git a/src/polyp/mainloop-signal.c b/src/polyp/mainloop-signal.c
index a03c9159..e474f461 100644
--- a/src/polyp/mainloop-signal.c
+++ b/src/polyp/mainloop-signal.c
@@ -36,12 +36,13 @@
 #include <windows.h>
 #endif
 
-#include <polyp/mainloop-signal.h>
 #include <polypcore/util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/gccmacro.h>
 
+#include "mainloop-signal.h"
+
 struct pa_signal_event {
     int sig;
 #ifdef HAVE_SIGACTION
diff --git a/src/polyp/mainloop.c b/src/polyp/mainloop.c
index 3fa9245c..71ea9bc4 100644
--- a/src/polyp/mainloop.c
+++ b/src/polyp/mainloop.c
@@ -38,14 +38,15 @@
 #include "poll.h"
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
 
-#include "mainloop.h"
 #include <polypcore/util.h>
 #include <polypcore/idxset.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
+#include "mainloop.h"
+
 struct pa_io_event {
     pa_mainloop *mainloop;
     int dead;
diff --git a/src/polyp/operation.c b/src/polyp/operation.c
index 0baa661b..5440cf9e 100644
--- a/src/polyp/operation.c
+++ b/src/polyp/operation.c
@@ -26,7 +26,9 @@
 #include <assert.h>
 
 #include <polypcore/xmalloc.h>
+
 #include "internal.h"
+
 #include "operation.h"
 
 pa_operation *pa_operation_new(pa_context *c, pa_stream *s) {
diff --git a/src/polyp/scache.c b/src/polyp/scache.c
index c274e359..393b069e 100644
--- a/src/polyp/scache.c
+++ b/src/polyp/scache.c
@@ -28,10 +28,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "scache.h"
-#include "internal.h"
 #include <polypcore/pstream-util.h>
 
+#include "internal.h"
+
+#include "scache.h"
+
 void pa_stream_connect_upload(pa_stream *s, size_t length) {
     pa_tagstruct *t;
     uint32_t tag;
diff --git a/src/polyp/simple.c b/src/polyp/simple.c
index 19c49c9b..e14cab2e 100644
--- a/src/polyp/simple.c
+++ b/src/polyp/simple.c
@@ -28,13 +28,15 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "simple.h"
-#include "polypaudio.h"
-#include "mainloop.h"
+#include <polyp/polypaudio.h>
+#include <polyp/mainloop.h>
+
 #include <polypcore/native-common.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
+#include "simple.h"
+
 struct pa_simple {
     pa_mainloop *mainloop;
     pa_context *context;
diff --git a/src/polyp/stream.c b/src/polyp/stream.c
index 007d5e24..6e5bc067 100644
--- a/src/polyp/stream.c
+++ b/src/polyp/stream.c
@@ -28,12 +28,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "internal.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 
+#include "internal.h"
+
 #define LATENCY_IPOL_INTERVAL_USEC (10000L)
 
 pa_stream *pa_stream_new(pa_context *c, const char *name, const pa_sample_spec *ss, const pa_channel_map *map) {
diff --git a/src/polyp/subscribe.c b/src/polyp/subscribe.c
index c481f525..b90e0bf1 100644
--- a/src/polyp/subscribe.c
+++ b/src/polyp/subscribe.c
@@ -26,10 +26,12 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "subscribe.h"
-#include "internal.h"
-#include <polypcore/pstream-util.h>
 #include <polypcore/gccmacro.h>
+#include <polypcore/pstream-util.h>
+
+#include "internal.h"
+
+#include "subscribe.h"
 
 void pa_command_subscribe_event(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
     pa_context *c = userdata;
diff --git a/src/polyp/version.h.in b/src/polyp/version.h.in
index c727381f..67b7495b 100644
--- a/src/polyp/version.h.in
+++ b/src/polyp/version.h.in
@@ -24,6 +24,8 @@
 
 /* WARNING: Make sure to edit the real source file version.h.in! */
 
+#include <polyp/cdecl.h>
+
 /** \file
  * Define header version */