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

src/daemon/caps.c

@@ -33,6 +33,7 @@
 #endif
 
 #include <polypcore/log.h>
+
 #include "caps.h"
 
 #ifdef HAVE_GETUID

src/daemon/cmdline.c

@@ -30,11 +30,12 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include "cmdline.h"
 #include <polypcore/util.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/xmalloc.h>
 
+#include "cmdline.h"
+
 /* Argument codes for getopt_long() */
 enum {
     ARG_HELP = 256,

src/daemon/cpulimit.c

@@ -23,10 +23,11 @@
 #include <config.h>
 #endif
 
-#include "cpulimit.h"
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 
+#include "cpulimit.h"
+
 #ifdef HAVE_SIGXCPU
 
 #include <errno.h>

src/daemon/daemon-conf.c

@@ -29,13 +29,14 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "daemon-conf.h"
 #include <polypcore/util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/resampler.h>
 
+#include "daemon-conf.h"
+
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
 #  define DEFAULT_CONFIG_DIR "/etc/polypaudio"

src/daemon/dumpmodules.c

@@ -29,10 +29,11 @@
 #include <stdio.h>
 #include <ltdl.h>
 
-#include "dumpmodules.h"
 #include <polypcore/modinfo.h>
 #include <polypcore/util.h>
 
+#include "dumpmodules.h"
+
 #define PREFIX "module-"
 
 static void short_info(const char *name, PA_GCC_UNUSED const char *path, pa_modinfo *i) {

src/daemon/main.c

@@ -47,27 +47,29 @@
 #include <tcpd.h>
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
+
+#include <polyp/mainloop.h>
+#include <polyp/mainloop-signal.h>
 
 #include <polypcore/core.h>
 #include <polypcore/memblock.h>
-#include <polyp/mainloop.h>
 #include <polypcore/module.h>
-#include <polyp/mainloop-signal.h>
-#include "cmdline.h"
 #include <polypcore/cli-command.h>
+#include <polypcore/log.h>
 #include <polypcore/util.h>
 #include <polypcore/sioman.h>
 #include <polypcore/xmalloc.h>
-#include "cpulimit.h"
-#include <polypcore/log.h>
-#include "daemon-conf.h"
-#include "dumpmodules.h"
-#include "caps.h"
 #include <polypcore/cli-text.h>
 #include <polypcore/pid.h>
 #include <polypcore/namereg.h>
 
+#include "cmdline.h"
+#include "cpulimit.h"
+#include "daemon-conf.h"
+#include "dumpmodules.h"
+#include "caps.h"
+
 #ifdef HAVE_LIBWRAP
 /* Only one instance of these variables */
 int allow_severity = LOG_INFO;

src/modules/howl-wrap.c

@@ -21,10 +21,11 @@
 
 #include <assert.h>
 
+#include <polypcore/log.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/props.h>
+
 #include "howl-wrap.h"
-#include "log.h"
-#include "xmalloc.h"
-#include "props.h"
 
 #define HOWL_PROPERTY "howl"
 

src/modules/howl-wrap.h

@@ -24,7 +24,7 @@
 
 #include <howl.h>
 
-#include "core.h"
+#include <polypcore/core.h>
 
 pa_howl_wrapper;
 

src/modules/module-alsa-sink.c

@@ -44,8 +44,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-alsa-sink-symdef.h"
 #include "alsa-util.h"
+#include "module-alsa-sink-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Sink")

src/modules/module-alsa-source.c

@@ -44,8 +44,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-alsa-source-symdef.h"
 #include "alsa-util.h"
+#include "module-alsa-source-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Source")

src/modules/module-oss.c

@@ -45,8 +45,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-oss-symdef.h"
 #include "oss-util.h"
+#include "module-oss-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("OSS Sink/Source")

src/modules/module-protocol-stub.c

@@ -40,7 +40,7 @@
 #include <netinet/in.h>
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
 
 #include <polypcore/module.h>
 #include <polypcore/socket-server.h>

src/modules/module-zeroconf-publish.c

@@ -29,7 +29,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polypcore/howl-wrap.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/autoload.h>
 #include <polypcore/sink.h>
@@ -37,11 +36,14 @@
 #include <polypcore/native-common.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/subscribe.h>
+#include <polypcore/core-subscribe.h>
 #include <polypcore/dynarray.h>
-#include <polypcore/endianmacros.h>
 #include <polypcore/modargs.h>
 
+#include "../polypcore/endianmacros.h"
+
+#include "howl-wrap.h"
+
 #include "module-zeroconf-publish-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

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."

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
 

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;

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 */

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

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. */
 

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] = {

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",

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;

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 {

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 {

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 ***/
 

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);

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

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;

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) {

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;

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;

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) {

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;

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 */
 

src/polypcore/authkey-prop.c

@@ -22,10 +22,11 @@
 #include <assert.h>
 #include <string.h>
 
-#include "xmalloc.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/props.h>
+#include <polypcore/log.h>
+
 #include "authkey-prop.h"
-#include "props.h"
-#include "log.h"
 
 struct authkey_data {
     int ref;

src/polypcore/authkey-prop.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "core.h"
+#include <polypcore/core.h>
 
 /* The authkey-prop uses a central property to store a previously
  * loaded cookie in memory. Useful for sharing the same cookie between

src/polypcore/authkey.c

@@ -35,10 +35,11 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/random.h>
+
 #include "authkey.h"
-#include "util.h"
-#include "log.h"
-#include "random.h"
 
 /* Generate a new authorization key, store it in file fd and return it in *data  */
 static int generate(int fd, void *ret_data, size_t length) {

src/polypcore/autoload.c

@@ -27,14 +27,15 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/module.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sound-file.h>
+#include <polypcore/log.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/core-subscribe.h>
+
 #include "autoload.h"
-#include "module.h"
-#include "xmalloc.h"
-#include "memchunk.h"
-#include "sound-file.h"
-#include "log.h"
-#include "core-scache.h"
-#include "core-subscribe.h"
 
 static void entry_free(pa_autoload_entry *e) {
     assert(e);

src/polypcore/autoload.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "namereg.h"
+#include <polypcore/namereg.h>
 
 /* Using the autoloading facility, modules by be loaded on-demand and
  * synchronously. The user may register a "ghost sink" or "ghost

src/polypcore/cli-command.c

@@ -29,26 +29,27 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/client.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/tokenizer.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/namereg.h>
+#include <polypcore/cli-text.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/sound-file.h>
+#include <polypcore/play-memchunk.h>
+#include <polypcore/autoload.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/sound-file-stream.h>
+#include <polypcore/props.h>
+#include <polypcore/util.h>
+
 #include "cli-command.h"
-#include "module.h"
-#include "sink.h"
-#include "source.h"
-#include "client.h"
-#include "sink-input.h"
-#include "source-output.h"
-#include "tokenizer.h"
-#include "strbuf.h"
-#include "namereg.h"
-#include "cli-text.h"
-#include "core-scache.h"
-#include "sample-util.h"
-#include "sound-file.h"
-#include "play-memchunk.h"
-#include "autoload.h"
-#include "xmalloc.h"
-#include "sound-file-stream.h"
-#include "props.h"
-#include "util.h"
 
 struct command {
     const char *name;

src/polypcore/cli-command.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "strbuf.h"
-#include "core.h"
+#include <polypcore/strbuf.h>
+#include <polypcore/core.h>
 
 /* Execute a single CLI command. Write the results to the string
  * buffer *buf. If *fail is non-zero the function will return -1 when

src/polypcore/cli-text.c

@@ -26,19 +26,20 @@
 #include <assert.h>
 #include <string.h>
 
-#include "cli-text.h"
-#include "module.h"
-#include "client.h"
-#include "sink.h"
-#include "source.h"
-#include "sink-input.h"
-#include "source-output.h"
-#include "strbuf.h"
-#include "sample-util.h"
-#include "core-scache.h"
-#include "autoload.h"
-#include "xmalloc.h"
 #include <polyp/volume.h>
+#include <polypcore/module.h>
+#include <polypcore/client.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/autoload.h>
+#include <polypcore/xmalloc.h>
+
+#include "cli-text.h"
 
 char *pa_module_list_to_string(pa_core *c) {
     pa_strbuf *s;

src/polypcore/cli-text.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "core.h"
+#include <polypcore/core.h>
 
 /* Some functions to generate pretty formatted listings of
  * entities. The returned strings have to be freed manually. */

src/polypcore/cli.c

@@ -28,21 +28,22 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "ioline.h"
+#include <polypcore/ioline.h>
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/client.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/tokenizer.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/namereg.h>
+#include <polypcore/cli-text.h>
+#include <polypcore/cli-command.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "cli.h"
-#include "module.h"
-#include "sink.h"
-#include "source.h"
-#include "client.h"
-#include "sink-input.h"
-#include "source-output.h"
-#include "tokenizer.h"
-#include "strbuf.h"
-#include "namereg.h"
-#include "cli-text.h"
-#include "cli-command.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define PROMPT ">>> "
 

src/polypcore/cli.h

@@ -22,9 +22,9 @@
   USA.
 ***/
 
-#include "iochannel.h"
-#include "core.h"
-#include "module.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/core.h>
+#include <polypcore/module.h>
 
 typedef struct pa_cli pa_cli;
 

src/polypcore/client.c

@@ -28,10 +28,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
 #include "client.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 pa_client *pa_client_new(pa_core *core, const char *name, const char *driver) {
     pa_client *c;

src/polypcore/client.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "core.h"
-#include "module.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
 
 /* Every connection to the server should have a pa_client
  * attached. That way the user may generate a listing of all connected

src/polypcore/conf-parser.c

@@ -28,10 +28,11 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+
 #include "conf-parser.h"
-#include "log.h"
-#include "util.h"
-#include "xmalloc.h"
 
 #define WHITESPACE " \t\n"
 #define COMMENTS "#;\n"

src/polypcore/core-scache.c

@@ -41,19 +41,20 @@
 #include <windows.h>
 #endif
 
-#include "core-scache.h"
-#include "sink-input.h"
 #include <polyp/mainloop.h>
-#include "sample-util.h"
-#include "play-memchunk.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "namereg.h"
-#include "sound-file.h"
-#include "util.h"
-#include "log.h"
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/play-memchunk.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sound-file.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
+#include "core-scache.h"
 
 #define UNLOAD_POLL_TIME 2
 

src/polypcore/core-scache.h

@@ -22,9 +22,9 @@
   USA.
 ***/
 
-#include "core.h"
-#include "memchunk.h"
-#include "sink.h"
+#include <polypcore/core.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
 
 typedef struct pa_scache_entry {
     pa_core *core;

src/polypcore/core-subscribe.c

@@ -26,10 +26,11 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "queue.h"
+#include <polypcore/queue.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "core-subscribe.h"
-#include "xmalloc.h"
-#include "log.h"
 
 /* The subscription subsystem may be used to be notified whenever an
  * entity (sink, source, ...) is created or deleted. Modules may

src/polypcore/core-subscribe.h

@@ -25,8 +25,8 @@
 typedef struct pa_subscription pa_subscription;
 typedef struct pa_subscription_event pa_subscription_event;
 
-#include "core.h"
-#include "native-common.h"
+#include <polypcore/core.h>
+#include <polypcore/native-common.h>
 
 pa_subscription* pa_subscription_new(pa_core *c, pa_subscription_mask_t m,  void (*callback)(pa_core *c, pa_subscription_event_type_t t, uint32_t index, void *userdata), void *userdata);
 void pa_subscription_free(pa_subscription*s);

src/polypcore/core.c

@@ -28,18 +28,19 @@
 #include <stdio.h>
 #include <signal.h>
 
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/namereg.h>
+#include <polypcore/util.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/autoload.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/props.h>
+#include <polypcore/random.h>
+
 #include "core.h"
-#include "module.h"
-#include "sink.h"
-#include "source.h"
-#include "namereg.h"
-#include "util.h"
-#include "core-scache.h"
-#include "autoload.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "props.h"
-#include "random.h"
 
 pa_core* pa_core_new(pa_mainloop_api *m) {
     pa_core* c;

src/polypcore/core.h

@@ -24,14 +24,14 @@
 
 typedef struct pa_core pa_core;
 
-#include "idxset.h"
-#include "hashmap.h"
+#include <polypcore/idxset.h>
+#include <polypcore/hashmap.h>
 #include <polyp/mainloop-api.h>
 #include <polyp/sample.h>
-#include "memblock.h"
-#include "resampler.h"
-#include "queue.h"
-#include "core-subscribe.h"
+#include <polypcore/memblock.h>
+#include <polypcore/resampler.h>
+#include <polypcore/queue.h>
+#include <polypcore/core-subscribe.h>
 
 /* The core structure of polypaudio. Every polypaudio daemon contains
  * exactly one of these. It is used for storing kind of global

src/polypcore/dynarray.c

@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "dynarray.h"
-#include "xmalloc.h"
 
 /* If the array becomes to small, increase its size by 100 entries */
 #define INCREASE_BY 100

src/polypcore/hashmap.c

@@ -27,10 +27,11 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "hashmap.h"
-#include "idxset.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define BUCKETS 1023
 

src/polypcore/idxset.c

@@ -28,8 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "idxset.h"
-#include "xmalloc.h"
 
 typedef struct idxset_entry {
     void *data;

src/polypcore/iochannel.c

@@ -30,10 +30,11 @@
 
 #include "winsock.h"
 
+#include <polypcore/util.h>
+#include <polypcore/socket-util.h>
+#include <polypcore/xmalloc.h>
+
 #include "iochannel.h"
-#include "util.h"
-#include "socket-util.h"
-#include "xmalloc.h"
 
 struct pa_iochannel {
     int ifd, ofd;

src/polypcore/ioline.c

@@ -29,9 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "ioline.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define BUFFER_LIMIT (64*1024)
 #define READ_SIZE (1024)

src/polypcore/ioline.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "iochannel.h"
-#include "util.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/util.h>
 
 /* An ioline wraps an iochannel for line based communication. A
  * callback function is called whenever a new line has been recieved

src/polypcore/log.c

@@ -31,9 +31,10 @@
 #include <syslog.h>
 #endif
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+
 #include "log.h"
-#include "xmalloc.h"
-#include "util.h"
 
 #define ENV_LOGLEVEL "POLYP_LOG"
 

src/polypcore/log.h

@@ -23,7 +23,7 @@
 ***/
 
 #include <stdarg.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
 
 /* A simple logging subsystem */
 

src/polypcore/mcalign.c

@@ -28,8 +28,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "mcalign.h"
-#include "xmalloc.h"
 
 struct pa_mcalign {
     size_t base;

src/polypcore/mcalign.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "memblock.h"
-#include "memchunk.h"
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
 
 /* An alignment object, used for aligning memchunks to multiples of
  * the frame size. */

src/polypcore/memblock.c

@@ -28,8 +28,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "memblock.h"
-#include "xmalloc.h"
 
 static void stat_add(pa_memblock*m, pa_memblock_stat *s) {
     assert(m);

src/polypcore/memblockq.c

@@ -30,10 +30,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/mcalign.h>
+
 #include "memblockq.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "mcalign.h"
 
 struct memblock_list {
     struct memblock_list *next, *prev;

src/polypcore/memblockq.h

@@ -24,8 +24,8 @@
 
 #include <sys/types.h>
 
-#include "memblock.h"
-#include "memchunk.h"
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
 
 /* A memblockq is a queue of pa_memchunks (yepp, the name is not
  * perfect). It is similar to the ring buffers used by most other

src/polypcore/memchunk.c

@@ -28,8 +28,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "memchunk.h"
-#include "xmalloc.h"
 
 void pa_memchunk_make_writable(pa_memchunk *c, pa_memblock_stat *s, size_t min) {
     pa_memblock *n;

src/polypcore/memchunk.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "memblock.h"
+#include <polypcore/memblock.h>
 
 /* A memchunk describes a part of a memblock. In contrast to the memblock, a
  * memchunk is not allocated dynamically or reference counted, instead

src/polypcore/modargs.c

@@ -28,15 +28,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "hashmap.h"
+#include <polypcore/hashmap.h>
+#include <polypcore/idxset.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+
 #include "modargs.h"
-#include "idxset.h"
-#include "sample-util.h"
-#include "namereg.h"
-#include "sink.h"
-#include "source.h"
-#include "xmalloc.h"
-#include "util.h"
 
 struct entry {
     char *key, *value;

src/polypcore/modargs.h

@@ -24,7 +24,7 @@
 
 #include <inttypes.h>
 #include <polyp/sample.h>
-#include "core.h"
+#include <polypcore/core.h>
 
 typedef struct pa_modargs pa_modargs;
 

src/polypcore/modinfo.c

@@ -26,10 +26,11 @@
 #include <ltdl.h>
 #include <assert.h>
 
-#include "xmalloc.h"
-#include "util.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "modinfo.h"
-#include "log.h"
 
 #define PA_SYMBOL_AUTHOR "pa__get_author"
 #define PA_SYMBOL_DESCRIPTION "pa__get_description"

src/polypcore/module.c

@@ -30,11 +30,12 @@
 #include <string.h>
 #include <errno.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+
 #include "module.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
-#include "util.h"
 
 #define PA_SYMBOL_INIT "pa__init"
 #define PA_SYMBOL_DONE "pa__done"

src/polypcore/module.h

@@ -25,8 +25,8 @@
 #include <inttypes.h>
 #include <ltdl.h>
 
-#include "core.h"
-#include "modinfo.h"
+#include <polypcore/core.h>
+#include <polypcore/modinfo.h>
 
 typedef struct pa_module pa_module;
 

src/polypcore/namereg.c

@@ -29,13 +29,14 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <polypcore/autoload.h>
+#include <polypcore/source.h>
+#include <polypcore/sink.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/util.h>
+
 #include "namereg.h"
-#include "autoload.h"
-#include "source.h"
-#include "sink.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "util.h"
 
 struct namereg_entry {
     pa_namereg_type_t type;

src/polypcore/namereg.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "core.h"
+#include <polypcore/core.h>
 
 typedef enum pa_namereg_type {
     PA_NAMEREG_SINK,

src/polypcore/packet.c

@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "packet.h"
-#include "xmalloc.h"
 
 pa_packet* pa_packet_new(size_t length) {
     pa_packet *p;

src/polypcore/parseaddr.c

@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "xmalloc.h"
-#include "util.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+
 #include "parseaddr.h"
 
 /* Parse addresses in one of the following forms:

src/polypcore/pdispatch.c

@@ -27,12 +27,13 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include <polypcore/native-common.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/llist.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+
 #include "pdispatch.h"
-#include "native-common.h"
-#include "xmalloc.h"
-#include "llist.h"
-#include "log.h"
-#include "util.h"
 
 /*#define DEBUG_OPCODES */
 

src/polypcore/pdispatch.h

@@ -23,9 +23,9 @@
 ***/
 
 #include <inttypes.h>
-#include "tagstruct.h"
-#include "packet.h"
 #include <polyp/mainloop-api.h>
+#include <polypcore/tagstruct.h>
+#include <polypcore/packet.h>
 
 typedef struct pa_pdispatch pa_pdispatch;
 

src/polypcore/pid.c

@@ -39,9 +39,10 @@
 #include <windows.h>
 #endif
 
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "pid.h"
-#include "util.h"
-#include "log.h"
 
 /* Read the PID data from the file descriptor fd, and return it. If no
  * pid could be read, return 0, on failure (pid_t) -1 */

src/polypcore/play-memchunk.c

@@ -28,10 +28,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polypcore/sink-input.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
+
 #include "play-memchunk.h"
-#include "sink-input.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
 
 static void sink_input_kill(pa_sink_input *i) {
     pa_memchunk *c;

src/polypcore/play-memchunk.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "sink.h"
-#include "memchunk.h"
+#include <polypcore/sink.h>
+#include <polypcore/memchunk.h>
 
 int pa_play_memchunk(
     pa_sink *sink,

src/polypcore/poll.c

@@ -42,7 +42,8 @@
 
 #ifndef HAVE_SYS_POLL_H
 
-#include "util.h"
+#include <polypcore/util.h>
+
 #include "poll.h"
 
 int poll (struct pollfd *fds, unsigned long int nfds, int timeout) {

src/polypcore/props.c

@@ -21,9 +21,10 @@
 
 #include <assert.h>
 
-#include "xmalloc.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "props.h"
-#include "log.h"
 
 typedef struct pa_property {
     char *name;  /* Points to memory allocated by the property subsystem */

src/polypcore/props.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "core.h"
-#include "strbuf.h"
+#include <polypcore/core.h>
+#include <polypcore/strbuf.h>
 
 /* The property subsystem is to be used to share data between
  * modules. Consider them to be kind of "global" variables for a

src/polypcore/protocol-cli.c

@@ -26,10 +26,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/cli.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "protocol-cli.h"
-#include "cli.h"
-#include "xmalloc.h"
-#include "log.h"
 
 /* Don't allow more than this many concurrent connections */
 #define MAX_CONNECTIONS 25

src/polypcore/protocol-cli.h

@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_cli pa_protocol_cli;
 

src/polypcore/protocol-esound.c

@@ -30,24 +30,26 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "protocol-esound.h"
-#include "esound.h"
-#include "memblock.h"
-#include "client.h"
-#include "sink-input.h"
-#include "sink.h"
-#include "source-output.h"
-#include "source.h"
 #include <polyp/sample.h>
-#include "core-scache.h"
-#include "sample-util.h"
-#include "authkey.h"
-#include "namereg.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "util.h"
+#include <polypcore/esound.h>
+#include <polypcore/memblock.h>
+#include <polypcore/client.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/sink.h>
+#include <polypcore/source-output.h>
+#include <polypcore/source.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/authkey.h>
+#include <polypcore/namereg.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+
 #include "endianmacros.h"
 
+#include "protocol-esound.h"
+
 /* Don't accept more connection than this */
 #define MAX_CONNECTIONS 10
 

src/polypcore/protocol-esound.h

@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_esound pa_protocol_esound;
 

src/polypcore/protocol-http.c

@@ -28,12 +28,13 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polypcore/ioline.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/namereg.h>
+#include <polypcore/cli-text.h>
+
 #include "protocol-http.h"
-#include "ioline.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "namereg.h"
-#include "cli-text.h"
 
 /* Don't allow more than this many concurrent connections */
 #define MAX_CONNECTIONS 10

src/polypcore/protocol-http.h

@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_http pa_protocol_http;
 

src/polypcore/protocol-native.c

@@ -28,27 +28,28 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/native-common.h>
+#include <polypcore/packet.h>
+#include <polypcore/client.h>
+#include <polypcore/source-output.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/pstream.h>
+#include <polypcore/tagstruct.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/authkey.h>
+#include <polypcore/namereg.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+#include <polypcore/autoload.h>
+#include <polypcore/authkey-prop.h>
+#include <polypcore/strlist.h>
+#include <polypcore/props.h>
+
 #include "protocol-native.h"
-#include "native-common.h"
-#include "packet.h"
-#include "client.h"
-#include "source-output.h"
-#include "sink-input.h"
-#include "pstream.h"
-#include "tagstruct.h"
-#include "pdispatch.h"
-#include "pstream-util.h"
-#include "authkey.h"
-#include "namereg.h"
-#include "core-scache.h"
-#include "xmalloc.h"
-#include "util.h"
-#include "core-subscribe.h"
-#include "log.h"
-#include "autoload.h"
-#include "authkey-prop.h"
-#include "strlist.h"
-#include "props.h"
 
 /* Kick a client if it doesn't authenticate within this time */
 #define AUTH_TIMEOUT 5

src/polypcore/protocol-native.h

@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_native pa_protocol_native;
 

src/polypcore/protocol-simple.c

@@ -30,14 +30,15 @@
 #include <errno.h>
 #include <string.h>
 
-#include "sink-input.h"
-#include "source-output.h"
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/client.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/namereg.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "protocol-simple.h"
-#include "client.h"
-#include "sample-util.h"
-#include "namereg.h"
-#include "xmalloc.h"
-#include "log.h"
 
 /* Don't allow more than this many concurrent connections */
 #define MAX_CONNECTIONS 10

src/polypcore/protocol-simple.h

@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "socket-server.h"
-#include "module.h"
-#include "core.h"
-#include "modargs.h"
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/core.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_simple pa_protocol_simple;
 

src/polypcore/pstream-util.c

@@ -25,7 +25,8 @@
 
 #include <assert.h>
 
-#include "native-common.h"
+#include <polypcore/native-common.h>
+
 #include "pstream-util.h"
 
 void pa_pstream_send_tagstruct(pa_pstream *p, pa_tagstruct *t) {

src/polypcore/pstream-util.h

@@ -23,8 +23,8 @@
 ***/
 
 #include <inttypes.h>
-#include "pstream.h"
-#include "tagstruct.h"
+#include <polypcore/pstream.h>
+#include <polypcore/tagstruct.h>
 
 /* The tagstruct is freed!*/
 void pa_pstream_send_tagstruct(pa_pstream *p, pa_tagstruct *t);

src/polypcore/pstream.c

@@ -34,10 +34,11 @@
 
 #include "winsock.h"
 
+#include <polypcore/queue.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "pstream.h"
-#include "queue.h"
-#include "xmalloc.h"
-#include "log.h"
 
 typedef enum pa_pstream_descriptor_index {
     PA_PSTREAM_DESCRIPTOR_LENGTH,

src/polypcore/pstream.h

@@ -24,11 +24,11 @@
 
 #include <inttypes.h>
 
-#include "packet.h"
-#include "memblock.h"
-#include "iochannel.h"
 #include <polyp/mainloop-api.h>
-#include "memchunk.h"
+#include <polypcore/packet.h>
+#include <polypcore/memblock.h>
+#include <polypcore/iochannel.h>
+#include <polypcore/memchunk.h>
 
 typedef struct pa_pstream pa_pstream;