summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--src/Makefile.am (renamed from polyp/Makefile.am)603
-rw-r--r--src/client.conf.in (renamed from polyp/client.conf.in)0
-rw-r--r--src/daemon.conf.in (renamed from polyp/daemon.conf.in)0
-rw-r--r--src/daemon/caps.c (renamed from polyp/caps.c)2
-rw-r--r--src/daemon/caps.h (renamed from polyp/caps.h)0
-rw-r--r--src/daemon/cmdline.c (renamed from polyp/cmdline.c)6
-rw-r--r--src/daemon/cmdline.h (renamed from polyp/cmdline.h)0
-rw-r--r--src/daemon/cpulimit.c (renamed from polyp/cpulimit.c)4
-rw-r--r--src/daemon/cpulimit.h (renamed from polyp/cpulimit.h)2
-rw-r--r--src/daemon/daemon-conf.c (renamed from polyp/daemon-conf.c)10
-rw-r--r--src/daemon/daemon-conf.h (renamed from polyp/daemon-conf.h)2
-rw-r--r--src/daemon/dumpmodules.c (renamed from polyp/dumpmodules.c)4
-rw-r--r--src/daemon/dumpmodules.h (renamed from polyp/dumpmodules.h)0
-rw-r--r--src/daemon/main.c (renamed from polyp/main.c)28
-rwxr-xr-xsrc/default.pa.in (renamed from polyp/default.pa.in)0
-rw-r--r--src/default.pa.win32 (renamed from polyp/default.pa.win32)0
-rwxr-xr-xsrc/depmod.py (renamed from polyp/depmod.py)0
-rw-r--r--src/modules/module-alsa-sink.c (renamed from polyp/module-alsa-sink.c)21
-rw-r--r--src/modules/module-alsa-source.c (renamed from polyp/module-alsa-source.c)21
-rw-r--r--src/modules/module-cli.c (renamed from polyp/module-cli.c)11
-rw-r--r--src/modules/module-combine.c (renamed from polyp/module-combine.c)21
-rw-r--r--src/modules/module-defs.h.m4 (renamed from polyp/module-defs.h.m4)6
-rw-r--r--src/modules/module-detect.c (renamed from polyp/module-detect.c)9
-rw-r--r--src/modules/module-esound-compat-spawnfd.c (renamed from polyp/module-esound-compat-spawnfd.c)9
-rw-r--r--src/modules/module-esound-compat-spawnpid.c (renamed from polyp/module-esound-compat-spawnpid.c)9
-rw-r--r--src/modules/module-esound-sink.c (renamed from polyp/module-esound-sink.c)21
-rw-r--r--src/modules/module-lirc.c (renamed from polyp/module-lirc.c)13
-rw-r--r--src/modules/module-match.c (renamed from polyp/module-match.c)15
-rw-r--r--src/modules/module-mmkbd-evdev.c (renamed from polyp/module-mmkbd-evdev.c)15
-rw-r--r--src/modules/module-native-protocol-fd.c (renamed from polyp/module-native-protocol-fd.c)11
-rw-r--r--src/modules/module-null-sink.c (renamed from polyp/module-null-sink.c)15
-rw-r--r--src/modules/module-oss-mmap.c (renamed from polyp/module-oss-mmap.c)21
-rw-r--r--src/modules/module-oss.c (renamed from polyp/module-oss.c)21
-rw-r--r--src/modules/module-pipe-sink.c (renamed from polyp/module-pipe-sink.c)15
-rw-r--r--src/modules/module-pipe-source.c (renamed from polyp/module-pipe-source.c)15
-rw-r--r--src/modules/module-protocol-stub.c (renamed from polyp/module-protocol-stub.c)29
-rw-r--r--src/modules/module-sine.c (renamed from polyp/module-sine.c)13
-rw-r--r--src/modules/module-solaris.c (renamed from polyp/module-solaris.c)22
-rw-r--r--src/modules/module-tunnel.c (renamed from polyp/module-tunnel.c)28
-rw-r--r--src/modules/module-waveout.c (renamed from polyp/module-waveout.c)20
-rw-r--r--src/modules/module-x11-bell.c (renamed from polyp/module-x11-bell.c)17
-rw-r--r--src/modules/module-x11-publish.c (renamed from polyp/module-x11-publish.c)31
-rw-r--r--src/modules/module-zeroconf-publish.c (renamed from polyp/module-zeroconf-publish.c)25
-rw-r--r--src/polyp/cdecl.h (renamed from polyp/cdecl.h)0
-rw-r--r--src/polyp/channelmap.c (renamed from polyp/channelmap.c)0
-rw-r--r--src/polyp/channelmap.h (renamed from polyp/channelmap.h)0
-rw-r--r--src/polyp/client-conf-x11.c (renamed from polyp/client-conf-x11.c)8
-rw-r--r--src/polyp/client-conf-x11.h (renamed from polyp/client-conf-x11.h)2
-rw-r--r--src/polyp/client-conf.c (renamed from polyp/client-conf.c)13
-rw-r--r--src/polyp/client-conf.h (renamed from polyp/client-conf.h)2
-rw-r--r--src/polyp/glib-mainloop.c (renamed from polyp/glib-mainloop.c)8
-rw-r--r--src/polyp/glib-mainloop.h (renamed from polyp/glib-mainloop.h)4
-rw-r--r--src/polyp/glib12-mainloop.c (renamed from polyp/glib12-mainloop.c)8
-rw-r--r--src/polyp/mainloop-api.c (renamed from polyp/mainloop-api.c)4
-rw-r--r--src/polyp/mainloop-api.h (renamed from polyp/mainloop-api.h)0
-rw-r--r--src/polyp/mainloop-signal.c (renamed from polyp/mainloop-signal.c)10
-rw-r--r--src/polyp/mainloop-signal.h (renamed from polyp/mainloop-signal.h)4
-rw-r--r--src/polyp/mainloop.c (renamed from polyp/mainloop.c)10
-rw-r--r--src/polyp/mainloop.h (renamed from polyp/mainloop.h)4
-rw-r--r--src/polyp/polyplib-browser.c (renamed from polyp/polyplib-browser.c)6
-rw-r--r--src/polyp/polyplib-browser.h (renamed from polyp/polyplib-browser.h)0
-rw-r--r--src/polyp/polyplib-context.c (renamed from polyp/polyplib-context.c)24
-rw-r--r--src/polyp/polyplib-context.h (renamed from polyp/polyplib-context.h)0
-rw-r--r--src/polyp/polyplib-def.h (renamed from polyp/polyplib-def.h)0
-rw-r--r--src/polyp/polyplib-error.c (renamed from polyp/polyplib-error.c)2
-rw-r--r--src/polyp/polyplib-error.h (renamed from polyp/polyplib-error.h)2
-rw-r--r--src/polyp/polyplib-internal.h (renamed from polyp/polyplib-internal.h)20
-rw-r--r--src/polyp/polyplib-introspect.c (renamed from polyp/polyplib-introspect.c)4
-rw-r--r--src/polyp/polyplib-introspect.h (renamed from polyp/polyplib-introspect.h)0
-rw-r--r--src/polyp/polyplib-operation.c (renamed from polyp/polyplib-operation.c)2
-rw-r--r--src/polyp/polyplib-operation.h (renamed from polyp/polyplib-operation.h)0
-rw-r--r--src/polyp/polyplib-scache.c (renamed from polyp/polyplib-scache.c)2
-rw-r--r--src/polyp/polyplib-scache.h (renamed from polyp/polyplib-scache.h)0
-rw-r--r--src/polyp/polyplib-simple.c (renamed from polyp/polyplib-simple.c)6
-rw-r--r--src/polyp/polyplib-simple.h (renamed from polyp/polyplib-simple.h)2
-rw-r--r--src/polyp/polyplib-stream.c (renamed from polyp/polyplib-stream.c)8
-rw-r--r--src/polyp/polyplib-stream.h (renamed from polyp/polyplib-stream.h)0
-rw-r--r--src/polyp/polyplib-subscribe.c (renamed from polyp/polyplib-subscribe.c)4
-rw-r--r--src/polyp/polyplib-subscribe.h (renamed from polyp/polyplib-subscribe.h)0
-rw-r--r--src/polyp/polyplib-version.h.in (renamed from polyp/polyplib-version.h.in)0
-rw-r--r--src/polyp/polyplib.h (renamed from polyp/polyplib.h)0
-rw-r--r--src/polyp/sample.c (renamed from polyp/sample.c)0
-rw-r--r--src/polyp/sample.h (renamed from polyp/sample.h)0
-rw-r--r--src/polyp/volume.c (renamed from polyp/volume.c)0
-rw-r--r--src/polyp/volume.h (renamed from polyp/volume.h)0
-rw-r--r--src/polypcore/alsa-util.c (renamed from polyp/alsa-util.c)2
-rw-r--r--src/polypcore/alsa-util.h (renamed from polyp/alsa-util.h)4
-rw-r--r--src/polypcore/authkey-prop.c (renamed from polyp/authkey-prop.c)0
-rw-r--r--src/polypcore/authkey-prop.h (renamed from polyp/authkey-prop.h)0
-rw-r--r--src/polypcore/authkey.c (renamed from polyp/authkey.c)0
-rw-r--r--src/polypcore/authkey.h (renamed from polyp/authkey.h)0
-rw-r--r--src/polypcore/autoload.c (renamed from polyp/autoload.c)0
-rw-r--r--src/polypcore/autoload.h (renamed from polyp/autoload.h)0
-rw-r--r--src/polypcore/cli-command.c (renamed from polyp/cli-command.c)0
-rw-r--r--src/polypcore/cli-command.h (renamed from polyp/cli-command.h)0
-rw-r--r--src/polypcore/cli-text.c (renamed from polyp/cli-text.c)2
-rw-r--r--src/polypcore/cli-text.h (renamed from polyp/cli-text.h)0
-rw-r--r--src/polypcore/cli.c (renamed from polyp/cli.c)0
-rw-r--r--src/polypcore/cli.h (renamed from polyp/cli.h)0
-rw-r--r--src/polypcore/client.c (renamed from polyp/client.c)0
-rw-r--r--src/polypcore/client.h (renamed from polyp/client.h)0
-rw-r--r--src/polypcore/conf-parser.c (renamed from polyp/conf-parser.c)0
-rw-r--r--src/polypcore/conf-parser.h (renamed from polyp/conf-parser.h)0
-rw-r--r--src/polypcore/core.c (renamed from polyp/core.c)0
-rw-r--r--src/polypcore/core.h (renamed from polyp/core.h)4
-rw-r--r--src/polypcore/dllmain.c (renamed from polyp/dllmain.c)0
-rw-r--r--src/polypcore/dynarray.c (renamed from polyp/dynarray.c)0
-rw-r--r--src/polypcore/dynarray.h (renamed from polyp/dynarray.h)0
-rw-r--r--src/polypcore/endianmacros.h (renamed from polyp/endianmacros.h)0
-rw-r--r--src/polypcore/esound.h (renamed from polyp/esound.h)0
-rw-r--r--src/polypcore/g711.c (renamed from polyp/g711.c)0
-rw-r--r--src/polypcore/g711.h (renamed from polyp/g711.h)0
-rw-r--r--src/polypcore/gccmacro.h (renamed from polyp/gccmacro.h)0
-rw-r--r--src/polypcore/hashmap.c (renamed from polyp/hashmap.c)0
-rw-r--r--src/polypcore/hashmap.h (renamed from polyp/hashmap.h)0
-rw-r--r--src/polypcore/howl-wrap.c (renamed from polyp/howl-wrap.c)0
-rw-r--r--src/polypcore/howl-wrap.h (renamed from polyp/howl-wrap.h)0
-rw-r--r--src/polypcore/idxset.c (renamed from polyp/idxset.c)0
-rw-r--r--src/polypcore/idxset.h (renamed from polyp/idxset.h)0
-rw-r--r--src/polypcore/inet_ntop.c (renamed from polyp/inet_ntop.c)0
-rw-r--r--src/polypcore/inet_ntop.h (renamed from polyp/inet_ntop.h)0
-rw-r--r--src/polypcore/iochannel.c (renamed from polyp/iochannel.c)0
-rw-r--r--src/polypcore/iochannel.h (renamed from polyp/iochannel.h)2
-rw-r--r--src/polypcore/ioline.c (renamed from polyp/ioline.c)0
-rw-r--r--src/polypcore/ioline.h (renamed from polyp/ioline.h)0
-rw-r--r--src/polypcore/llist.h (renamed from polyp/llist.h)0
-rw-r--r--src/polypcore/log.c (renamed from polyp/log.c)0
-rw-r--r--src/polypcore/log.h (renamed from polyp/log.h)0
-rw-r--r--src/polypcore/mcalign.c (renamed from polyp/mcalign.c)0
-rw-r--r--src/polypcore/mcalign.h (renamed from polyp/mcalign.h)0
-rw-r--r--src/polypcore/memblock.c (renamed from polyp/memblock.c)0
-rw-r--r--src/polypcore/memblock.h (renamed from polyp/memblock.h)0
-rw-r--r--src/polypcore/memblockq.c (renamed from polyp/memblockq.c)0
-rw-r--r--src/polypcore/memblockq.h (renamed from polyp/memblockq.h)0
-rw-r--r--src/polypcore/memchunk.c (renamed from polyp/memchunk.c)0
-rw-r--r--src/polypcore/memchunk.h (renamed from polyp/memchunk.h)0
-rw-r--r--src/polypcore/modargs.c (renamed from polyp/modargs.c)0
-rw-r--r--src/polypcore/modargs.h (renamed from polyp/modargs.h)2
-rw-r--r--src/polypcore/modinfo.c (renamed from polyp/modinfo.c)0
-rw-r--r--src/polypcore/modinfo.h (renamed from polyp/modinfo.h)0
-rw-r--r--src/polypcore/module.c (renamed from polyp/module.c)0
-rw-r--r--src/polypcore/module.h (renamed from polyp/module.h)0
-rw-r--r--src/polypcore/namereg.c (renamed from polyp/namereg.c)0
-rw-r--r--src/polypcore/namereg.h (renamed from polyp/namereg.h)0
-rw-r--r--src/polypcore/native-common.h (renamed from polyp/native-common.h)4
-rw-r--r--src/polypcore/oss-util.c (renamed from polyp/oss-util.c)0
-rw-r--r--src/polypcore/oss-util.h (renamed from polyp/oss-util.h)2
-rw-r--r--src/polypcore/packet.c (renamed from polyp/packet.c)0
-rw-r--r--src/polypcore/packet.h (renamed from polyp/packet.h)0
-rw-r--r--src/polypcore/parseaddr.c (renamed from polyp/parseaddr.c)0
-rw-r--r--src/polypcore/parseaddr.h (renamed from polyp/parseaddr.h)0
-rw-r--r--src/polypcore/pdispatch.c (renamed from polyp/pdispatch.c)0
-rw-r--r--src/polypcore/pdispatch.h (renamed from polyp/pdispatch.h)2
-rw-r--r--src/polypcore/pid.c (renamed from polyp/pid.c)0
-rw-r--r--src/polypcore/pid.h (renamed from polyp/pid.h)0
-rw-r--r--src/polypcore/play-memchunk.c (renamed from polyp/play-memchunk.c)0
-rw-r--r--src/polypcore/play-memchunk.h (renamed from polyp/play-memchunk.h)0
-rw-r--r--src/polypcore/poll.c (renamed from polyp/poll.c)0
-rw-r--r--src/polypcore/poll.h (renamed from polyp/poll.h)0
-rw-r--r--src/polypcore/props.c (renamed from polyp/props.c)0
-rw-r--r--src/polypcore/props.h (renamed from polyp/props.h)0
-rw-r--r--src/polypcore/protocol-cli.c (renamed from polyp/protocol-cli.c)0
-rw-r--r--src/polypcore/protocol-cli.h (renamed from polyp/protocol-cli.h)0
-rw-r--r--src/polypcore/protocol-esound.c (renamed from polyp/protocol-esound.c)2
-rw-r--r--src/polypcore/protocol-esound.h (renamed from polyp/protocol-esound.h)0
-rw-r--r--src/polypcore/protocol-http.c (renamed from polyp/protocol-http.c)0
-rw-r--r--src/polypcore/protocol-http.h (renamed from polyp/protocol-http.h)0
-rw-r--r--src/polypcore/protocol-native.c (renamed from polyp/protocol-native.c)0
-rw-r--r--src/polypcore/protocol-native.h (renamed from polyp/protocol-native.h)0
-rw-r--r--src/polypcore/protocol-simple.c (renamed from polyp/protocol-simple.c)0
-rw-r--r--src/polypcore/protocol-simple.h (renamed from polyp/protocol-simple.h)0
-rw-r--r--src/polypcore/pstream-util.c (renamed from polyp/pstream-util.c)0
-rw-r--r--src/polypcore/pstream-util.h (renamed from polyp/pstream-util.h)0
-rw-r--r--src/polypcore/pstream.c (renamed from polyp/pstream.c)0
-rw-r--r--src/polypcore/pstream.h (renamed from polyp/pstream.h)2
-rw-r--r--src/polypcore/queue.c (renamed from polyp/queue.c)0
-rw-r--r--src/polypcore/queue.h (renamed from polyp/queue.h)0
-rw-r--r--src/polypcore/random.c (renamed from polyp/random.c)0
-rw-r--r--src/polypcore/random.h (renamed from polyp/random.h)0
-rw-r--r--src/polypcore/resampler.c (renamed from polyp/resampler.c)0
-rw-r--r--src/polypcore/resampler.h (renamed from polyp/resampler.h)4
-rw-r--r--src/polypcore/sample-util.c (renamed from polyp/sample-util.c)0
-rw-r--r--src/polypcore/sample-util.h (renamed from polyp/sample-util.h)4
-rw-r--r--src/polypcore/scache.c (renamed from polyp/scache.c)6
-rw-r--r--src/polypcore/scache.h (renamed from polyp/scache.h)0
-rw-r--r--src/polypcore/sconv-s16be.c (renamed from polyp/sconv-s16be.c)0
-rw-r--r--src/polypcore/sconv-s16be.h (renamed from polyp/sconv-s16be.h)0
-rw-r--r--src/polypcore/sconv-s16le.c (renamed from polyp/sconv-s16le.c)0
-rw-r--r--src/polypcore/sconv-s16le.h (renamed from polyp/sconv-s16le.h)0
-rw-r--r--src/polypcore/sconv.c (renamed from polyp/sconv.c)0
-rw-r--r--src/polypcore/sconv.h (renamed from polyp/sconv.h)2
-rw-r--r--src/polypcore/sink-input.c (renamed from polyp/sink-input.c)0
-rw-r--r--src/polypcore/sink-input.h (renamed from polyp/sink-input.h)2
-rw-r--r--src/polypcore/sink.c (renamed from polyp/sink.c)2
-rw-r--r--src/polypcore/sink.h (renamed from polyp/sink.h)6
-rw-r--r--src/polypcore/sioman.c (renamed from polyp/sioman.c)0
-rw-r--r--src/polypcore/sioman.h (renamed from polyp/sioman.h)0
-rw-r--r--src/polypcore/socket-client.c (renamed from polyp/socket-client.c)0
-rw-r--r--src/polypcore/socket-client.h (renamed from polyp/socket-client.h)2
-rw-r--r--src/polypcore/socket-server.c (renamed from polyp/socket-server.c)0
-rw-r--r--src/polypcore/socket-server.h (renamed from polyp/socket-server.h)2
-rw-r--r--src/polypcore/socket-util.c (renamed from polyp/socket-util.c)0
-rw-r--r--src/polypcore/socket-util.h (renamed from polyp/socket-util.h)0
-rw-r--r--src/polypcore/sound-file-stream.c (renamed from polyp/sound-file-stream.c)0
-rw-r--r--src/polypcore/sound-file-stream.h (renamed from polyp/sound-file-stream.h)0
-rw-r--r--src/polypcore/sound-file.c (renamed from polyp/sound-file.c)2
-rw-r--r--src/polypcore/sound-file.h (renamed from polyp/sound-file.h)2
-rw-r--r--src/polypcore/source-output.c (renamed from polyp/source-output.c)0
-rw-r--r--src/polypcore/source-output.h (renamed from polyp/source-output.h)2
-rw-r--r--src/polypcore/source.c (renamed from polyp/source.c)0
-rw-r--r--src/polypcore/source.h (renamed from polyp/source.h)4
-rw-r--r--src/polypcore/strbuf.c (renamed from polyp/strbuf.c)3
-rw-r--r--src/polypcore/strbuf.h (renamed from polyp/strbuf.h)0
-rw-r--r--src/polypcore/strlist.c (renamed from polyp/strlist.c)0
-rw-r--r--src/polypcore/strlist.h (renamed from polyp/strlist.h)0
-rw-r--r--src/polypcore/subscribe.c (renamed from polyp/subscribe.c)0
-rw-r--r--src/polypcore/subscribe.h (renamed from polyp/subscribe.h)0
-rw-r--r--src/polypcore/tagstruct.c (renamed from polyp/tagstruct.c)0
-rw-r--r--src/polypcore/tagstruct.h (renamed from polyp/tagstruct.h)6
-rw-r--r--src/polypcore/tokenizer.c (renamed from polyp/tokenizer.c)0
-rw-r--r--src/polypcore/tokenizer.h (renamed from polyp/tokenizer.h)0
-rw-r--r--src/polypcore/util.c (renamed from polyp/util.c)0
-rw-r--r--src/polypcore/util.h (renamed from polyp/util.h)2
-rw-r--r--src/polypcore/winsock.h (renamed from polyp/winsock.h)0
-rw-r--r--src/polypcore/x11prop.c (renamed from polyp/x11prop.c)0
-rw-r--r--src/polypcore/x11prop.h (renamed from polyp/x11prop.h)0
-rw-r--r--src/polypcore/x11wrap.c (renamed from polyp/x11wrap.c)0
-rw-r--r--src/polypcore/x11wrap.h (renamed from polyp/x11wrap.h)0
-rw-r--r--src/polypcore/xmalloc.c (renamed from polyp/xmalloc.c)0
-rw-r--r--src/polypcore/xmalloc.h (renamed from polyp/xmalloc.h)0
-rw-r--r--src/tests/cpulimit-test.c (renamed from polyp/cpulimit-test.c)8
-rw-r--r--src/tests/mainloop-test.c (renamed from polyp/mainloop-test.c)8
-rw-r--r--src/tests/mcalign-test.c (renamed from polyp/mcalign-test.c)6
-rw-r--r--src/tests/pacat-simple.c (renamed from polyp/pacat-simple.c)2
-rw-r--r--src/tests/parec-simple.c (renamed from polyp/parec-simple.c)2
-rw-r--r--src/tests/strlist-test.c (renamed from polyp/strlist-test.c)6
-rw-r--r--src/tests/voltest.c (renamed from polyp/voltest.c)2
-rwxr-xr-xsrc/utils/esdcompat.sh.in (renamed from polyp/esdcompat.sh.in)0
-rw-r--r--src/utils/pabrowse.c (renamed from polyp/pabrowse.c)0
-rw-r--r--src/utils/pacat.c (renamed from polyp/pacat.c)0
-rw-r--r--src/utils/pacmd.c (renamed from polyp/pacmd.c)6
-rw-r--r--src/utils/pactl.c (renamed from polyp/pactl.c)0
-rw-r--r--src/utils/paplay.c (renamed from polyp/paplay.c)0
-rw-r--r--src/utils/pax11publish.c (renamed from polyp/pax11publish.c)12
246 files changed, 724 insertions, 689 deletions
diff --git a/Makefile.am b/Makefile.am
index 2cf93c75..9705d45d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
# USA.
EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4 ltdl.m4
-SUBDIRS=libltdl polyp doc
+SUBDIRS=libltdl src doc
MAINTAINERCLEANFILES =
noinst_DATA =
diff --git a/configure.ac b/configure.ac
index 03663590..182a2455 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
AC_PREREQ(2.57)
AC_INIT([polypaudio],[0.8],[mzcbylcnhqvb (at) 0pointer (dot) de])
-AC_CONFIG_SRCDIR([polyp/main.c])
+AC_CONFIG_SRCDIR([src/daemon/main.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign -Wall])
@@ -392,7 +392,7 @@ fi
AC_CONFIG_FILES([
Makefile
-polyp/Makefile
+src/Makefile
polyplib.pc
polyplib-simple.pc
polyplib-mainloop.pc
@@ -407,7 +407,7 @@ doc/daemon.html
doc/modules.html
doxygen/Makefile
doxygen/doxygen.conf
-polyp/polyplib-version.h
+src/polyp/polyplib-version.h
doc/FAQ.html
])
AC_OUTPUT
diff --git a/polyp/Makefile.am b/src/Makefile.am
index 061b82b4..92c7dae1 100644
--- a/polyp/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@
###################################
polypincludedir=$(includedir)/polyp
+polypcoreincludedir=$(includedir)/polypcore
polypconfdir=$(sysconfdir)/polypaudio
modlibdir=$(libdir)/polypaudio
@@ -42,7 +43,7 @@ endif
# Compiler/linker flags #
###################################
-AM_CFLAGS = -I$(top_srcdir)
+AM_CFLAGS = -I$(top_srcdir)/src
AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS
AM_CFLAGS += $(LTDLINCL)
AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -78,12 +79,12 @@ EXTRA_DIST = \
daemon.conf.in \
default.pa.in \
depmod.py \
- esdcompat.sh.in \
- module-defs.h.m4
+ utils/esdcompat.sh.in \
+ modules/module-defs.h.m4
polypconf_DATA = default.pa daemon.conf client.conf
-BUILT_SOURCES = polyplib-version.h
+BUILT_SOURCES = polyp/polyplib-version.h
###################################
# Main daemon #
@@ -92,15 +93,13 @@ BUILT_SOURCES = polyplib-version.h
bin_PROGRAMS = polypaudio
polypaudio_SOURCES = \
- caps.h caps.c \
- cmdline.c cmdline.h \
- cpulimit.c cpulimit.h \
- conf-parser.h conf-parser.c \
- daemon-conf.c daemon-conf.h \
- dumpmodules.c dumpmodules.h \
- gcc-printf.h \
- main.c \
- pid.c pid.h
+ daemon/caps.h daemon/caps.c \
+ daemon/cmdline.c daemon/cmdline.h \
+ daemon/cpulimit.c daemon/cpulimit.h \
+ daemon/daemon-conf.c daemon/daemon-conf.h \
+ daemon/dumpmodules.c daemon/dumpmodules.h \
+ daemon/main.c \
+ polypcore/gccmacro.h
polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
polypaudio_CPPFLAGS = $(AM_CPPFLAGS)
@@ -135,34 +134,34 @@ if HAVE_HOWL
bin_PROGRAMS += pabrowse
endif
-bin_SCRIPTS = esdcompat.sh
+bin_SCRIPTS = utils/esdcompat.sh
-pacat_SOURCES = pacat.c
+pacat_SOURCES = utils/pacat.c
pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
pacat_CFLAGS = $(AM_CFLAGS)
pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-paplay_SOURCES = paplay.c
+paplay_SOURCES = utils/paplay.c
paplay_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pactl_SOURCES = pactl.c
+pactl_SOURCES = utils/pactl.c
pactl_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pacmd_SOURCES = pacmd.c util.c util.h xmalloc.c xmalloc.h log.c log.h pid.c pid.h
+pacmd_SOURCES = utils/pacmd.c polypcore/pid.c polypcore/pid.h
pacmd_CFLAGS = $(AM_CFLAGS)
-pacmd_LDADD = $(AM_LDADD)
+pacmd_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pax11publish_SOURCES = pax11publish.c util.c util.h xmalloc.c xmalloc.h log.c log.h authkey.c authkey.h client-conf.c client-conf.h conf-parser.c conf-parser.h x11prop.c x11prop.h random.c random.h
+pax11publish_SOURCES = utils/pax11publish.c
pax11publish_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
-pax11publish_LDADD = $(AM_LDADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
+pax11publish_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pabrowse_SOURCES = pabrowse.c
+pabrowse_SOURCES = utils/pabrowse.c
pabrowse_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-browse-@PA_MAJORMINOR@.la
pabrowse_CFLAGS = $(AM_CFLAGS)
pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@@ -195,44 +194,44 @@ noinst_PROGRAMS += \
mainloop-test-glib12
endif
-mainloop_test_SOURCES = mainloop-test.c
+mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-@PA_MAJORMINOR@.la
mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-mcalign_test_SOURCES = mcalign-test.c util.c util.h xmalloc.c xmalloc.h log.c log.h mcalign.c mcalign.h memchunk.c memchunk.h memblock.c memblock.h
+mcalign_test_SOURCES = tests/mcalign-test.c
mcalign_test_CFLAGS = $(AM_CFLAGS)
-mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-pacat_simple_SOURCES = pacat-simple.c
+pacat_simple_SOURCES = tests/pacat-simple.c
pacat_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
pacat_simple_CFLAGS = $(AM_CFLAGS)
pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-parec_simple_SOURCES = parec-simple.c
+parec_simple_SOURCES = tests/parec-simple.c
parec_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
parec_simple_CFLAGS = $(AM_CFLAGS)
parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-strlist_test_SOURCES = strlist-test.c strlist.c strlist.h strbuf.c strbuf.h util.c util.h xmalloc.c xmalloc.h log.c log.h
+strlist_test_SOURCES = tests/strlist-test.c
strlist_test_CFLAGS = $(AM_CFLAGS)
-strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la libstrlist.la
strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-voltest_SOURCES = voltest.c sample.c volume.c volume.h sample.h
+voltest_SOURCES = tests/voltest.c
voltest_CFLAGS = $(AM_CFLAGS)
-voltest_LDADD = $(AM_LDADD)
+voltest_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit.h util.h log.h idxset.c idxset.h
+cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
cpulimit_test_CFLAGS = $(AM_CFLAGS)
-cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
+cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolypcore.la
cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit.h util.h log.h idxset.c idxset.h
+cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
-cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
+cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolypcore.la
cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
@@ -250,29 +249,29 @@ mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
###################################
polypinclude_HEADERS = \
- cdecl.h \
- channelmap.h \
- glib-mainloop.h \
- mainloop.h \
- mainloop-api.h \
- mainloop-signal.h \
- polyplib.h \
- polyplib-context.h \
- polyplib-def.h \
- polyplib-error.h \
- polyplib-introspect.h \
- polyplib-operation.h \
- polyplib-scache.h \
- polyplib-simple.h \
- polyplib-stream.h \
- polyplib-subscribe.h \
- polyplib-version.h \
- sample.h \
- volume.h
+ polyp/cdecl.h \
+ polyp/channelmap.h \
+ polyp/glib-mainloop.h \
+ polyp/mainloop.h \
+ polyp/mainloop-api.h \
+ polyp/mainloop-signal.h \
+ polyp/polyplib.h \
+ polyp/polyplib-context.h \
+ polyp/polyplib-def.h \
+ polyp/polyplib-error.h \
+ polyp/polyplib-introspect.h \
+ polyp/polyplib-operation.h \
+ polyp/polyplib-scache.h \
+ polyp/polyplib-simple.h \
+ polyp/polyplib-stream.h \
+ polyp/polyplib-subscribe.h \
+ polyp/polyplib-version.h \
+ polyp/sample.h \
+ polyp/volume.h
if HAVE_HOWL
polypinclude_HEADERS += \
- polyplib-browser.h
+ polyp/polyplib-browser.h
endif
lib_LTLIBRARIES = \
@@ -296,55 +295,59 @@ lib_LTLIBRARIES += \
libpolyp-mainloop-glib12-@PA_MAJORMINOR@.la
endif
+# Public interface
libpolyp_@PA_MAJORMINOR@_la_SOURCES = \
- authkey.c authkey.h \
- cdecl.h \
- client-conf.c client-conf.h \
- conf-parser.c conf-parser.h \
- dllmain.c \
- dynarray.c dynarray.h \
- gcc-printf.h \
- idxset.c idxset.h \
- iochannel.c iochannel.h \
- llist.h \
- log.c log.h \
- mainloop-api.c mainloop-api.h \
- mcalign.c mcalign.h \
- memblock.c memblock.h \
- memchunk.c memchunk.h \
- native-common.h \
- packet.c packet.h \
- parseaddr.c parseaddr.h \
- pdispatch.c pdispatch.h \
- polyplib.h \
- polyplib-context.c polyplib-context.h \
- polyplib-def.h \
- polyplib-internal.h \
- polyplib-introspect.c polyplib-introspect.h \
- polyplib-operation.c polyplib-operation.h \
- polyplib-scache.c polyplib-scache.h \
- polyplib-stream.c polyplib-stream.h \
- polyplib-subscribe.c polyplib-subscribe.h \
- pstream.c pstream.h \
- pstream-util.c pstream-util.h \
- queue.c queue.h \
- random.c random.h \
- sample.c sample.h \
- socket-client.c socket-client.h \
- socket-util.c socket-util.h \
- strbuf.c strbuf.h \
- strlist.c strlist.h \
- tagstruct.c tagstruct.h \
- util.c util.h \
- winsock.h \
- xmalloc.c xmalloc.h \
- channelmap.c channelmap.h \
- volume.c volume.h
+ polyp/cdecl.h \
+ polyp/channelmap.c polyp/channelmap.h \
+ polyp/client-conf.c polyp/client-conf.h \
+ polyp/llist.h \
+ polyp/mainloop-api.c polyp/mainloop-api.h \
+ polyp/polyplib.h \
+ polyp/polyplib-context.c polyp/polyplib-context.h \
+ polyp/polyplib-def.h \
+ polyp/polyplib-internal.h \
+ polyp/polyplib-introspect.c polyp/polyplib-introspect.h \
+ polyp/polyplib-operation.c polyp/polyplib-operation.h \
+ polyp/polyplib-scache.c polyp/polyplib-scache.h \
+ polyp/polyplib-stream.c polyp/polyplib-stream.h \
+ polyp/polyplib-subscribe.c polyp/polyplib-subscribe.h \
+ polyp/sample.c polyp/sample.h \
+ polyp/volume.c polyp/volume.h
+
+# Internal stuff that is shared with libpolypcore
+libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
+ polypcore/authkey.c polypcore/authkey.h \
+ polypcore/conf-parser.c polypcore/conf-parser.h \
+ polypcore/dllmain.c \
+ polypcore/dynarray.c polypcore/dynarray.h \
+ polypcore/gccmacro.h \
+ polypcore/idxset.c polypcore/idxset.h \
+ polypcore/iochannel.c polypcore/iochannel.h \
+ polypcore/log.c polypcore/log.h \
+ polypcore/mcalign.c polypcore/mcalign.h \
+ polypcore/memblock.c polypcore/memblock.h \
+ polypcore/memchunk.c polypcore/memchunk.h \
+ polypcore/native-common.h \
+ polypcore/packet.c polypcore/packet.h \
+ polypcore/parseaddr.c polypcore/parseaddr.h \
+ polypcore/pdispatch.c polypcore/pdispatch.h \
+ polypcore/pstream.c polypcore/pstream.h \
+ polypcore/pstream-util.c polypcore/pstream-util.h \
+ polypcore/queue.c polypcore/queue.h \
+ polypcore/random.c polypcore/random.h \
+ polypcore/socket-client.c polypcore/socket-client.h \
+ polypcore/socket-util.c polypcore/socket-util.h \
+ polypcore/strbuf.c polypcore/strbuf.h \
+ polypcore/strlist.c polypcore/strlist.h \
+ polypcore/tagstruct.c polypcore/tagstruct.h \
+ polypcore/util.c polypcore/util.h \
+ polypcore/winsock.h \
+ polypcore/xmalloc.c polypcore/xmalloc.h
if HAVE_X11
libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
- client-conf-x11.c client-conf-x11.h \
- x11prop.c x11prop.h
+ polyp/client-conf-x11.c polyp/client-conf-x11.h \
+ polypcore/x11prop.c polypcore/x11prop.h
endif
libpolyp_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
@@ -361,36 +364,35 @@ libpolyp_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
libpolyp_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS)
endif
-libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyplib-error.c polyplib-error.h
+libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-error.c polyp/polyplib-error.h
libpolyp_error_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_error_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la
libpolyp_error_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_mainloop_@PA_MAJORMINOR@_la_SOURCES = \
- mainloop.c mainloop.h \
- mainloop-api.h mainloop-api.c \
- mainloop-signal.c mainloop-signal.h \
- poll.c poll.h
+ polyp/mainloop.c polyp/mainloop.h \
+ polyp/mainloop-signal.c polyp/mainloop-signal.h \
+ polypcore/poll.c polypcore/poll.h
libpolyp_mainloop_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_mainloop_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(WINSOCK_LIBS)
libpolyp_mainloop_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyplib-simple.c polyplib-simple.h
+libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-simple.c polyp/polyplib-simple.h
libpolyp_simple_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_simple_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
libpolyp_simple_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyplib-browser.c polyplib-browser.h
+libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-browser.c polyp/polyplib-browser.h
libpolyp_browse_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
libpolyp_browse_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(HOWL_LIBS)
libpolyp_browse_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib-mainloop.c
+libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib-mainloop.c
libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB20_LIBS)
libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib12-mainloop.c
+libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib12-mainloop.c
libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB12_LIBS)
libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
@@ -399,90 +401,97 @@ libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
# Daemon core library #
###################################
-polypinclude_HEADERS += \
- cli-command.h \
- client.h \
- core.h \
- dynarray.h \
- endianmacros.h \
- hashmap.h \
- idxset.h \
- iochannel.h \
- memblock.h \
- memblockq.h \
- memchunk.h \
- modargs.h \
- module.h \
- namereg.h \
- queue.h \
- resampler.h \
- sample-util.h \
- sink.h \
- sink-input.h \
- sioman.h \
- socket-server.h \
- socket-client.h \
- socket-util.h \
- source.h \
- source-output.h \
- strbuf.h \
- tokenizer.h \
- tagstruct.h \
- util.h
+polypcoreinclude_HEADERS = \
+ polypcore/cli-command.h \
+ polypcore/client.h \
+ polypcore/core.h \
+ polypcore/dynarray.h \
+ polypcore/endianmacros.h \
+ polypcore/hashmap.h \
+ polypcore/idxset.h \
+ polypcore/iochannel.h \
+ polypcore/log.h \
+ polypcore/memblock.h \
+ polypcore/memblockq.h \
+ polypcore/memchunk.h \
+ polypcore/modargs.h \
+ polypcore/module.h \
+ polypcore/namereg.h \
+ polypcore/queue.h \
+ polypcore/resampler.h \
+ polypcore/sample-util.h \
+ polypcore/sink.h \
+ polypcore/sink-input.h \
+ polypcore/sioman.h \
+ polypcore/socket-server.h \
+ polypcore/socket-client.h \
+ polypcore/socket-util.h \
+ polypcore/source.h \
+ polypcore/source-output.h \
+ polypcore/strbuf.h \
+ polypcore/tokenizer.h \
+ polypcore/tagstruct.h \
+ polypcore/util.h
lib_LTLIBRARIES += libpolypcore.la
+# Some public stuff is used even in the core.
libpolypcore_la_SOURCES = \
- autoload.c autoload.h \
- cli-command.c cli-command.h \
- cli-text.c cli-text.h \
- client.c client.h \
- core.c core.h \
- dllmain.c \
- dynarray.c dynarray.h \
- endianmacros.h \
- g711.c g711.h \
- hashmap.c hashmap.h \
- idxset.c idxset.h \
- log.c log.h \
- mainloop.c mainloop.h \
- mainloop-api.c mainloop-api.h \
- mainloop-signal.c mainloop-signal.h \
- mcalign.c mcalign.h \
- memblock.c memblock.h \
- memblockq.c memblockq.h \
- memchunk.c memchunk.h \
- modargs.c modargs.h \
- modinfo.c modinfo.h \
- module.c module.h \
- namereg.c namereg.h \
- play-memchunk.c play-memchunk.h \
- poll.c poll.h \
- props.c props.h \
- queue.c queue.h \
- random.c random.h \
- resampler.c resampler.h \
- sample.c sample.h \
- sample-util.c sample-util.h \
- scache.c scache.h \
- sconv.c sconv.h \
- sconv-s16be.c sconv-s16be.h \
- sconv-s16le.c sconv-s16le.h \
- sink.c sink.h \
- sink-input.c sink-input.h \
- sioman.c sioman.h \
- sound-file.c sound-file.h \
- sound-file-stream.c sound-file-stream.h \
- source.c source.h \
- source-output.c source-output.h \
- strbuf.c strbuf.h \
- subscribe.c subscripe.h \
- tokenizer.c tokenizer.h \
- util.c util.h \
- winsock.h \
- xmalloc.c xmalloc.h \
- volume.c volume.h \
- channelmap.c channelmap.h
+ polyp/channelmap.c polyp/channelmap.h \
+ polyp/mainloop.c polyp/mainloop.h \
+ polyp/mainloop-api.c polyp/mainloop-api.h \
+ polyp/mainloop-signal.c polyp/mainloop-signal.h \
+ polyp/sample.c polyp/sample.h \
+ polyp/volume.c polyp/volume.h
+
+# Pure core stuff (some are shared in libpolyp though).
+libpolypcore_la_SOURCES += \
+ polypcore/autoload.c polypcore/autoload.h \
+ polypcore/cli-command.c polypcore/cli-command.h \
+ polypcore/cli-text.c polypcore/cli-text.h \
+ polypcore/client.c polypcore/client.h \
+ polypcore/conf-parser.c polypcore/conf-parser.h \
+ polypcore/core.c polypcore/core.h \
+ polypcore/dllmain.c \
+ polypcore/dynarray.c polypcore/dynarray.h \
+ polypcore/endianmacros.h \
+ polypcore/g711.c polypcore/g711.h \
+ polypcore/hashmap.c polypcore/hashmap.h \
+ polypcore/idxset.c polypcore/idxset.h \
+ polypcore/log.c polypcore/log.h \
+ polypcore/mcalign.c polypcore/mcalign.h \
+ polypcore/memblock.c polypcore/memblock.h \
+ polypcore/memblockq.c polypcore/memblockq.h \
+ polypcore/memchunk.c polypcore/memchunk.h \
+ polypcore/modargs.c polypcore/modargs.h \
+ polypcore/modinfo.c polypcore/modinfo.h \
+ polypcore/module.c polypcore/module.h \
+ polypcore/namereg.c polypcore/namereg.h \
+ polypcore/pid.c polypcore/pid.h \
+ polypcore/play-memchunk.c polypcore/play-memchunk.h \
+ polypcore/poll.c polypcore/poll.h \
+ polypcore/props.c polypcore/props.h \
+ polypcore/queue.c polypcore/queue.h \
+ polypcore/random.c polypcore/random.h \
+ polypcore/resampler.c polypcore/resampler.h \
+ polypcore/sample-util.c polypcore/sample-util.h \
+ polypcore/scache.c polypcore/scache.h \
+ polypcore/sconv.c polypcore/sconv.h \
+ polypcore/sconv-s16be.c polypcore/sconv-s16be.h \
+ polypcore/sconv-s16le.c polypcore/sconv-s16le.h \
+ polypcore/sink.c polypcore/sink.h \
+ polypcore/sink-input.c polypcore/sink-input.h \
+ polypcore/sioman.c polypcore/sioman.h \
+ polypcore/sound-file.c polypcore/sound-file.h \
+ polypcore/sound-file-stream.c polypcore/sound-file-stream.h \
+ polypcore/source.c polypcore/source.h \
+ polypcore/source-output.c polypcore/source-output.h \
+ polypcore/strbuf.c polypcore/strbuf.h \
+ polypcore/subscribe.c polypcore/subscribe.h \
+ polypcore/tokenizer.c polypcore/tokenizer.h \
+ polypcore/util.c polypcore/util.h \
+ polypcore/winsock.h \
+ polypcore/xmalloc.c polypcore/xmalloc.h
libpolypcore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
libpolypcore_la_LDFLAGS = -avoid-version
@@ -540,117 +549,117 @@ modlib_LTLIBRARIES += \
libhowl-wrap.la
endif
-libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h
+libprotocol_simple_la_SOURCES = polypcore/protocol-simple.c polypcore/protocol-simple.h
libprotocol_simple_la_LDFLAGS = -avoid-version
libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-server.la libiochannel.la
libsocket_server_la_SOURCES = \
- inet_ntop.c inet_ntop.h \
- socket-server.c socket-server.h
+ polypcore/inet_ntop.c polypcore/inet_ntop.h \
+ polypcore/socket-server.c polypcore/socket-server.h
libsocket_server_la_LDFLAGS = -avoid-version
libsocket_server_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
-libsocket_client_la_SOURCES = socket-client.c socket-client.h
+libsocket_client_la_SOURCES = polypcore/socket-client.c polypcore/socket-client.h
libsocket_client_la_LDFLAGS = -avoid-version
libsocket_client_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS)
libsocket_client_la_CFLAGS = $(AM_CFLAGS) $(LIBASYNCNS_CFLAGS)
-libparseaddr_la_SOURCES = parseaddr.c parseaddr.h
+libparseaddr_la_SOURCES = polypcore/parseaddr.c polypcore/parseaddr.h
libparseaddr_la_LDFLAGS = -avoid-version
libparseaddr_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libpstream_la_SOURCES = pstream.c pstream.h
+libpstream_la_SOURCES = polypcore/pstream.c polypcore/pstream.h
libpstream_la_LDFLAGS = -avoid-version
libpstream_la_LIBADD = $(AM_LIBADD) libpolypcore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
-libpstream_util_la_SOURCES = pstream-util.c pstream-util.h
+libpstream_util_la_SOURCES = polypcore/pstream-util.c polypcore/pstream-util.h
libpstream_util_la_LDFLAGS = -avoid-version
libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
-libpdispatch_la_SOURCES = pdispatch.c pdispatch.h
+libpdispatch_la_SOURCES = polypcore/pdispatch.c polypcore/pdispatch.h
libpdispatch_la_LDFLAGS = -avoid-version
libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpolypcore.la
-libiochannel_la_SOURCES = iochannel.c iochannel.h
+libiochannel_la_SOURCES = polypcore/iochannel.c polypcore/iochannel.h
libiochannel_la_LDFLAGS = -avoid-version
libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpolypcore.la $(WINSOCK_LIBS)
-libpacket_la_SOURCES = packet.c packet.h
+libpacket_la_SOURCES = polypcore/packet.c polypcore/packet.h
libpacket_la_LDFLAGS = -avoid-version
libpacket_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libioline_la_SOURCES = ioline.c ioline.h
+libioline_la_SOURCES = polypcore/ioline.c polypcore/ioline.h
libioline_la_LDFLAGS = -avoid-version
libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpolypcore.la
-libcli_la_SOURCES = cli.c cli.h
+libcli_la_SOURCES = polypcore/cli.c polypcore/cli.h
libcli_la_CPPFLAGS = $(AM_CPPFLAGS)
libcli_la_LDFLAGS = -avoid-version
libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpolypcore.la
-libstrlist_la_SOURCES = strlist.c strlist.h
+libstrlist_la_SOURCES = polypcore/strlist.c polypcore/strlist.h
libstrlist_la_LDFLAGS = -avoid-version
libstrlist_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libprotocol_cli_la_SOURCES = protocol-cli.c protocol-cli.h
+libprotocol_cli_la_SOURCES = polypcore/protocol-cli.c polypcore/protocol-cli.h
libprotocol_cli_la_LDFLAGS = -avoid-version
libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpolypcore.la
-libprotocol_http_la_SOURCES = protocol-http.c protocol-http.h
+libprotocol_http_la_SOURCES = polypcore/protocol-http.c polypcore/protocol-http.h
libprotocol_http_la_LDFLAGS = -avoid-version
libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpolypcore.la libiochannel.la
-libprotocol_native_la_SOURCES = protocol-native.c protocol-native.h native-common.h
+libprotocol_native_la_SOURCES = polypcore/protocol-native.c polypcore/protocol-native.h polypcore/native-common.h
libprotocol_native_la_LDFLAGS = -avoid-version
libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpolypcore.la libiochannel.la
-libtagstruct_la_SOURCES = tagstruct.c tagstruct.h
+libtagstruct_la_SOURCES = polypcore/tagstruct.c polypcore/tagstruct.h
libtagstruct_la_LDFLAGS = -avoid-version
libtagstruct_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(WINSOCK_LIBS)
-libprotocol_esound_la_SOURCES = protocol-esound.c protocol-esound.h esound.h
+libprotocol_esound_la_SOURCES = polypcore/protocol-esound.c polypcore/protocol-esound.h polypcore/esound.h
libprotocol_esound_la_LDFLAGS = -avoid-version
libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpolypcore.la
-libauthkey_la_SOURCES = authkey.c authkey.h
+libauthkey_la_SOURCES = polypcore/authkey.c polypcore/authkey.h
libauthkey_la_LDFLAGS = -avoid-version
libauthkey_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libauthkey_prop_la_SOURCES = authkey-prop.c authkey-prop.h
+libauthkey_prop_la_SOURCES = polypcore/authkey-prop.c polypcore/authkey-prop.h
libauthkey_prop_la_LDFLAGS = -avoid-version
libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-libsocket_util_la_SOURCES = socket-util.c socket-util.h
+libsocket_util_la_SOURCES = polypcore/socket-util.c polypcore/socket-util.h
libsocket_util_la_LDFLAGS = -avoid-version
libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS)
# X11
-libx11wrap_la_SOURCES = x11wrap.c x11wrap.h
+libx11wrap_la_SOURCES = polypcore/x11wrap.c polypcore/x11wrap.h
libx11wrap_la_LDFLAGS = -avoid-version
libx11wrap_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
-libx11prop_la_SOURCES = x11prop.c x11prop.h
+libx11prop_la_SOURCES = polypcore/x11prop.c polypcore/x11prop.h
libx11prop_la_LDFLAGS = -avoid-version
libx11prop_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
libx11prop_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
# OSS
-liboss_util_la_SOURCES = oss-util.c oss-util.h
+liboss_util_la_SOURCES = polypcore/oss-util.c polypcore/oss-util.h
liboss_util_la_LDFLAGS = -avoid-version
# ALSA
-libalsa_util_la_SOURCES = alsa-util.c alsa-util.h
+libalsa_util_la_SOURCES = polypcore/alsa-util.c polypcore/alsa-util.h
libalsa_util_la_LDFLAGS = -avoid-version
libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS)
libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
# HOWL
-libhowl_wrap_la_SOURCES = howl-wrap.c howl-wrap.h
+libhowl_wrap_la_SOURCES = polypcore/howl-wrap.c polypcore/howl-wrap.h
libhowl_wrap_la_LDFLAGS = -avoid-version
libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS)
libhowl_wrap_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
@@ -752,268 +761,268 @@ endif
# These are generated by a M4 script
SYMDEF_FILES = \
- module-cli-symdef.h \
- module-cli-protocol-tcp-symdef.h \
- module-cli-protocol-tcp6-symdef.h \
- module-cli-protocol-unix-symdef.h \
- module-pipe-sink-symdef.h \
- module-pipe-source-symdef.h \
- module-simple-protocol-tcp-symdef.h \
- module-simple-protocol-tcp6-symdef.h \
- module-simple-protocol-unix-symdef.h \
- module-esound-protocol-tcp-symdef.h \
- module-esound-protocol-tcp6-symdef.h \
- module-esound-protocol-unix-symdef.h \
- module-native-protocol-tcp-symdef.h \
- module-native-protocol-tcp6-symdef.h \
- module-native-protocol-unix-symdef.h \
- module-native-protocol-fd-symdef.h \
- module-sine-symdef.h \
- module-combine-symdef.h \
- module-esound-compat-spawnfd-symdef.h \
- module-esound-compat-spawnpid-symdef.h \
- module-match-symdef.h \
- module-tunnel-sink-symdef.h \
- module-tunnel-source-symdef.h \
- module-null-sink-symdef.h \
- module-esound-sink-symdef.h \
- module-zeroconf-publish-symdef.h \
- module-lirc-symdef.h \
- module-mmkbd-evdev-symdef.h \
- module-http-protocol-tcp-symdef.h \
- module-http-protocol-tcp6-symdef.h \
- module-http-protocol-unix-symdef.h \
- module-x11-bell-symdef.h \
- module-x11-publish-symdef.h \
- module-oss-symdef.h \
- module-oss-mmap-symdef.h \
- module-alsa-sink-symdef.h \
- module-alsa-source-symdef.h \
- module-solaris-symdef.h \
- module-waveout-symdef.h \
- module-detect-symdef.h
+ modules/module-cli-symdef.h \
+ modules/module-cli-protocol-tcp-symdef.h \
+ modules/module-cli-protocol-tcp6-symdef.h \
+ modules/module-cli-protocol-unix-symdef.h \
+ modules/module-pipe-sink-symdef.h \
+ modules/module-pipe-source-symdef.h \
+ modules/module-simple-protocol-tcp-symdef.h \
+ modules/module-simple-protocol-tcp6-symdef.h \
+ modules/module-simple-protocol-unix-symdef.h \
+ modules/module-esound-protocol-tcp-symdef.h \
+ modules/module-esound-protocol-tcp6-symdef.h \
+ modules/module-esound-protocol-unix-symdef.h \
+ modules/module-native-protocol-tcp-symdef.h \
+ modules/module-native-protocol-tcp6-symdef.h \
+ modules/module-native-protocol-unix-symdef.h \
+ modules/module-native-protocol-fd-symdef.h \
+ modules/module-sine-symdef.h \
+ modules/module-combine-symdef.h \
+ modules/module-esound-compat-spawnfd-symdef.h \
+ modules/module-esound-compat-spawnpid-symdef.h \
+ modules/module-match-symdef.h \
+ modules/module-tunnel-sink-symdef.h \
+ modules/module-tunnel-source-symdef.h \
+ modules/module-null-sink-symdef.h \
+ modules/module-esound-sink-symdef.h \
+ modules/module-zeroconf-publish-symdef.h \
+ modules/module-lirc-symdef.h \
+ modules/module-mmkbd-evdev-symdef.h \
+ modules/module-http-protocol-tcp-symdef.h \
+ modules/module-http-protocol-tcp6-symdef.h \
+ modules/module-http-protocol-unix-symdef.h \
+ modules/module-x11-bell-symdef.h \
+ modules/module-x11-publish-symdef.h \
+ modules/module-oss-symdef.h \
+ modules/module-oss-mmap-symdef.h \
+ modules/module-alsa-sink-symdef.h \
+ modules/module-alsa-source-symdef.h \
+ modules/module-solaris-symdef.h \
+ modules/module-waveout-symdef.h \
+ modules/module-detect-symdef.h
EXTRA_DIST += $(SYMDEF_FILES)
BUILT_SOURCES += $(SYMDEF_FILES)
-$(SYMDEF_FILES): module-defs.h.m4
+$(SYMDEF_FILES): modules/module-defs.h.m4
$(M4) -Dfname="$@" $< > $@
# Simple protocol
-module_simple_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
module_simple_protocol_tcp_la_LDFLAGS = -module -avoid-version
module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la
-module_simple_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_simple_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_simple_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
module_simple_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_simple_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la
-module_simple_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_simple_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
module_simple_protocol_unix_la_LDFLAGS = -module -avoid-version
module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la libsocket-util.la
# CLI protocol
-module_cli_la_SOURCES = module-cli.c
+module_cli_la_SOURCES = modules/module-cli.c
module_cli_la_LDFLAGS = -module -avoid-version
module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpolypcore.la
-module_cli_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_cli_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
module_cli_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
module_cli_protocol_tcp_la_LDFLAGS = -module -avoid-version
module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la
-module_cli_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_cli_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_cli_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
module_cli_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_cli_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la
-module_cli_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_cli_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
module_cli_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
module_cli_protocol_unix_la_LDFLAGS = -module -avoid-version
module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la libsocket-util.la
# HTTP protocol
-module_http_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_http_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
module_http_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
module_http_protocol_tcp_la_LDFLAGS = -module -avoid-version
module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la
-module_http_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_http_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_http_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
module_http_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_http_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la
-module_http_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_http_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
module_http_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
module_http_protocol_unix_la_LDFLAGS = -module -avoid-version
module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la libsocket-util.la
# Native protocol
-module_native_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
module_native_protocol_tcp_la_LDFLAGS = -module -avoid-version
module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la
-module_native_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_native_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_native_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
module_native_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_native_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la
-module_native_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_native_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
module_native_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
module_native_protocol_unix_la_LDFLAGS = -module -avoid-version
module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la
-module_native_protocol_fd_la_SOURCES = module-native-protocol-fd.c
+module_native_protocol_fd_la_SOURCES = modules/module-native-protocol-fd.c
module_native_protocol_fd_la_CFLAGS = $(AM_CFLAGS)
module_native_protocol_fd_la_LDFLAGS = -module -avoid-version
module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la
# EsounD protocol
-module_esound_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_esound_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
module_esound_protocol_tcp_la_LDFLAGS = -module -avoid-version
module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la
-module_esound_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_esound_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
module_esound_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
module_esound_protocol_tcp6_la_LDFLAGS = -module -avoid-version
module_esound_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la
-module_esound_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_esound_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
module_esound_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
module_esound_protocol_unix_la_LDFLAGS = -module -avoid-version
module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la libsocket-util.la
-module_esound_compat_spawnfd_la_SOURCES = module-esound-compat-spawnfd.c
+module_esound_compat_spawnfd_la_SOURCES = modules/module-esound-compat-spawnfd.c
module_esound_compat_spawnfd_la_LDFLAGS = -module -avoid-version
module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_esound_compat_spawnpid_la_SOURCES = module-esound-compat-spawnpid.c
+module_esound_compat_spawnpid_la_SOURCES = modules/module-esound-compat-spawnpid.c
module_esound_compat_spawnpid_la_LDFLAGS = -module -avoid-version
module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_esound_sink_la_SOURCES = module-esound-sink.c
+module_esound_sink_la_SOURCES = modules/module-esound-sink.c
module_esound_sink_la_LDFLAGS = -module -avoid-version
module_esound_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-client.la libauthkey.la
# Pipes
-module_pipe_sink_la_SOURCES = module-pipe-sink.c
+module_pipe_sink_la_SOURCES = modules/module-pipe-sink.c
module_pipe_sink_la_LDFLAGS = -module -avoid-version
module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
-module_pipe_source_la_SOURCES = module-pipe-source.c
+module_pipe_source_la_SOURCES = modules/module-pipe-source.c
module_pipe_source_la_LDFLAGS = -module -avoid-version
module_pipe_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
# Fake sources/sinks
-module_sine_la_SOURCES = module-sine.c
+module_sine_la_SOURCES = modules/module-sine.c
module_sine_la_LDFLAGS = -module -avoid-version
module_sine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_null_sink_la_SOURCES = module-null-sink.c
+module_null_sink_la_SOURCES = modules/module-null-sink.c
module_null_sink_la_LDFLAGS = -module -avoid-version
module_null_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la
# Couplings
-module_combine_la_SOURCES = module-combine.c
+module_combine_la_SOURCES = modules/module-combine.c
module_combine_la_LDFLAGS = -module -avoid-version
module_combine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_match_la_SOURCES = module-match.c
+module_match_la_SOURCES = modules/module-match.c
module_match_la_LDFLAGS = -module -avoid-version
module_match_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-module_tunnel_sink_la_SOURCES = module-tunnel.c
+module_tunnel_sink_la_SOURCES = modules/module-tunnel.c
module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS)
module_tunnel_sink_la_LDFLAGS = -module -avoid-version
module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
-module_tunnel_source_la_SOURCES = module-tunnel.c
+module_tunnel_source_la_SOURCES = modules/module-tunnel.c
module_tunnel_source_la_LDFLAGS = -module -avoid-version
module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
# X11
-module_x11_bell_la_SOURCES = module-x11-bell.c
+module_x11_bell_la_SOURCES = modules/module-x11-bell.c
module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
module_x11_bell_la_LDFLAGS = -module -avoid-version
module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la
-module_x11_publish_la_SOURCES = module-x11-publish.c
+module_x11_publish_la_SOURCES = modules/module-x11-publish.c
module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
module_x11_publish_la_LDFLAGS = -module -avoid-version
module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauthkey-prop.la libx11prop.la libstrlist.la
# OSS
-module_oss_la_SOURCES = module-oss.c
+module_oss_la_SOURCES = modules/module-oss.c
module_oss_la_LDFLAGS = -module -avoid-version
module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la
-module_oss_mmap_la_SOURCES = module-oss-mmap.c
+module_oss_mmap_la_SOURCES = modules/module-oss-mmap.c
module_oss_mmap_la_LDFLAGS = -module -avoid-version
module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la
# ALSA
-module_alsa_sink_la_SOURCES = module-alsa-sink.c
+module_alsa_sink_la_SOURCES = modules/module-alsa-sink.c
module_alsa_sink_la_LDFLAGS = -module -avoid-version
module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
-module_alsa_source_la_SOURCES = module-alsa-source.c
+module_alsa_source_la_SOURCES = modules/module-alsa-source.c
module_alsa_source_la_LDFLAGS = -module -avoid-version
module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
# Solaris
-module_solaris_la_SOURCES = module-solaris.c
+module_solaris_la_SOURCES = modules/module-solaris.c
module_solaris_la_LDFLAGS = -module -avoid-version
module_solaris_la_LIBADD = $(AM_LIBADD) libiochannel.la
# HOWL
-module_zeroconf_publish_la_SOURCES = module-zeroconf-publish.c
+module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c
module_zeroconf_publish_la_LDFLAGS = -module -avoid-version
module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la
module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
# LIRC
-module_lirc_la_SOURCES = module-lirc.c
+module_lirc_la_SOURCES = modules/module-lirc.c
module_lirc_la_LDFLAGS = -module -avoid-version
module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS)
module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
# Linux evdev
-module_mmkbd_evdev_la_SOURCES = module-mmkbd-evdev.c
+module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
module_mmkbd_evdev_la_LDFLAGS = -module -avoid-version
module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD)
module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS)
# Windows waveout
-module_waveout_la_SOURCES = module-waveout.c
+module_waveout_la_SOURCES = modules/module-waveout.c
module_waveout_la_LDFLAGS = -module -avoid-version
module_waveout_la_LIBADD = $(AM_LIBADD) libpolypcore.la -lwinmm
module_waveout_la_CFLAGS = $(AM_CFLAGS)
# Hardware autodetection module
-module_detect_la_SOURCES = module-detect.c
+module_detect_la_SOURCES = modules/module-detect.c
module_detect_la_LDFLAGS = -module -avoid-version
module_detect_la_LIBADD = $(AM_LIBADD)
module_detect_la_CFLAGS = $(AM_CFLAGS)
@@ -1026,7 +1035,7 @@ suid: polypaudio
chown root $<
chmod u+s $<
-esdcompat.sh: esdcompat.sh.in Makefile
+utils/esdcompat.sh: utils/esdcompat.sh.in Makefile
sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
diff --git a/polyp/client.conf.in b/src/client.conf.in
index fbf645a4..fbf645a4 100644
--- a/polyp/client.conf.in
+++ b/src/client.conf.in
diff --git a/polyp/daemon.conf.in b/src/daemon.conf.in
index d5373018..d5373018 100644
--- a/polyp/daemon.conf.in
+++ b/src/daemon.conf.in
diff --git a/polyp/caps.c b/src/daemon/caps.c
index 4ecb5848..8d429459 100644
--- a/polyp/caps.c
+++ b/src/daemon/caps.c
@@ -32,7 +32,7 @@
#include <sys/capability.h>
#endif
-#include "log.h"
+#include <polypcore/log.h>
#include "caps.h"
#ifdef HAVE_GETUID
diff --git a/polyp/caps.h b/src/daemon/caps.h
index 3bb861d1..3bb861d1 100644
--- a/polyp/caps.h
+++ b/src/daemon/caps.h
diff --git a/polyp/cmdline.c b/src/daemon/cmdline.c
index 5635707f..0b5f9ec7 100644
--- a/polyp/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -31,9 +31,9 @@
#include <sys/stat.h>
#include "cmdline.h"
-#include "util.h"
-#include "strbuf.h"
-#include "xmalloc.h"
+#include <polypcore/util.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/xmalloc.h>
/* Argument codes for getopt_long() */
enum {
diff --git a/polyp/cmdline.h b/src/daemon/cmdline.h
index e2eaf0d2..e2eaf0d2 100644
--- a/polyp/cmdline.h
+++ b/src/daemon/cmdline.h
diff --git a/polyp/cpulimit.c b/src/daemon/cpulimit.c
index a834b094..6887796f 100644
--- a/polyp/cpulimit.c
+++ b/src/daemon/cpulimit.c
@@ -24,8 +24,8 @@
#endif
#include "cpulimit.h"
-#include "util.h"
-#include "log.h"
+#include <polypcore/util.h>
+#include <polypcore/log.h>
#ifdef HAVE_SIGXCPU
diff --git a/polyp/cpulimit.h b/src/daemon/cpulimit.h
index 8ca4f8d9..f3c5534d 100644
--- a/polyp/cpulimit.h
+++ b/src/daemon/cpulimit.h
@@ -22,7 +22,7 @@
USA.
***/
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
/* This kills the polypaudio process if it eats more than 70% of the
* CPU time. This is build around setrlimit() and SIGXCPU. It is handy
diff --git a/polyp/daemon-conf.c b/src/daemon/daemon-conf.c
index 103cf46a..8fe3c4cc 100644
--- a/polyp/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -30,11 +30,11 @@
#include <unistd.h>
#include "daemon-conf.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "strbuf.h"
-#include "conf-parser.h"
-#include "resampler.h"
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/conf-parser.h>
+#include <polypcore/resampler.h>
#ifndef DEFAULT_CONFIG_DIR
# ifndef OS_IS_WIN32
diff --git a/polyp/daemon-conf.h b/src/daemon/daemon-conf.h
index cebc0bd6..d5131419 100644
--- a/polyp/daemon-conf.h
+++ b/src/daemon/daemon-conf.h
@@ -22,7 +22,7 @@
USA.
***/
-#include "log.h"
+#include <polypcore/log.h>
/* The actual command to execute */
typedef enum pa_daemon_conf_cmd {
diff --git a/polyp/dumpmodules.c b/src/daemon/dumpmodules.c
index 6864b965..8d8eb0b9 100644
--- a/polyp/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -30,8 +30,8 @@
#include <ltdl.h>
#include "dumpmodules.h"
-#include "modinfo.h"
-#include "util.h"
+#include <polypcore/modinfo.h>
+#include <polypcore/util.h>
#define PREFIX "module-"
diff --git a/polyp/dumpmodules.h b/src/daemon/dumpmodules.h
index 968d2de9..968d2de9 100644
--- a/polyp/dumpmodules.h
+++ b/src/daemon/dumpmodules.h
diff --git a/polyp/main.c b/src/daemon/main.c
index b5aac851..6be83d8c 100644
--- a/polyp/main.c
+++ b/src/daemon/main.c
@@ -32,7 +32,6 @@
#include <stddef.h>
#include <assert.h>
#include <ltdl.h>
-#include <memblock.h>
#include <limits.h>
#include <fcntl.h>
#include <unistd.h>
@@ -48,25 +47,26 @@
#include <tcpd.h>
#endif
-#include "winsock.h"
+#include <polypcore/winsock.h>
-#include "core.h"
-#include "mainloop.h"
-#include "module.h"
-#include "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 "cli-command.h"
-#include "util.h"
-#include "sioman.h"
-#include "xmalloc.h"
+#include <polypcore/cli-command.h>
+#include <polypcore/util.h>
+#include <polypcore/sioman.h>
+#include <polypcore/xmalloc.h>
#include "cpulimit.h"
-#include "log.h"
+#include <polypcore/log.h>
#include "daemon-conf.h"
#include "dumpmodules.h"
#include "caps.h"
-#include "cli-text.h"
-#include "pid.h"
-#include "namereg.h"
+#include <polypcore/cli-text.h>
+#include <polypcore/pid.h>
+#include <polypcore/namereg.h>
#ifdef HAVE_LIBWRAP
/* Only one instance of these variables */
diff --git a/polyp/default.pa.in b/src/default.pa.in
index 3aaeeaf0..3aaeeaf0 100755
--- a/polyp/default.pa.in
+++ b/src/default.pa.in
diff --git a/polyp/default.pa.win32 b/src/default.pa.win32
index 3478adab..3478adab 100644
--- a/polyp/default.pa.win32
+++ b/src/default.pa.win32
diff --git a/polyp/depmod.py b/src/depmod.py
index 7bb223b1..7bb223b1 100755
--- a/polyp/depmod.py
+++ b/src/depmod.py
diff --git a/polyp/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 9aa220be..48e90e9f 100644
--- a/polyp/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -34,16 +34,17 @@
#include <asoundlib.h>
-#include "module.h"
-#include "core.h"
-#include "memchunk.h"
-#include "sink.h"
-#include "modargs.h"
-#include "util.h"
-#include "sample-util.h"
-#include "alsa-util.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/alsa-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-alsa-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-alsa-source.c b/src/modules/module-alsa-source.c
index efc84efe..f03e51ad 100644
--- a/polyp/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -34,16 +34,17 @@
#include <asoundlib.h>
-#include "module.h"
-#include "core.h"
-#include "memchunk.h"
-#include "sink.h"
-#include "modargs.h"
-#include "util.h"
-#include "sample-util.h"
-#include "alsa-util.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/alsa-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-alsa-source-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-cli.c b/src/modules/module-cli.c
index db0e895c..c782ff8d 100644
--- a/polyp/module-cli.c
+++ b/src/modules/module-cli.c
@@ -27,11 +27,12 @@
#include <assert.h>
#include <unistd.h>
-#include "module.h"
-#include "iochannel.h"
-#include "cli.h"
-#include "sioman.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/iochannel.h>
+#include <polypcore/cli.h>
+#include <polypcore/sioman.h>
+#include <polypcore/log.h>
+
#include "module-cli-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-combine.c b/src/modules/module-combine.c
index 0c21c2f5..aabb8f28 100644
--- a/polyp/module-combine.c
+++ b/src/modules/module-combine.c
@@ -26,16 +26,17 @@
#include <assert.h>
#include <stdio.h>
-#include "module.h"
-#include "llist.h"
-#include "sink.h"
-#include "sink-input.h"
-#include "memblockq.h"
-#include "log.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "modargs.h"
-#include "namereg.h"
+#include <polypcore/module.h>
+#include <polypcore/llist.h>
+#include <polypcore/sink.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/memblockq.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/modargs.h>
+#include <polypcore/namereg.h>
+
#include "module-combine-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-defs.h.m4 b/src/modules/module-defs.h.m4
index 2eff25a7..8f10d659 100644
--- a/polyp/module-defs.h.m4
+++ b/src/modules/module-defs.h.m4
@@ -1,6 +1,6 @@
dnl $Id$
changecom(`/*', `*/')dnl
-define(`module_name', patsubst(patsubst(fname, `-symdef.h$'), `[^0-9a-zA-Z]', `_'))dnl
+define(`module_name', patsubst(patsubst(patsubst(fname, `-symdef.h$'), `^.*/'), `[^0-9a-zA-Z]', `_'))dnl
define(`c_symbol', patsubst(module_name, `[^0-9a-zA-Z]', `_'))dnl
define(`c_macro', patsubst(module_name, `[^0-9a-zA-Z]', `'))dnl
define(`incmacro', `foo'c_macro`symdeffoo')dnl
@@ -8,8 +8,8 @@ define(`gen_symbol', `#define $1 'module_name`_LTX_$1')dnl
#ifndef incmacro
#define incmacro
-#include "core.h"
-#include "module.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
gen_symbol(pa__init)
gen_symbol(pa__done)
diff --git a/polyp/module-detect.c b/src/modules/module-detect.c
index ee75da36..e325b22c 100644
--- a/polyp/module-detect.c
+++ b/src/modules/module-detect.c
@@ -31,11 +31,12 @@
#include <errno.h>
#include <stdlib.h>
-#include "module.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-detect-symdef.h"
-#include "xmalloc.h"
-#include "modargs.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers")
diff --git a/polyp/module-esound-compat-spawnfd.c b/src/modules/module-esound-compat-spawnfd.c
index 5051e4d0..5c656be9 100644
--- a/polyp/module-esound-compat-spawnfd.c
+++ b/src/modules/module-esound-compat-spawnfd.c
@@ -28,10 +28,11 @@
#include <string.h>
#include <errno.h>
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
#include "module-esound-compat-spawnfd-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-esound-compat-spawnpid.c b/src/modules/module-esound-compat-spawnpid.c
index aa8b0f82..5daa1297 100644
--- a/polyp/module-esound-compat-spawnpid.c
+++ b/src/modules/module-esound-compat-spawnpid.c
@@ -28,10 +28,11 @@
#include <errno.h>
#include <signal.h>
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+
#include "module-esound-compat-spawnpid-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-esound-sink.c b/src/modules/module-esound-sink.c
index afd5feed..4f724811 100644
--- a/polyp/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -33,17 +33,18 @@
#include <unistd.h>
#include <limits.h>
-#include "iochannel.h"
-#include "sink.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/esound.h>
+#include <polypcore/authkey.h>
+
#include "module-esound-sink-symdef.h"
-#include "socket-client.h"
-#include "esound.h"
-#include "authkey.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("ESOUND Sink")
diff --git a/polyp/module-lirc.c b/src/modules/module-lirc.c
index d2e248aa..ea8a2bd2 100644
--- a/polyp/module-lirc.c
+++ b/src/modules/module-lirc.c
@@ -30,13 +30,14 @@
#include <lirc/lirc_client.h>
#include <stdlib.h>
-#include "module.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/log.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sink.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/modargs.h>
+
#include "module-lirc-symdef.h"
-#include "namereg.h"
-#include "sink.h"
-#include "xmalloc.h"
-#include "modargs.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("LIRC volume control")
diff --git a/polyp/module-match.c b/src/modules/module-match.c
index e3e7b17d..10ceb75e 100644
--- a/polyp/module-match.c
+++ b/src/modules/module-match.c
@@ -32,13 +32,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
-#include "subscribe.h"
-#include "xmalloc.h"
-#include "sink-input.h"
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+#include <polypcore/subscribe.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/sink-input.h>
+
#include "module-match-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index ec45ec4b..b60f786d 100644
--- a/polyp/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -33,14 +33,15 @@
#include <linux/input.h>
-#include "module.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/log.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sink.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+
#include "module-mmkbd-evdev-symdef.h"
-#include "namereg.h"
-#include "sink.h"
-#include "xmalloc.h"
-#include "modargs.h"
-#include "util.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("Multimedia keyboard support via Linux evdev")
diff --git a/polyp/module-native-protocol-fd.c b/src/modules/module-native-protocol-fd.c
index 7f09ff91..abc531b3 100644
--- a/polyp/module-native-protocol-fd.c
+++ b/src/modules/module-native-protocol-fd.c
@@ -27,11 +27,12 @@
#include <assert.h>
#include <unistd.h>
-#include "module.h"
-#include "iochannel.h"
-#include "modargs.h"
-#include "protocol-native.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/iochannel.h>
+#include <polypcore/modargs.h>
+#include <polypcore/protocol-native.h>
+#include <polypcore/log.h>
+
#include "module-native-protocol-fd-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-null-sink.c b/src/modules/module-null-sink.c
index 93abca78..5731a403 100644
--- a/polyp/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -33,13 +33,14 @@
#include <unistd.h>
#include <limits.h>
-#include "iochannel.h"
-#include "sink.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-null-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index f976cf81..6986b03c 100644
--- a/polyp/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -36,16 +36,17 @@
#include <limits.h>
#include <sys/mman.h>
-#include "iochannel.h"
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "oss-util.h"
-#include "sample-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/oss-util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-oss-mmap-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-oss.c b/src/modules/module-oss.c
index b5c7ae8c..04458419 100644
--- a/polyp/module-oss.c
+++ b/src/modules/module-oss.c
@@ -35,16 +35,17 @@
#include <unistd.h>
#include <limits.h>
-#include "iochannel.h"
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "oss-util.h"
-#include "sample-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/oss-util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-oss-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 20e220ce..6ace377f 100644
--- a/polyp/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -33,13 +33,14 @@
#include <unistd.h>
#include <limits.h>
-#include "iochannel.h"
-#include "sink.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-pipe-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-pipe-source.c b/src/modules/module-pipe-source.c
index 42f13d4b..a7bb0ce7 100644
--- a/polyp/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -33,13 +33,14 @@
#include <unistd.h>
#include <limits.h>
-#include "iochannel.h"
-#include "source.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-pipe-source-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index a0314368..469ddcee 100644
--- a/polyp/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -40,16 +40,15 @@
#include <netinet/in.h>
#endif
-#include "winsock.h"
+#include <polypcore/winsock.h>
-#include "module.h"
-#include "socket-server.h"
-#include "socket-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
-#include "native-common.h"
-#include "util.h"
+#include <polypcore/module.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/socket-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+#include <polypcore/native-common.h>
#ifdef USE_TCP_SOCKETS
#define SOCKET_DESCRIPTION "(TCP sockets)"
@@ -63,7 +62,7 @@
#endif
#if defined(USE_PROTOCOL_SIMPLE)
- #include "protocol-simple.h"
+ #include <polypcore/protocol-simple.h>
#define protocol_new pa_protocol_simple_new
#define protocol_free pa_protocol_simple_free
#define TCPWRAP_SERVICE "polypaudio-simple"
@@ -80,7 +79,7 @@
PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION)
PA_MODULE_USAGE("rate=<sample rate> format=<sample format> channels=<number of channels> sink=<sink to connect to> source=<source to connect to> playback=<enable playback?> record=<enable record?> "SOCKET_USAGE)
#elif defined(USE_PROTOCOL_CLI)
- #include "protocol-cli.h"
+ #include <polypcore/protocol-cli.h>
#define protocol_new pa_protocol_cli_new
#define protocol_free pa_protocol_cli_free
#define TCPWRAP_SERVICE "polypaudio-cli"
@@ -97,7 +96,7 @@
PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION)
PA_MODULE_USAGE(SOCKET_USAGE)
#elif defined(USE_PROTOCOL_HTTP)
- #include "protocol-http.h"
+ #include <polypcore/protocol-http.h>
#define protocol_new pa_protocol_http_new
#define protocol_free pa_protocol_http_free
#define TCPWRAP_SERVICE "polypaudio-http"
@@ -114,7 +113,7 @@
PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION)
PA_MODULE_USAGE(SOCKET_USAGE)
#elif defined(USE_PROTOCOL_NATIVE)
- #include "protocol-native.h"
+ #include <polypcore/protocol-native.h>
#define protocol_new pa_protocol_native_new
#define protocol_free pa_protocol_native_free
#define TCPWRAP_SERVICE "polypaudio-native"
@@ -131,8 +130,8 @@
PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION)
PA_MODULE_USAGE("public=<don't check for cookies?> cookie=<path to cookie file> "SOCKET_USAGE)
#elif defined(USE_PROTOCOL_ESOUND)
- #include "protocol-esound.h"
- #include "esound.h"
+ #include <polypcore/protocol-esound.h>
+ #include <polypcore/esound.h>
#define protocol_new pa_protocol_esound_new
#define protocol_free pa_protocol_esound_free
#define TCPWRAP_SERVICE "esound"
diff --git a/polyp/module-sine.c b/src/modules/module-sine.c
index 529c061a..446e3974 100644
--- a/polyp/module-sine.c
+++ b/src/modules/module-sine.c
@@ -27,12 +27,13 @@
#include <assert.h>
#include <math.h>
-#include "sink-input.h"
-#include "module.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "namereg.h"
-#include "log.h"
+#include <polypcore/sink-input.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/namereg.h>
+#include <polypcore/log.h>
+
#include "module-sine-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-solaris.c b/src/modules/module-solaris.c
index f85e71df..e0745fc0 100644
--- a/polyp/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -40,16 +40,18 @@
#include <sys/conf.h>
#include <sys/audio.h>
-#include "iochannel.h"
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "sample-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "mainloop-signal.h"
+#include <polyp/mainloop-signal.h>
+
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
#include "module-solaris-symdef.h"
PA_MODULE_AUTHOR("Pierre Ossman")
diff --git a/polyp/module-tunnel.c b/src/modules/module-tunnel.c
index c088dae0..5ee10fda 100644
--- a/polyp/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -31,20 +31,20 @@
#include <stdio.h>
#include <stdlib.h>
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
-#include "subscribe.h"
-#include "xmalloc.h"
-#include "sink-input.h"
-#include "pdispatch.h"
-#include "pstream.h"
-#include "pstream-util.h"
-#include "authkey.h"
-#include "socket-client.h"
-#include "socket-util.h"
-#include "authkey-prop.h"
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+#include <polypcore/subscribe.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/pstream.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/authkey.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/socket-util.h>
+#include <polypcore/authkey-prop.h>
#ifdef TUNNEL_SINK
#include "module-tunnel-sink-symdef.h"
diff --git a/polyp/module-waveout.c b/src/modules/module-waveout.c
index e9d9f12e..8809c31d 100644
--- a/polyp/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -27,15 +27,17 @@
#include <mmsystem.h>
#include <assert.h>
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "mainloop-api.h"
-#include "modargs.h"
-#include "sample-util.h"
-#include "util.h"
-#include "log.h"
-#include "xmalloc.h"
+#include <polyp/mainloop-api.h>
+
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/xmalloc.h>
+
#include "module-waveout-symdef.h"
PA_MODULE_AUTHOR("Pierre Ossman")
diff --git a/polyp/module-x11-bell.c b/src/modules/module-x11-bell.c
index 4fc4a60d..d722b732 100644
--- a/polyp/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -31,14 +31,15 @@
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
-#include "module.h"
-#include "sink.h"
-#include "scache.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "namereg.h"
-#include "log.h"
-#include "x11wrap.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/scache.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/namereg.h>
+#include <polypcore/log.h>
+#include <polypcore/x11wrap.h>
+
#include "module-x11-bell-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/module-x11-publish.c b/src/modules/module-x11-publish.c
index 0116914f..dca5d049 100644
--- a/polyp/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -32,22 +32,23 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#include "module.h"
-#include "sink.h"
-#include "scache.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "namereg.h"
-#include "log.h"
-#include "x11wrap.h"
-#include "util.h"
-#include "native-common.h"
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/scache.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/namereg.h>
+#include <polypcore/log.h>
+#include <polypcore/x11wrap.h>
+#include <polypcore/util.h>
+#include <polypcore/native-common.h>
+#include <polypcore/authkey-prop.h>
+#include <polypcore/authkey.h>
+#include <polypcore/x11prop.h>
+#include <polypcore/strlist.h>
+#include <polypcore/props.h>
+
#include "module-x11-publish-symdef.h"
-#include "authkey-prop.h"
-#include "authkey.h"
-#include "x11prop.h"
-#include "strlist.h"
-#include "props.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("X11 Credential Publisher")
diff --git a/polyp/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index 7e0a2764..45d566ae 100644
--- a/polyp/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -29,19 +29,20 @@
#include <string.h>
#include <unistd.h>
+#include <polypcore/howl-wrap.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/autoload.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/native-common.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/subscribe.h>
+#include <polypcore/dynarray.h>
+#include <polypcore/endianmacros.h>
+#include <polypcore/modargs.h>
+
#include "module-zeroconf-publish-symdef.h"
-#include "howl-wrap.h"
-#include "xmalloc.h"
-#include "autoload.h"
-#include "sink.h"
-#include "source.h"
-#include "native-common.h"
-#include "util.h"
-#include "log.h"
-#include "subscribe.h"
-#include "dynarray.h"
-#include "endianmacros.h"
-#include "modargs.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Publisher")
diff --git a/polyp/cdecl.h b/src/polyp/cdecl.h
index d51ae026..d51ae026 100644
--- a/polyp/cdecl.h
+++ b/src/polyp/cdecl.h
diff --git a/polyp/channelmap.c b/src/polyp/channelmap.c
index 7bfd21e6..7bfd21e6 100644
--- a/polyp/channelmap.c
+++ b/src/polyp/channelmap.c
diff --git a/polyp/channelmap.h b/src/polyp/channelmap.h
index 0b9f6e26..0b9f6e26 100644
--- a/polyp/channelmap.h
+++ b/src/polyp/channelmap.h
diff --git a/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c
index 4fd75744..83d0bd2e 100644
--- a/polyp/client-conf-x11.c
+++ b/src/polyp/client-conf-x11.c
@@ -30,10 +30,10 @@
#include <X11/Xatom.h>
#include "client-conf-x11.h"
-#include "x11prop.h"
-#include "log.h"
-#include "xmalloc.h"
-#include "util.h"
+#include <polypcore/x11prop.h>
+#include <polypcore/log.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
Display *d = NULL;
diff --git a/polyp/client-conf-x11.h b/src/polyp/client-conf-x11.h
index 64459224..80841171 100644
--- a/polyp/client-conf-x11.h
+++ b/src/polyp/client-conf-x11.h
@@ -22,7 +22,7 @@
USA.
***/
-#include "client-conf.h"
+#include <polyp/client-conf.h>
/* Load client configuration data from the specified X11 display,
* overwriting the current settings in *c */
diff --git a/polyp/client-conf.c b/src/polyp/client-conf.c
index bcd4275d..2df201ce 100644
--- a/polyp/client-conf.c
+++ b/src/polyp/client-conf.c
@@ -29,12 +29,13 @@
#include <errno.h>
#include <string.h>
-#include "client-conf.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "conf-parser.h"
-#include "util.h"
-#include "authkey.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/conf-parser.h>
+#include <polypcore/util.h>
+#include <polypcore/authkey.h>
+
+#include <polyp/client-conf.h>
#ifndef DEFAULT_CONFIG_DIR
# ifndef OS_IS_WIN32
diff --git a/polyp/client-conf.h b/src/polyp/client-conf.h
index 7ca2f233..2d8a019f 100644
--- a/polyp/client-conf.h
+++ b/src/polyp/client-conf.h
@@ -22,7 +22,7 @@
USA.
***/
-#include "native-common.h"
+#include "../polypcore/native-common.h"
/* A structure containing configuration data for polypaudio clients. */
diff --git a/polyp/glib-mainloop.c b/src/polyp/glib-mainloop.c
index 6f7c1dc5..962eb574 100644
--- a/polyp/glib-mainloop.c
+++ b/src/polyp/glib-mainloop.c
@@ -25,11 +25,11 @@
#include <assert.h>
-#include "glib-mainloop.h"
-#include "idxset.h"
-#include "xmalloc.h"
+#include <polyp/glib-mainloop.h>
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
#include "glib.h"
-#include "util.h"
+#include <polypcore/util.h>
struct pa_io_event {
pa_glib_mainloop *mainloop;
diff --git a/polyp/glib-mainloop.h b/src/polyp/glib-mainloop.h
index d3e98597..b4815ed9 100644
--- a/polyp/glib-mainloop.h
+++ b/src/polyp/glib-mainloop.h
@@ -24,8 +24,8 @@
#include <glib.h>
-#include "mainloop-api.h"
-#include "cdecl.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/cdecl.h>
/** \file
* GLIB main loop support */
diff --git a/polyp/glib12-mainloop.c b/src/polyp/glib12-mainloop.c
index 8bc4483b..80a02b1c 100644
--- a/polyp/glib12-mainloop.c
+++ b/src/polyp/glib12-mainloop.c
@@ -25,10 +25,10 @@
#include <assert.h>
-#include "glib-mainloop.h"
-#include "idxset.h"
-#include "xmalloc.h"
-#include "util.h"
+#include <polyp/glib-mainloop.h>
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
/* A mainloop implementation based on GLIB 1.2 */
diff --git a/polyp/mainloop-api.c b/src/polyp/mainloop-api.c
index 3229ec20..a3eaee9c 100644
--- a/polyp/mainloop-api.c
+++ b/src/polyp/mainloop-api.c
@@ -27,8 +27,8 @@
#include <stdlib.h>
#include "mainloop-api.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
struct once_info {
void (*callback)(pa_mainloop_api*m, void *userdata);
diff --git a/polyp/mainloop-api.h b/src/polyp/mainloop-api.h
index 91ee4111..91ee4111 100644
--- a/polyp/mainloop-api.h
+++ b/src/polyp/mainloop-api.h
diff --git a/polyp/mainloop-signal.c b/src/polyp/mainloop-signal.c
index 76936031..a03c9159 100644
--- a/polyp/mainloop-signal.c
+++ b/src/polyp/mainloop-signal.c
@@ -36,11 +36,11 @@
#include <windows.h>
#endif
-#include "mainloop-signal.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "gccmacro.h"
+#include <polyp/mainloop-signal.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/gccmacro.h>
struct pa_signal_event {
int sig;
diff --git a/polyp/mainloop-signal.h b/src/polyp/mainloop-signal.h
index 6ce31370..76065b22 100644
--- a/polyp/mainloop-signal.h
+++ b/src/polyp/mainloop-signal.h
@@ -22,8 +22,8 @@
USA.
***/
-#include "mainloop-api.h"
-#include "cdecl.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/cdecl.h>
PA_C_DECL_BEGIN
diff --git a/polyp/mainloop.c b/src/polyp/mainloop.c
index d25af78a..3fa9245c 100644
--- a/polyp/mainloop.c
+++ b/src/polyp/mainloop.c
@@ -38,13 +38,13 @@
#include "poll.h"
#endif
-#include "winsock.h"
+#include <polypcore/winsock.h>
#include "mainloop.h"
-#include "util.h"
-#include "idxset.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/util.h>
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
struct pa_io_event {
pa_mainloop *mainloop;
diff --git a/polyp/mainloop.h b/src/polyp/mainloop.h
index 921a0709..691f8c50 100644
--- a/polyp/mainloop.h
+++ b/src/polyp/mainloop.h
@@ -22,8 +22,8 @@
USA.
***/
-#include "mainloop-api.h"
-#include "cdecl.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/cdecl.h>
PA_C_DECL_BEGIN
diff --git a/polyp/polyplib-browser.c b/src/polyp/polyplib-browser.c
index 6fee84a4..9a389484 100644
--- a/polyp/polyplib-browser.c
+++ b/src/polyp/polyplib-browser.c
@@ -23,9 +23,9 @@
#include <howl.h>
#include "polyplib-browser.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "util.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
#define SERVICE_NAME_SINK "_polypaudio-sink._tcp."
#define SERVICE_NAME_SOURCE "_polypaudio-source._tcp."
diff --git a/polyp/polyplib-browser.h b/src/polyp/polyplib-browser.h
index 853304d7..853304d7 100644
--- a/polyp/polyplib-browser.h
+++ b/src/polyp/polyplib-browser.h
diff --git a/polyp/polyplib-context.c b/src/polyp/polyplib-context.c
index 15f2e4cd..c392f0fc 100644
--- a/polyp/polyplib-context.c
+++ b/src/polyp/polyplib-context.c
@@ -45,22 +45,22 @@
#include <netdb.h>
#endif
-#include "winsock.h"
+#include <polypcore/winsock.h>
#include "polyplib-internal.h"
#include "polyplib-context.h"
#include "polyplib-version.h"
-#include "native-common.h"
-#include "pdispatch.h"
-#include "pstream.h"
-#include "dynarray.h"
-#include "socket-client.h"
-#include "pstream-util.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "client-conf.h"
-#include "socket-util.h"
+#include <polypcore/native-common.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/pstream.h>
+#include <polypcore/dynarray.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polyp/client-conf.h>
+#include <polypcore/socket-util.h>
#ifdef HAVE_X11
#include "client-conf-x11.h"
diff --git a/polyp/polyplib-context.h b/src/polyp/polyplib-context.h
index febb75f4..febb75f4 100644
--- a/polyp/polyplib-context.h
+++ b/src/polyp/polyplib-context.h
diff --git a/polyp/polyplib-def.h b/src/polyp/polyplib-def.h
index 0591ce6c..0591ce6c 100644
--- a/polyp/polyplib-def.h
+++ b/src/polyp/polyplib-def.h
diff --git a/polyp/polyplib-error.c b/src/polyp/polyplib-error.c
index 50a67270..188d6a93 100644
--- a/polyp/polyplib-error.c
+++ b/src/polyp/polyplib-error.c
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include "polyplib-error.h"
-#include "native-common.h"
+#include <polypcore/native-common.h>
static const char* const errortab[PA_ERROR_MAX] = {
[PA_ERROR_OK] = "OK",
diff --git a/polyp/polyplib-error.h b/src/polyp/polyplib-error.h
index dbbbf006..1bb97822 100644
--- a/polyp/polyplib-error.h
+++ b/src/polyp/polyplib-error.h
@@ -23,7 +23,7 @@
***/
#include <inttypes.h>
-#include "cdecl.h"
+#include <polyp/cdecl.h>
/** \file
* Error management */
diff --git a/polyp/polyplib-internal.h b/src/polyp/polyplib-internal.h
index 29596069..b95a20f3 100644
--- a/polyp/polyplib-internal.h
+++ b/src/polyp/polyplib-internal.h
@@ -22,20 +22,20 @@
USA.
***/
-#include "mainloop-api.h"
-#include "socket-client.h"
-#include "pstream.h"
-#include "pdispatch.h"
-#include "dynarray.h"
+#include <polyp/mainloop-api.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/pstream.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/dynarray.h>
#include "polyplib-context.h"
#include "polyplib-stream.h"
#include "polyplib-operation.h"
-#include "llist.h"
-#include "native-common.h"
-#include "client-conf.h"
-#include "strlist.h"
-#include "mcalign.h"
+#include <polypcore/llist.h>
+#include <polypcore/native-common.h>
+#include <polyp/client-conf.h>
+#include <polypcore/strlist.h>
+#include <polypcore/mcalign.h>
#define DEFAULT_TIMEOUT (10)
diff --git a/polyp/polyplib-introspect.c b/src/polyp/polyplib-introspect.c
index 49298a96..0bdffa35 100644
--- a/polyp/polyplib-introspect.c
+++ b/src/polyp/polyplib-introspect.c
@@ -28,8 +28,8 @@
#include "polyplib-introspect.h"
#include "polyplib-context.h"
#include "polyplib-internal.h"
-#include "pstream-util.h"
-#include "gccmacro.h"
+#include <polypcore/pstream-util.h>
+#include <polypcore/gccmacro.h>
/*** Statistics ***/
diff --git a/polyp/polyplib-introspect.h b/src/polyp/polyplib-introspect.h
index d3489908..d3489908 100644
--- a/polyp/polyplib-introspect.h
+++ b/src/polyp/polyplib-introspect.h
diff --git a/polyp/polyplib-operation.c b/src/polyp/polyplib-operation.c
index 68bc8c6a..ea336c17 100644
--- a/polyp/polyplib-operation.c
+++ b/src/polyp/polyplib-operation.c
@@ -25,7 +25,7 @@
#include <assert.h>
-#include "xmalloc.h"
+#include <polypcore/xmalloc.h>
#include "polyplib-internal.h"
#include "polyplib-operation.h"
diff --git a/polyp/polyplib-operation.h b/src/polyp/polyplib-operation.h
index cac03e30..cac03e30 100644
--- a/polyp/polyplib-operation.h
+++ b/src/polyp/polyplib-operation.h
diff --git a/polyp/polyplib-scache.c b/src/polyp/polyplib-scache.c
index 01c64828..1315af97 100644
--- a/polyp/polyplib-scache.c
+++ b/src/polyp/polyplib-scache.c
@@ -30,7 +30,7 @@
#include "polyplib-scache.h"
#include "polyplib-internal.h"
-#include "pstream-util.h"
+#include <polypcore/pstream-util.h>
void pa_stream_connect_upload(pa_stream *s, size_t length) {
pa_tagstruct *t;
diff --git a/polyp/polyplib-scache.h b/src/polyp/polyplib-scache.h
index 89d27597..89d27597 100644
--- a/polyp/polyplib-scache.h
+++ b/src/polyp/polyplib-scache.h
diff --git a/polyp/polyplib-simple.c b/src/polyp/polyplib-simple.c
index e5512152..7436f007 100644
--- a/polyp/polyplib-simple.c
+++ b/src/polyp/polyplib-simple.c
@@ -31,9 +31,9 @@
#include "polyplib-simple.h"
#include "polyplib.h"
#include "mainloop.h"
-#include "native-common.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/native-common.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
struct pa_simple {
pa_mainloop *mainloop;
diff --git a/polyp/polyplib-simple.h b/src/polyp/polyplib-simple.h
index 0c80f460..b01f30d5 100644
--- a/polyp/polyplib-simple.h
+++ b/src/polyp/polyplib-simple.h
@@ -26,7 +26,7 @@
#include "sample.h"
#include "polyplib-def.h"
-#include "cdecl.h"
+#include <polyp/cdecl.h>
/** \file
* A simple but limited synchronous playback and recording
diff --git a/polyp/polyplib-stream.c b/src/polyp/polyplib-stream.c
index 7b9d6863..63c9245b 100644
--- a/polyp/polyplib-stream.c
+++ b/src/polyp/polyplib-stream.c
@@ -29,10 +29,10 @@
#include <string.h>
#include "polyplib-internal.h"
-#include "xmalloc.h"
-#include "pstream-util.h"
-#include "util.h"
-#include "log.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
#define LATENCY_IPOL_INTERVAL_USEC (10000L)
diff --git a/polyp/polyplib-stream.h b/src/polyp/polyplib-stream.h
index bc828b71..bc828b71 100644
--- a/polyp/polyplib-stream.h
+++ b/src/polyp/polyplib-stream.h
diff --git a/polyp/polyplib-subscribe.c b/src/polyp/polyplib-subscribe.c
index ef90ab0b..13fcfb42 100644
--- a/polyp/polyplib-subscribe.c
+++ b/src/polyp/polyplib-subscribe.c
@@ -28,8 +28,8 @@
#include "polyplib-subscribe.h"
#include "polyplib-internal.h"
-#include "pstream-util.h"
-#include "gccmacro.h"
+#include <polypcore/pstream-util.h>
+#include <polypcore/gccmacro.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/polyp/polyplib-subscribe.h b/src/polyp/polyplib-subscribe.h
index 920c9853..920c9853 100644
--- a/polyp/polyplib-subscribe.h
+++ b/src/polyp/polyplib-subscribe.h
diff --git a/polyp/polyplib-version.h.in b/src/polyp/polyplib-version.h.in
index 89e0a0e5..89e0a0e5 100644
--- a/polyp/polyplib-version.h.in
+++ b/src/polyp/polyplib-version.h.in
diff --git a/polyp/polyplib.h b/src/polyp/polyplib.h
index b9b9b447..b9b9b447 100644
--- a/polyp/polyplib.h
+++ b/src/polyp/polyplib.h
diff --git a/polyp/sample.c b/src/polyp/sample.c
index d587170c..d587170c 100644
--- a/polyp/sample.c
+++ b/src/polyp/sample.c
diff --git a/polyp/sample.h b/src/polyp/sample.h
index c1b98f1c..c1b98f1c 100644
--- a/polyp/sample.h
+++ b/src/polyp/sample.h
diff --git a/polyp/volume.c b/src/polyp/volume.c
index 0f153141..0f153141 100644
--- a/polyp/volume.c
+++ b/src/polyp/volume.c
diff --git a/polyp/volume.h b/src/polyp/volume.h
index b2a48084..b2a48084 100644
--- a/polyp/volume.h
+++ b/src/polyp/volume.h
diff --git a/polyp/alsa-util.c b/src/polypcore/alsa-util.c
index cc65b8de..7528ee0b 100644
--- a/polyp/alsa-util.c
+++ b/src/polypcore/alsa-util.c
@@ -27,7 +27,7 @@
#include <asoundlib.h>
#include "alsa-util.h"
-#include "sample.h"
+#include <polyp/sample.h>
#include "xmalloc.h"
#include "log.h"
diff --git a/polyp/alsa-util.h b/src/polypcore/alsa-util.h
index d180db3e..5d6d6634 100644
--- a/polyp/alsa-util.h
+++ b/src/polypcore/alsa-util.h
@@ -24,8 +24,8 @@
#include <asoundlib.h>
-#include "sample.h"
-#include "mainloop-api.h"
+#include <polyp/sample.h>
+#include <polyp/mainloop-api.h>
int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, const pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size);
diff --git a/polyp/authkey-prop.c b/src/polypcore/authkey-prop.c
index 8657f5a5..8657f5a5 100644
--- a/polyp/authkey-prop.c
+++ b/src/polypcore/authkey-prop.c
diff --git a/polyp/authkey-prop.h b/src/polypcore/authkey-prop.h
index 29b40bb2..29b40bb2 100644
--- a/polyp/authkey-prop.h
+++ b/src/polypcore/authkey-prop.h
diff --git a/polyp/authkey.c b/src/polypcore/authkey.c
index 969f09d9..969f09d9 100644
--- a/polyp/authkey.c
+++ b/src/polypcore/authkey.c
diff --git a/polyp/authkey.h b/src/polypcore/authkey.h
index 81b1a578..81b1a578 100644
--- a/polyp/authkey.h
+++ b/src/polypcore/authkey.h
diff --git a/polyp/autoload.c b/src/polypcore/autoload.c
index ff2916cb..ff2916cb 100644
--- a/polyp/autoload.c
+++ b/src/polypcore/autoload.c
diff --git a/polyp/autoload.h b/src/polypcore/autoload.h
index 7350c16a..7350c16a 100644
--- a/polyp/autoload.h
+++ b/src/polypcore/autoload.h
diff --git a/polyp/cli-command.c b/src/polypcore/cli-command.c
index f6192bf8..f6192bf8 100644
--- a/polyp/cli-command.c
+++ b/src/polypcore/cli-command.c
diff --git a/polyp/cli-command.h b/src/polypcore/cli-command.h
index 78b8d5c6..78b8d5c6 100644
--- a/polyp/cli-command.h
+++ b/src/polypcore/cli-command.h
diff --git a/polyp/cli-text.c b/src/polypcore/cli-text.c
index 328aca4c..58248d8e 100644
--- a/polyp/cli-text.c
+++ b/src/polypcore/cli-text.c
@@ -38,7 +38,7 @@
#include "scache.h"
#include "autoload.h"
#include "xmalloc.h"
-#include "volume.h"
+#include <polyp/volume.h>
char *pa_module_list_to_string(pa_core *c) {
pa_strbuf *s;
diff --git a/polyp/cli-text.h b/src/polypcore/cli-text.h
index 7a1a0361..7a1a0361 100644
--- a/polyp/cli-text.h
+++ b/src/polypcore/cli-text.h
diff --git a/polyp/cli.c b/src/polypcore/cli.c
index bc0c285d..bc0c285d 100644
--- a/polyp/cli.c
+++ b/src/polypcore/cli.c
diff --git a/polyp/cli.h b/src/polypcore/cli.h
index 03f31c22..03f31c22 100644
--- a/polyp/cli.h
+++ b/src/polypcore/cli.h
diff --git a/polyp/client.c b/src/polypcore/client.c
index 3c2084bf..3c2084bf 100644
--- a/polyp/client.c
+++ b/src/polypcore/client.c
diff --git a/polyp/client.h b/src/polypcore/client.h
index 92430338..92430338 100644
--- a/polyp/client.h
+++ b/src/polypcore/client.h
diff --git a/polyp/conf-parser.c b/src/polypcore/conf-parser.c
index 507f2bf1..507f2bf1 100644
--- a/polyp/conf-parser.c
+++ b/src/polypcore/conf-parser.c
diff --git a/polyp/conf-parser.h b/src/polypcore/conf-parser.h
index 2dca3bce..2dca3bce 100644
--- a/polyp/conf-parser.h
+++ b/src/polypcore/conf-parser.h
diff --git a/polyp/core.c b/src/polypcore/core.c
index 678e8212..678e8212 100644
--- a/polyp/core.c
+++ b/src/polypcore/core.c
diff --git a/polyp/core.h b/src/polypcore/core.h
index 9241fcd8..f7a90169 100644
--- a/polyp/core.h
+++ b/src/polypcore/core.h
@@ -26,8 +26,8 @@ typedef struct pa_core pa_core;
#include "idxset.h"
#include "hashmap.h"
-#include "mainloop-api.h"
-#include "sample.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/sample.h>
#include "memblock.h"
#include "resampler.h"
#include "queue.h"
diff --git a/polyp/dllmain.c b/src/polypcore/dllmain.c
index d1d120ab..d1d120ab 100644
--- a/polyp/dllmain.c
+++ b/src/polypcore/dllmain.c
diff --git a/polyp/dynarray.c b/src/polypcore/dynarray.c
index 435fd768..435fd768 100644
--- a/polyp/dynarray.c
+++ b/src/polypcore/dynarray.c
diff --git a/polyp/dynarray.h b/src/polypcore/dynarray.h
index 9b1601ba..9b1601ba 100644
--- a/polyp/dynarray.h
+++ b/src/polypcore/dynarray.h
diff --git a/polyp/endianmacros.h b/src/polypcore/endianmacros.h
index 3ab1826a..3ab1826a 100644
--- a/polyp/endianmacros.h
+++ b/src/polypcore/endianmacros.h
diff --git a/polyp/esound.h b/src/polypcore/esound.h
index 9c507ef9..9c507ef9 100644
--- a/polyp/esound.h
+++ b/src/polypcore/esound.h
diff --git a/polyp/g711.c b/src/polypcore/g711.c
index 55a82396..55a82396 100644
--- a/polyp/g711.c
+++ b/src/polypcore/g711.c
diff --git a/polyp/g711.h b/src/polypcore/g711.h
index 97cedf81..97cedf81 100644
--- a/polyp/g711.h
+++ b/src/polypcore/g711.h
diff --git a/polyp/gccmacro.h b/src/polypcore/gccmacro.h
index 9e212f2e..9e212f2e 100644
--- a/polyp/gccmacro.h
+++ b/src/polypcore/gccmacro.h
diff --git a/polyp/hashmap.c b/src/polypcore/hashmap.c
index a37decb8..a37decb8 100644
--- a/polyp/hashmap.c
+++ b/src/polypcore/hashmap.c
diff --git a/polyp/hashmap.h b/src/polypcore/hashmap.h
index 14f82705..14f82705 100644
--- a/polyp/hashmap.h
+++ b/src/polypcore/hashmap.h
diff --git a/polyp/howl-wrap.c b/src/polypcore/howl-wrap.c
index 77d096ac..77d096ac 100644
--- a/polyp/howl-wrap.c
+++ b/src/polypcore/howl-wrap.c
diff --git a/polyp/howl-wrap.h b/src/polypcore/howl-wrap.h
index a670b082..a670b082 100644
--- a/polyp/howl-wrap.h
+++ b/src/polypcore/howl-wrap.h
diff --git a/polyp/idxset.c b/src/polypcore/idxset.c
index 409d1fab..409d1fab 100644
--- a/polyp/idxset.c
+++ b/src/polypcore/idxset.c
diff --git a/polyp/idxset.h b/src/polypcore/idxset.h
index 17ae16cb..17ae16cb 100644
--- a/polyp/idxset.h
+++ b/src/polypcore/idxset.h
diff --git a/polyp/inet_ntop.c b/src/polypcore/inet_ntop.c
index a25c3c95..a25c3c95 100644
--- a/polyp/inet_ntop.c
+++ b/src/polypcore/inet_ntop.c
diff --git a/polyp/inet_ntop.h b/src/polypcore/inet_ntop.h
index 7fb67b44..7fb67b44 100644
--- a/polyp/inet_ntop.h
+++ b/src/polypcore/inet_ntop.h
diff --git a/polyp/iochannel.c b/src/polypcore/iochannel.c
index 273d47e0..273d47e0 100644
--- a/polyp/iochannel.c
+++ b/src/polypcore/iochannel.c
diff --git a/polyp/iochannel.h b/src/polypcore/iochannel.h
index e2b8bccf..7d355d8f 100644
--- a/polyp/iochannel.h
+++ b/src/polypcore/iochannel.h
@@ -23,7 +23,7 @@
***/
#include <sys/types.h>
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
/* A wrapper around UNIX file descriptors for attaching them to the a
main event loop. Everytime new data may be read or be written to
diff --git a/polyp/ioline.c b/src/polypcore/ioline.c
index 5b669f5c..5b669f5c 100644
--- a/polyp/ioline.c
+++ b/src/polypcore/ioline.c
diff --git a/polyp/ioline.h b/src/polypcore/ioline.h
index 84ccb47a..84ccb47a 100644
--- a/polyp/ioline.h
+++ b/src/polypcore/ioline.h
diff --git a/polyp/llist.h b/src/polypcore/llist.h
index eb8cd017..eb8cd017 100644
--- a/polyp/llist.h
+++ b/src/polypcore/llist.h
diff --git a/polyp/log.c b/src/polypcore/log.c
index 97406f79..97406f79 100644
--- a/polyp/log.c
+++ b/src/polypcore/log.c
diff --git a/polyp/log.h b/src/polypcore/log.h
index ce8aea98..ce8aea98 100644
--- a/polyp/log.h
+++ b/src/polypcore/log.h
diff --git a/polyp/mcalign.c b/src/polypcore/mcalign.c
index 4d765625..4d765625 100644
--- a/polyp/mcalign.c
+++ b/src/polypcore/mcalign.c
diff --git a/polyp/mcalign.h b/src/polypcore/mcalign.h
index 5de75bc7..5de75bc7 100644
--- a/polyp/mcalign.h
+++ b/src/polypcore/mcalign.h
diff --git a/polyp/memblock.c b/src/polypcore/memblock.c
index 8da53525..8da53525 100644
--- a/polyp/memblock.c
+++ b/src/polypcore/memblock.c
diff --git a/polyp/memblock.h b/src/polypcore/memblock.h
index c5751406..c5751406 100644
--- a/polyp/memblock.h
+++ b/src/polypcore/memblock.h
diff --git a/polyp/memblockq.c b/src/polypcore/memblockq.c
index ba6b76ea..ba6b76ea 100644
--- a/polyp/memblockq.c
+++ b/src/polypcore/memblockq.c
diff --git a/polyp/memblockq.h b/src/polypcore/memblockq.h
index 1695daba..1695daba 100644
--- a/polyp/memblockq.h
+++ b/src/polypcore/memblockq.h
diff --git a/polyp/memchunk.c b/src/polypcore/memchunk.c
index bfd74f9e..bfd74f9e 100644
--- a/polyp/memchunk.c
+++ b/src/polypcore/memchunk.c
diff --git a/polyp/memchunk.h b/src/polypcore/memchunk.h
index 4eefc8c1..4eefc8c1 100644
--- a/polyp/memchunk.h
+++ b/src/polypcore/memchunk.h
diff --git a/polyp/modargs.c b/src/polypcore/modargs.c
index 07062946..07062946 100644
--- a/polyp/modargs.c
+++ b/src/polypcore/modargs.c
diff --git a/polyp/modargs.h b/src/polypcore/modargs.h
index 56605379..678ea1a7 100644
--- a/polyp/modargs.h
+++ b/src/polypcore/modargs.h
@@ -23,7 +23,7 @@
***/
#include <inttypes.h>
-#include "sample.h"
+#include <polyp/sample.h>
#include "core.h"
typedef struct pa_modargs pa_modargs;
diff --git a/polyp/modinfo.c b/src/polypcore/modinfo.c
index 53440612..53440612 100644
--- a/polyp/modinfo.c
+++ b/src/polypcore/modinfo.c
diff --git a/polyp/modinfo.h b/src/polypcore/modinfo.h
index 53176147..53176147 100644
--- a/polyp/modinfo.h
+++ b/src/polypcore/modinfo.h
diff --git a/polyp/module.c b/src/polypcore/module.c
index 499ea299..499ea299 100644
--- a/polyp/module.c
+++ b/src/polypcore/module.c
diff --git a/polyp/module.h b/src/polypcore/module.h
index 6f137c15..6f137c15 100644
--- a/polyp/module.h
+++ b/src/polypcore/module.h
diff --git a/polyp/namereg.c b/src/polypcore/namereg.c
index 07fb485c..07fb485c 100644
--- a/polyp/namereg.c
+++ b/src/polypcore/namereg.c
diff --git a/polyp/namereg.h b/src/polypcore/namereg.h
index 961fd44b..961fd44b 100644
--- a/polyp/namereg.h
+++ b/src/polypcore/namereg.h
diff --git a/polyp/native-common.h b/src/polypcore/native-common.h
index 569f3b71..78ae721e 100644
--- a/polyp/native-common.h
+++ b/src/polypcore/native-common.h
@@ -22,8 +22,8 @@
USA.
***/
-#include "cdecl.h"
-#include "polyplib-def.h"
+#include <polyp/cdecl.h>
+#include <polyp/polyplib-def.h>
PA_C_DECL_BEGIN
diff --git a/polyp/oss-util.c b/src/polypcore/oss-util.c
index ae6772fd..ae6772fd 100644
--- a/polyp/oss-util.c
+++ b/src/polypcore/oss-util.c
diff --git a/polyp/oss-util.h b/src/polypcore/oss-util.h
index 3ee51cc5..6b2746cc 100644
--- a/polyp/oss-util.h
+++ b/src/polypcore/oss-util.h
@@ -22,7 +22,7 @@
USA.
***/
-#include "sample.h"
+#include <polyp/sample.h>
int pa_oss_open(const char *device, int *mode, int* pcaps);
int pa_oss_auto_format(int fd, pa_sample_spec *ss);
diff --git a/polyp/packet.c b/src/polypcore/packet.c
index b3a2e074..b3a2e074 100644
--- a/polyp/packet.c
+++ b/src/polypcore/packet.c
diff --git a/polyp/packet.h b/src/polypcore/packet.h
index 0ac47485..0ac47485 100644
--- a/polyp/packet.h
+++ b/src/polypcore/packet.h
diff --git a/polyp/parseaddr.c b/src/polypcore/parseaddr.c
index 5e4c689c..5e4c689c 100644
--- a/polyp/parseaddr.c
+++ b/src/polypcore/parseaddr.c
diff --git a/polyp/parseaddr.h b/src/polypcore/parseaddr.h
index eff9dd3b..eff9dd3b 100644
--- a/polyp/parseaddr.h
+++ b/src/polypcore/parseaddr.h
diff --git a/polyp/pdispatch.c b/src/polypcore/pdispatch.c
index 5a50a0d5..5a50a0d5 100644
--- a/polyp/pdispatch.c
+++ b/src/polypcore/pdispatch.c
diff --git a/polyp/pdispatch.h b/src/polypcore/pdispatch.h
index 40f5d4c4..fdd4d7f5 100644
--- a/polyp/pdispatch.h
+++ b/src/polypcore/pdispatch.h
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include "tagstruct.h"
#include "packet.h"
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
typedef struct pa_pdispatch pa_pdispatch;
diff --git a/polyp/pid.c b/src/polypcore/pid.c
index ae3dc7f5..ae3dc7f5 100644
--- a/polyp/pid.c
+++ b/src/polypcore/pid.c
diff --git a/polyp/pid.h b/src/polypcore/pid.h
index 906ab6da..906ab6da 100644
--- a/polyp/pid.h
+++ b/src/polypcore/pid.h
diff --git a/polyp/play-memchunk.c b/src/polypcore/play-memchunk.c
index e24d4427..e24d4427 100644
--- a/polyp/play-memchunk.c
+++ b/src/polypcore/play-memchunk.c
diff --git a/polyp/play-memchunk.h b/src/polypcore/play-memchunk.h
index fc0654a6..fc0654a6 100644
--- a/polyp/play-memchunk.h
+++ b/src/polypcore/play-memchunk.h
diff --git a/polyp/poll.c b/src/polypcore/poll.c
index 193fc812..193fc812 100644
--- a/polyp/poll.c
+++ b/src/polypcore/poll.c
diff --git a/polyp/poll.h b/src/polypcore/poll.h
index c201014e..c201014e 100644
--- a/polyp/poll.h
+++ b/src/polypcore/poll.h
diff --git a/polyp/props.c b/src/polypcore/props.c
index df748c1e..df748c1e 100644
--- a/polyp/props.c
+++ b/src/polypcore/props.c
diff --git a/polyp/props.h b/src/polypcore/props.h
index 5abf8787..5abf8787 100644
--- a/polyp/props.h
+++ b/src/polypcore/props.h
diff --git a/polyp/protocol-cli.c b/src/polypcore/protocol-cli.c
index d2d73550..d2d73550 100644
--- a/polyp/protocol-cli.c
+++ b/src/polypcore/protocol-cli.c
diff --git a/polyp/protocol-cli.h b/src/polypcore/protocol-cli.h
index aed733c1..aed733c1 100644
--- a/polyp/protocol-cli.h
+++ b/src/polypcore/protocol-cli.h
diff --git a/polyp/protocol-esound.c b/src/polypcore/protocol-esound.c
index 6f004e16..14f237c7 100644
--- a/polyp/protocol-esound.c
+++ b/src/polypcore/protocol-esound.c
@@ -38,7 +38,7 @@
#include "sink.h"
#include "source-output.h"
#include "source.h"
-#include "sample.h"
+#include <polyp/sample.h>
#include "scache.h"
#include "sample-util.h"
#include "authkey.h"
diff --git a/polyp/protocol-esound.h b/src/polypcore/protocol-esound.h
index 71d58464..71d58464 100644
--- a/polyp/protocol-esound.h
+++ b/src/polypcore/protocol-esound.h
diff --git a/polyp/protocol-http.c b/src/polypcore/protocol-http.c
index 3e55df03..3e55df03 100644
--- a/polyp/protocol-http.c
+++ b/src/polypcore/protocol-http.c
diff --git a/polyp/protocol-http.h b/src/polypcore/protocol-http.h
index 0a1855e9..0a1855e9 100644
--- a/polyp/protocol-http.h
+++ b/src/polypcore/protocol-http.h
diff --git a/polyp/protocol-native.c b/src/polypcore/protocol-native.c
index b94903d9..b94903d9 100644
--- a/polyp/protocol-native.c
+++ b/src/polypcore/protocol-native.c
diff --git a/polyp/protocol-native.h b/src/polypcore/protocol-native.h
index 12e85d0b..12e85d0b 100644
--- a/polyp/protocol-native.h
+++ b/src/polypcore/protocol-native.h
diff --git a/polyp/protocol-simple.c b/src/polypcore/protocol-simple.c
index 113919b3..113919b3 100644
--- a/polyp/protocol-simple.c
+++ b/src/polypcore/protocol-simple.c
diff --git a/polyp/protocol-simple.h b/src/polypcore/protocol-simple.h
index 63455a53..63455a53 100644
--- a/polyp/protocol-simple.h
+++ b/src/polypcore/protocol-simple.h
diff --git a/polyp/pstream-util.c b/src/polypcore/pstream-util.c
index ecd63d15..ecd63d15 100644
--- a/polyp/pstream-util.c
+++ b/src/polypcore/pstream-util.c
diff --git a/polyp/pstream-util.h b/src/polypcore/pstream-util.h
index 601a9e99..601a9e99 100644
--- a/polyp/pstream-util.h
+++ b/src/polypcore/pstream-util.h
diff --git a/polyp/pstream.c b/src/polypcore/pstream.c
index bd00ba4f..bd00ba4f 100644
--- a/polyp/pstream.c
+++ b/src/polypcore/pstream.c
diff --git a/polyp/pstream.h b/src/polypcore/pstream.h
index 77c92802..ec63a98e 100644
--- a/polyp/pstream.h
+++ b/src/polypcore/pstream.h
@@ -27,7 +27,7 @@
#include "packet.h"
#include "memblock.h"
#include "iochannel.h"
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
#include "memchunk.h"
typedef struct pa_pstream pa_pstream;
diff --git a/polyp/queue.c b/src/polypcore/queue.c
index 80ec0068..80ec0068 100644
--- a/polyp/queue.c
+++ b/src/polypcore/queue.c
diff --git a/polyp/queue.h b/src/polypcore/queue.h
index 3edcfb63..3edcfb63 100644
--- a/polyp/queue.h
+++ b/src/polypcore/queue.h
diff --git a/polyp/random.c b/src/polypcore/random.c
index 12f27bfd..12f27bfd 100644
--- a/polyp/random.c
+++ b/src/polypcore/random.c
diff --git a/polyp/random.h b/src/polypcore/random.h
index bfb3df08..bfb3df08 100644
--- a/polyp/random.h
+++ b/src/polypcore/random.h
diff --git a/polyp/resampler.c b/src/polypcore/resampler.c
index 0417e44e..0417e44e 100644
--- a/polyp/resampler.c
+++ b/src/polypcore/resampler.c
diff --git a/polyp/resampler.h b/src/polypcore/resampler.h
index e14942f3..cad48be5 100644
--- a/polyp/resampler.h
+++ b/src/polypcore/resampler.h
@@ -24,10 +24,10 @@
#include <samplerate.h>
-#include "sample.h"
+#include <polyp/sample.h>
#include "memblock.h"
#include "memchunk.h"
-#include "channelmap.h"
+#include <polyp/channelmap.h>
typedef struct pa_resampler pa_resampler;
diff --git a/polyp/sample-util.c b/src/polypcore/sample-util.c
index 52974c46..52974c46 100644
--- a/polyp/sample-util.c
+++ b/src/polypcore/sample-util.c
diff --git a/polyp/sample-util.h b/src/polypcore/sample-util.h
index e433f9c8..d0efbcc4 100644
--- a/polyp/sample-util.h
+++ b/src/polypcore/sample-util.h
@@ -22,10 +22,10 @@
USA.
***/
-#include "sample.h"
+#include <polyp/sample.h>
#include "memblock.h"
#include "memchunk.h"
-#include "volume.h"
+#include <polyp/volume.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);
diff --git a/polyp/scache.c b/src/polypcore/scache.c
index 39fa26f3..02c7d34f 100644
--- a/polyp/scache.c
+++ b/src/polypcore/scache.c
@@ -43,7 +43,7 @@
#include "scache.h"
#include "sink-input.h"
-#include "mainloop.h"
+#include <polyp/mainloop.h>
#include "sample-util.h"
#include "play-memchunk.h"
#include "xmalloc.h"
@@ -52,8 +52,8 @@
#include "sound-file.h"
#include "util.h"
#include "log.h"
-#include "channelmap.h"
-#include "volume.h"
+#include <polyp/channelmap.h>
+#include <polyp/volume.h>
#define UNLOAD_POLL_TIME 2
diff --git a/polyp/scache.h b/src/polypcore/scache.h
index d667ae60..d667ae60 100644
--- a/polyp/scache.h
+++ b/src/polypcore/scache.h
diff --git a/polyp/sconv-s16be.c b/src/polypcore/sconv-s16be.c
index 8b076f06..8b076f06 100644
--- a/polyp/sconv-s16be.c
+++ b/src/polypcore/sconv-s16be.c
diff --git a/polyp/sconv-s16be.h b/src/polypcore/sconv-s16be.h
index b2b6a8c7..b2b6a8c7 100644
--- a/polyp/sconv-s16be.h
+++ b/src/polypcore/sconv-s16be.h
diff --git a/polyp/sconv-s16le.c b/src/polypcore/sconv-s16le.c
index e47c5e8e..e47c5e8e 100644
--- a/polyp/sconv-s16le.c
+++ b/src/polypcore/sconv-s16le.c
diff --git a/polyp/sconv-s16le.h b/src/polypcore/sconv-s16le.h
index ef5e31e8..ef5e31e8 100644
--- a/polyp/sconv-s16le.h
+++ b/src/polypcore/sconv-s16le.h
diff --git a/polyp/sconv.c b/src/polypcore/sconv.c
index 1fcb5a0c..1fcb5a0c 100644
--- a/polyp/sconv.c
+++ b/src/polypcore/sconv.c
diff --git a/polyp/sconv.h b/src/polypcore/sconv.h
index 2a005219..a0c15c24 100644
--- a/polyp/sconv.h
+++ b/src/polypcore/sconv.h
@@ -22,7 +22,7 @@
USA.
***/
-#include "sample.h"
+#include <polyp/sample.h>
typedef void (*pa_convert_to_float32ne_func_t)(unsigned n, const void *a, float *b);
typedef void (*pa_convert_from_float32ne_func_t)(unsigned n, const float *a, void *b);
diff --git a/polyp/sink-input.c b/src/polypcore/sink-input.c
index f447b8cf..f447b8cf 100644
--- a/polyp/sink-input.c
+++ b/src/polypcore/sink-input.c
diff --git a/polyp/sink-input.h b/src/polypcore/sink-input.h
index 1db993f5..a5ad1958 100644
--- a/polyp/sink-input.h
+++ b/src/polypcore/sink-input.h
@@ -27,7 +27,7 @@
typedef struct pa_sink_input pa_sink_input;
#include "sink.h"
-#include "sample.h"
+#include <polyp/sample.h>
#include "memblockq.h"
#include "resampler.h"
#include "module.h"
diff --git a/polyp/sink.c b/src/polypcore/sink.c
index bb656649..411befe7 100644
--- a/polyp/sink.c
+++ b/src/polypcore/sink.c
@@ -36,7 +36,7 @@
#include "xmalloc.h"
#include "subscribe.h"
#include "log.h"
-#include "polyplib-introspect.h"
+#include <polyp/polyplib-introspect.h>
#define MAX_MIX_CHANNELS 32
diff --git a/polyp/sink.h b/src/polypcore/sink.h
index 33aba233..268461ef 100644
--- a/polyp/sink.h
+++ b/src/polypcore/sink.h
@@ -27,12 +27,12 @@
typedef struct pa_sink pa_sink;
#include "core.h"
-#include "sample.h"
+#include <polyp/sample.h>
#include "idxset.h"
#include "source.h"
-#include "channelmap.h"
+#include <polyp/channelmap.h>
#include "module.h"
-#include "volume.h"
+#include <polyp/volume.h>
#define PA_MAX_INPUTS_PER_SINK 6
diff --git a/polyp/sioman.c b/src/polypcore/sioman.c
index 8d7b136c..8d7b136c 100644
--- a/polyp/sioman.c
+++ b/src/polypcore/sioman.c
diff --git a/polyp/sioman.h b/src/polypcore/sioman.h
index 840d93f2..840d93f2 100644
--- a/polyp/sioman.h
+++ b/src/polypcore/sioman.h
diff --git a/polyp/socket-client.c b/src/polypcore/socket-client.c
index 29c9775e..29c9775e 100644
--- a/polyp/socket-client.c
+++ b/src/polypcore/socket-client.c
diff --git a/polyp/socket-client.h b/src/polypcore/socket-client.h
index 40e9629a..624880d7 100644
--- a/polyp/socket-client.h
+++ b/src/polypcore/socket-client.h
@@ -24,7 +24,7 @@
#include <inttypes.h>
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
#include "iochannel.h"
struct sockaddr;
diff --git a/polyp/socket-server.c b/src/polypcore/socket-server.c
index 262b32a7..262b32a7 100644
--- a/polyp/socket-server.c
+++ b/src/polypcore/socket-server.c
diff --git a/polyp/socket-server.h b/src/polypcore/socket-server.h
index 6c5d7bac..4d8bfad5 100644
--- a/polyp/socket-server.h
+++ b/src/polypcore/socket-server.h
@@ -23,7 +23,7 @@
***/
#include <inttypes.h>
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
#include "iochannel.h"
/* It is safe to destroy the calling socket_server object from the callback */
diff --git a/polyp/socket-util.c b/src/polypcore/socket-util.c
index 032a3c91..032a3c91 100644
--- a/polyp/socket-util.c
+++ b/src/polypcore/socket-util.c
diff --git a/polyp/socket-util.h b/src/polypcore/socket-util.h
index ae16fb16..ae16fb16 100644
--- a/polyp/socket-util.h
+++ b/src/polypcore/socket-util.h
diff --git a/polyp/sound-file-stream.c b/src/polypcore/sound-file-stream.c
index 881e3077..881e3077 100644
--- a/polyp/sound-file-stream.c
+++ b/src/polypcore/sound-file-stream.c
diff --git a/polyp/sound-file-stream.h b/src/polypcore/sound-file-stream.h
index 2e56ef49..2e56ef49 100644
--- a/polyp/sound-file-stream.h
+++ b/src/polypcore/sound-file-stream.h
diff --git a/polyp/sound-file.c b/src/polypcore/sound-file.c
index 0048ed74..a81c283a 100644
--- a/polyp/sound-file.c
+++ b/src/polypcore/sound-file.c
@@ -29,7 +29,7 @@
#include <sndfile.h>
#include "sound-file.h"
-#include "sample.h"
+#include <polyp/sample.h>
#include "log.h"
#define MAX_FILE_SIZE (1024*1024)
diff --git a/polyp/sound-file.h b/src/polypcore/sound-file.h
index e0534275..f3003bb9 100644
--- a/polyp/sound-file.h
+++ b/src/polypcore/sound-file.h
@@ -23,7 +23,7 @@
***/
#include "memchunk.h"
-#include "sample.h"
+#include <polyp/sample.h>
int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s);
diff --git a/polyp/source-output.c b/src/polypcore/source-output.c
index e1d8ccf7..e1d8ccf7 100644
--- a/polyp/source-output.c
+++ b/src/polypcore/source-output.c
diff --git a/polyp/source-output.h b/src/polypcore/source-output.h
index f8e4b152..4b1cbf15 100644
--- a/polyp/source-output.h
+++ b/src/polypcore/source-output.h
@@ -27,7 +27,7 @@
typedef struct pa_source_output pa_source_output;
#include "source.h"
-#include "sample.h"
+#include <polyp/sample.h>
#include "memblockq.h"
#include "resampler.h"
#include "module.h"
diff --git a/polyp/source.c b/src/polypcore/source.c
index 6e377b20..6e377b20 100644
--- a/polyp/source.c
+++ b/src/polypcore/source.c
diff --git a/polyp/source.h b/src/polypcore/source.h
index 823a9424..be2fb985 100644
--- a/polyp/source.h
+++ b/src/polypcore/source.h
@@ -26,12 +26,12 @@ typedef struct pa_source pa_source;
#include <inttypes.h>
#include "core.h"
-#include "sample.h"
+#include <polyp/sample.h>
#include "idxset.h"
#include "memblock.h"
#include "memchunk.h"
#include "sink.h"
-#include "channelmap.h"
+#include <polyp/channelmap.h>
#include "module.h"
#define PA_MAX_OUTPUTS_PER_SOURCE 16
diff --git a/polyp/strbuf.c b/src/polypcore/strbuf.c
index aa20218a..dcad5e78 100644
--- a/polyp/strbuf.c
+++ b/src/polypcore/strbuf.c
@@ -29,7 +29,8 @@
#include <string.h>
#include <stdarg.h>
#include <stdio.h>
-#include <xmalloc.h>
+
+#include <polypcore/xmalloc.h>
#include "strbuf.h"
diff --git a/polyp/strbuf.h b/src/polypcore/strbuf.h
index a88f5190..a88f5190 100644
--- a/polyp/strbuf.h
+++ b/src/polypcore/strbuf.h
diff --git a/polyp/strlist.c b/src/polypcore/strlist.c
index 09eb0c8a..09eb0c8a 100644
--- a/polyp/strlist.c
+++ b/src/polypcore/strlist.c
diff --git a/polyp/strlist.h b/src/polypcore/strlist.h
index 2c54dc74..2c54dc74 100644
--- a/polyp/strlist.h
+++ b/src/polypcore/strlist.h
diff --git a/polyp/subscribe.c b/src/polypcore/subscribe.c
index e8b3c841..e8b3c841 100644
--- a/polyp/subscribe.c
+++ b/src/polypcore/subscribe.c
diff --git a/polyp/subscribe.h b/src/polypcore/subscribe.h
index 625159e3..625159e3 100644
--- a/polyp/subscribe.h
+++ b/src/polypcore/subscribe.h
diff --git a/polyp/tagstruct.c b/src/polypcore/tagstruct.c
index 676f67de..676f67de 100644
--- a/polyp/tagstruct.c
+++ b/src/polypcore/tagstruct.c
diff --git a/polyp/tagstruct.h b/src/polypcore/tagstruct.h
index b41936ff..59db67b0 100644
--- a/polyp/tagstruct.h
+++ b/src/polypcore/tagstruct.h
@@ -27,9 +27,9 @@
#include <sys/time.h>
#include <time.h>
-#include "sample.h"
-#include "channelmap.h"
-#include "volume.h"
+#include <polyp/sample.h>
+#include <polyp/channelmap.h>
+#include <polyp/volume.h>
typedef struct pa_tagstruct pa_tagstruct;
diff --git a/polyp/tokenizer.c b/src/polypcore/tokenizer.c
index 5e0c1b16..5e0c1b16 100644
--- a/polyp/tokenizer.c
+++ b/src/polypcore/tokenizer.c
diff --git a/polyp/tokenizer.h b/src/polypcore/tokenizer.h
index bedacb8a..bedacb8a 100644
--- a/polyp/tokenizer.h
+++ b/src/polypcore/tokenizer.h
diff --git a/polyp/util.c b/src/polypcore/util.c
index 4b6edb97..4b6edb97 100644
--- a/polyp/util.c
+++ b/src/polypcore/util.c
diff --git a/polyp/util.h b/src/polypcore/util.h
index 95e7b99b..3dc6c945 100644
--- a/polyp/util.h
+++ b/src/polypcore/util.h
@@ -28,7 +28,7 @@
#include <stdio.h>
#include "gccmacro.h"
-#include "sample.h"
+#include <polyp/sample.h>
struct timeval;
diff --git a/polyp/winsock.h b/src/polypcore/winsock.h
index b1e0f7d4..b1e0f7d4 100644
--- a/polyp/winsock.h
+++ b/src/polypcore/winsock.h
diff --git a/polyp/x11prop.c b/src/polypcore/x11prop.c
index e57fc136..e57fc136 100644
--- a/polyp/x11prop.c
+++ b/src/polypcore/x11prop.c
diff --git a/polyp/x11prop.h b/src/polypcore/x11prop.h
index 5531c640..5531c640 100644
--- a/polyp/x11prop.h
+++ b/src/polypcore/x11prop.h
diff --git a/polyp/x11wrap.c b/src/polypcore/x11wrap.c
index e20a50a6..e20a50a6 100644
--- a/polyp/x11wrap.c
+++ b/src/polypcore/x11wrap.c
diff --git a/polyp/x11wrap.h b/src/polypcore/x11wrap.h
index 15645168..15645168 100644
--- a/polyp/x11wrap.h
+++ b/src/polypcore/x11wrap.h
diff --git a/polyp/xmalloc.c b/src/polypcore/xmalloc.c
index bf366347..bf366347 100644
--- a/polyp/xmalloc.c
+++ b/src/polypcore/xmalloc.c
diff --git a/polyp/xmalloc.h b/src/polypcore/xmalloc.h
index 2946011a..2946011a 100644
--- a/polyp/xmalloc.h
+++ b/src/polypcore/xmalloc.h
diff --git a/polyp/cpulimit-test.c b/src/tests/cpulimit-test.c
index 598b2dd2..97a8a0dd 100644
--- a/polyp/cpulimit-test.c
+++ b/src/tests/cpulimit-test.c
@@ -29,12 +29,12 @@
#include <stdio.h>
#include <signal.h>
-#include "cpulimit.h"
-#include "mainloop.h"
-#include "gccmacro.h"
+#include "../daemon/cpulimit.h"
+#include <polyp/mainloop.h>
+#include <polypcore/gccmacro.h>
#ifdef TEST2
-#include "mainloop-signal.h"
+#include <polyp/mainloop-signal.h>
#endif
/* A simple example for testing the cpulimit subsystem */
diff --git a/polyp/mainloop-test.c b/src/tests/mainloop-test.c
index ee0f8711..f62c9693 100644
--- a/polyp/mainloop-test.c
+++ b/src/tests/mainloop-test.c
@@ -28,13 +28,13 @@
#include <sys/time.h>
#include <assert.h>
-#include "util.h"
-#include "gccmacro.h"
+#include <polypcore/util.h>
+#include <polypcore/gccmacro.h>
#ifdef GLIB_MAIN_LOOP
#include <glib.h>
-#include "glib-mainloop.h"
+#include <polyp/glib-mainloop.h>
static GMainLoop* glib_main_loop = NULL;
@@ -46,7 +46,7 @@ static GMainLoop* glib_main_loop = NULL;
#else /* GLIB_MAIN_LOOP */
-#include "mainloop.h"
+#include <polyp/mainloop.h>
#endif /* GLIB_MAIN_LOOP */
static pa_defer_event *de;
diff --git a/polyp/mcalign-test.c b/src/tests/mcalign-test.c
index c151d8f2..861c38c1 100644
--- a/polyp/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -31,9 +31,9 @@
#include <stdlib.h>
#include <time.h>
-#include "util.h"
-#include "mcalign.h"
-#include "gccmacro.h"
+#include <polypcore/util.h>
+#include <polypcore/mcalign.h>
+#include <polypcore/gccmacro.h>
/* A simple program for testing pa_mcalign */
diff --git a/polyp/pacat-simple.c b/src/tests/pacat-simple.c
index 2825fee5..8b3a7b22 100644
--- a/polyp/pacat-simple.c
+++ b/src/tests/pacat-simple.c
@@ -30,7 +30,7 @@
#include <polyp/polyplib-simple.h>
#include <polyp/polyplib-error.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
#define BUFSIZE 1024
diff --git a/polyp/parec-simple.c b/src/tests/parec-simple.c
index 524cc4f1..10eaea8d 100644
--- a/polyp/parec-simple.c
+++ b/src/tests/parec-simple.c
@@ -30,7 +30,7 @@
#include <polyp/polyplib-simple.h>
#include <polyp/polyplib-error.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
#define BUFSIZE 1024
diff --git a/polyp/strlist-test.c b/src/tests/strlist-test.c
index c670a105..14543112 100644
--- a/polyp/strlist-test.c
+++ b/src/tests/strlist-test.c
@@ -1,8 +1,8 @@
#include <stdio.h>
-#include "strlist.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
+#include <polypcore/strlist.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char* argv[]) {
char *t, *u;
diff --git a/polyp/voltest.c b/src/tests/voltest.c
index 917e04d3..58f1da00 100644
--- a/polyp/voltest.c
+++ b/src/tests/voltest.c
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <polyp/volume.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
pa_volume_t v;
diff --git a/polyp/esdcompat.sh.in b/src/utils/esdcompat.sh.in
index 76023f52..76023f52 100755
--- a/polyp/esdcompat.sh.in
+++ b/src/utils/esdcompat.sh.in
diff --git a/polyp/pabrowse.c b/src/utils/pabrowse.c
index 634c308a..634c308a 100644
--- a/polyp/pabrowse.c
+++ b/src/utils/pabrowse.c
diff --git a/polyp/pacat.c b/src/utils/pacat.c
index bd2b64fd..bd2b64fd 100644
--- a/polyp/pacat.c
+++ b/src/utils/pacat.c
diff --git a/polyp/pacmd.c b/src/utils/pacmd.c
index e6c0da6a..4054bc2c 100644
--- a/polyp/pacmd.c
+++ b/src/utils/pacmd.c
@@ -32,9 +32,9 @@
#include <string.h>
#include <sys/un.h>
-#include "util.h"
-#include "log.h"
-#include "pid.h"
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/pid.h>
int main(PA_GCC_UNUSED int main, PA_GCC_UNUSED char*argv[]) {
pid_t pid ;
diff --git a/polyp/pactl.c b/src/utils/pactl.c
index 23bd924b..23bd924b 100644
--- a/polyp/pactl.c
+++ b/src/utils/pactl.c
diff --git a/polyp/paplay.c b/src/utils/paplay.c
index ddc1cbc1..ddc1cbc1 100644
--- a/polyp/paplay.c
+++ b/src/utils/paplay.c
diff --git a/polyp/pax11publish.c b/src/utils/pax11publish.c
index 42947836..63ee4821 100644
--- a/polyp/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -31,12 +31,12 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#include "util.h"
-#include "log.h"
-#include "authkey.h"
-#include "native-common.h"
-#include "client-conf.h"
-#include "x11prop.h"
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/authkey.h>
+#include <polypcore/native-common.h>
+#include <polyp/client-conf.h>
+#include <polypcore/x11prop.h>
int main(int argc, char *argv[]) {
const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;