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

src/polypcore/queue.c

@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "queue.h"
-#include "xmalloc.h"
 
 struct queue_entry {
     struct queue_entry *next;

src/polypcore/random.c

@@ -31,9 +31,10 @@
 #include <assert.h>
 #include <time.h>
 
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "random.h"
-#include "util.h"
-#include "log.h"
 
 #ifndef OS_IS_WIN32
 #define RANDOM_DEVICE "/dev/urandom"

src/polypcore/resampler.c

@@ -30,10 +30,11 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
+#include <polypcore/sconv.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "resampler.h"
-#include "sconv.h"
-#include "xmalloc.h"
-#include "log.h"
 
 struct pa_resampler {
     pa_resample_method_t resample_method;

src/polypcore/resampler.h

@@ -25,9 +25,9 @@
 #include <samplerate.h>
 
 #include <polyp/sample.h>
-#include "memblock.h"
-#include "memchunk.h"
 #include <polyp/channelmap.h>
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
 
 typedef struct pa_resampler pa_resampler;
 

src/polypcore/sample-util.c

@@ -30,7 +30,8 @@
 
 #include <liboil/liboilfuncs.h>
 
-#include "log.h"
+#include <polypcore/log.h>
+
 #include "sample-util.h"
 
 pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec) {

src/polypcore/sample-util.h

@@ -23,9 +23,9 @@
 ***/
 
 #include <polyp/sample.h>
-#include "memblock.h"
-#include "memchunk.h"
 #include <polyp/volume.h>
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
 
 pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec);
 void pa_silence_memchunk(pa_memchunk *c, const pa_sample_spec *spec);

src/polypcore/sconv-s16le.c

@@ -28,10 +28,12 @@
 
 #include <liboil/liboilfuncs.h>
 
+#include <polypcore/sconv.h>
+#include <polypcore/log.h>
+
 #include "endianmacros.h"
-#include "sconv.h"
+
 #include "sconv-s16le.h"
-#include "log.h"
 
 #ifndef INT16_FROM
 #define INT16_FROM INT16_FROM_LE

src/polypcore/sconv.c

@@ -30,13 +30,14 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
-#include "endianmacros.h"
-#include "sconv.h"
-#include "g711.h"
+#include <polypcore/g711.h>
 
+#include "endianmacros.h"
 #include "sconv-s16le.h"
 #include "sconv-s16be.h"
 
+#include "sconv.h"
+
 static void u8_to_float32ne(unsigned n, const void *a, float *b) {
     const uint8_t *ca = a;
     static const double add = -128.0/127.0, factor = 1.0/127.0;

src/polypcore/sink-input.c

@@ -28,11 +28,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/sample-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
 #include "sink-input.h"
-#include "sample-util.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 #define CONVERT_BUFFER_LENGTH 4096
 

src/polypcore/sink-input.h

@@ -26,12 +26,12 @@
 
 typedef struct pa_sink_input pa_sink_input;
 
-#include "sink.h"
 #include <polyp/sample.h>
-#include "memblockq.h"
-#include "resampler.h"
-#include "module.h"
-#include "client.h"
+#include <polypcore/sink.h>
+#include <polypcore/memblockq.h>
+#include <polypcore/resampler.h>
+#include <polypcore/module.h>
+#include <polypcore/client.h>
 
 typedef enum pa_sink_input_state {
     PA_SINK_INPUT_RUNNING,

src/polypcore/sink.c

@@ -28,15 +28,16 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "sink.h"
-#include "sink-input.h"
-#include "namereg.h"
-#include "util.h"
-#include "sample-util.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 #include <polyp/introspect.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/namereg.h>
+#include <polypcore/util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
+#include "sink.h"
 
 #define MAX_MIX_CHANNELS 32
 

src/polypcore/sink.h

@@ -26,13 +26,13 @@
 
 typedef struct pa_sink pa_sink;
 
-#include "core.h"
 #include <polyp/sample.h>
-#include "idxset.h"
-#include "source.h"
 #include <polyp/channelmap.h>
-#include "module.h"
 #include <polyp/volume.h>
+#include <polypcore/core.h>
+#include <polypcore/idxset.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
 
 #define PA_MAX_INPUTS_PER_SINK 6
 

src/polypcore/sioman.c

@@ -24,6 +24,7 @@
 #endif
 
 #include <assert.h>
+
 #include "sioman.h"
 
 static int stdio_inuse = 0;

src/polypcore/socket-client.c

@@ -54,12 +54,13 @@
 
 #include "winsock.h"
 
+#include <polypcore/socket-util.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/parseaddr.h>
+
 #include "socket-client.h"
-#include "socket-util.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "parseaddr.h"
 
 #define CONNECT_TIMEOUT 5
 

src/polypcore/socket-client.h

@@ -25,7 +25,7 @@
 #include <inttypes.h>
 
 #include <polyp/mainloop-api.h>
-#include "iochannel.h"
+#include <polypcore/iochannel.h>
 
 struct sockaddr;
 

src/polypcore/socket-server.c

@@ -58,11 +58,12 @@
 
 #include "winsock.h"
 
+#include <polypcore/socket-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "socket-server.h"
-#include "socket-util.h"
-#include "xmalloc.h"
-#include "util.h"
-#include "log.h"
 
 struct pa_socket_server {
     int ref;

src/polypcore/socket-server.h

@@ -24,7 +24,7 @@
 
 #include <inttypes.h>
 #include <polyp/mainloop-api.h>
-#include "iochannel.h"
+#include <polypcore/iochannel.h>
 
 /* It is safe to destroy the calling socket_server object from the callback */
 

src/polypcore/socket-util.c

@@ -59,10 +59,11 @@
 
 #include "winsock.h"
 
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "socket-util.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
 
 void pa_socket_peer_to_string(int fd, char *c, size_t l) {
     struct stat st;

src/polypcore/sound-file-stream.c

@@ -30,10 +30,11 @@
 
 #include <sndfile.h>
 
+#include <polypcore/sink-input.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "sound-file-stream.h"
-#include "sink-input.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define BUF_SIZE (1024*10)
 

src/polypcore/sound-file-stream.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "sink.h"
+#include <polypcore/sink.h>
 
 int pa_play_file(pa_sink *sink, const char *fname, const pa_cvolume *volume);
 

src/polypcore/sound-file.c

@@ -28,9 +28,10 @@
 
 #include <sndfile.h>
 
-#include "sound-file.h"
 #include <polyp/sample.h>
-#include "log.h"
+#include <polypcore/log.h>
+
+#include "sound-file.h"
 
 #define MAX_FILE_SIZE (1024*1024)
 

src/polypcore/sound-file.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "memchunk.h"
 #include <polyp/sample.h>
+#include <polypcore/memchunk.h>
 
 int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s);
 

src/polypcore/source-output.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 "source-output.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 pa_source_output* pa_source_output_new(
     pa_source *s,

src/polypcore/source-output.h

@@ -26,12 +26,12 @@
 
 typedef struct pa_source_output pa_source_output;
 
-#include "source.h"
 #include <polyp/sample.h>
-#include "memblockq.h"
-#include "resampler.h"
-#include "module.h"
-#include "client.h"
+#include <polypcore/source.h>
+#include <polypcore/memblockq.h>
+#include <polypcore/resampler.h>
+#include <polypcore/module.h>
+#include <polypcore/client.h>
 
 typedef enum {
     PA_SOURCE_OUTPUT_RUNNING,

src/polypcore/source.c

@@ -28,12 +28,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/source-output.h>
+#include <polypcore/namereg.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
 #include "source.h"
-#include "source-output.h"
-#include "namereg.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 pa_source* pa_source_new(
     pa_core *core,

src/polypcore/source.h

@@ -25,14 +25,15 @@
 typedef struct pa_source pa_source;
 
 #include <inttypes.h>
-#include "core.h"
+
 #include <polyp/sample.h>
-#include "idxset.h"
-#include "memblock.h"
-#include "memchunk.h"
-#include "sink.h"
 #include <polyp/channelmap.h>
-#include "module.h"
+#include <polypcore/core.h>
+#include <polypcore/idxset.h>
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
 
 #define PA_MAX_OUTPUTS_PER_SOURCE 16
 

src/polypcore/strbuf.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
 
 typedef struct pa_strbuf pa_strbuf;
 

src/polypcore/strlist.c

@@ -26,10 +26,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/util.h>
+
 #include "strlist.h"
-#include "xmalloc.h"
-#include "strbuf.h"
-#include "util.h"
 
 struct pa_strlist {
     pa_strlist *next;

src/polypcore/tagstruct.c

@@ -36,8 +36,9 @@
 
 #include "winsock.h"
 
+#include <polypcore/xmalloc.h>
+
 #include "tagstruct.h"
-#include "xmalloc.h"
 
 
 struct pa_tagstruct {

src/polypcore/tokenizer.c

@@ -27,10 +27,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/dynarray.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
+
 #include "tokenizer.h"
-#include "dynarray.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
 
 struct pa_tokenizer {
     pa_dynarray *dynarray;

src/polypcore/util.c

@@ -70,9 +70,10 @@
 
 #include "winsock.h"
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "util.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #ifndef OS_IS_WIN32
 #define PA_RUNTIME_PATH_PREFIX "/tmp/polypaudio-"

src/polypcore/util.h

@@ -27,8 +27,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "gccmacro.h"
 #include <polyp/sample.h>
+#include <polypcore/gccmacro.h>
 
 struct timeval;
 

src/polypcore/x11wrap.c

@@ -22,11 +22,12 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "llist.h"
+#include <polypcore/llist.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/props.h>
+
 #include "x11wrap.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "props.h"
 
 typedef struct pa_x11_internal pa_x11_internal;
 

src/polypcore/x11wrap.h

@@ -24,7 +24,7 @@
 
 #include <X11/Xlib.h>
 
-#include "core.h"
+#include <polypcore/core.h>
 
 typedef struct pa_x11_wrapper pa_x11_wrapper;