From d9cc2cfcb97c1b0449bcbfb6ab0301a58d77bd55 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 17 May 2006 16:34:18 +0000
Subject: [PATCH] Move xmalloc to the public side (libpolyp).

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@908 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/Makefile.am                       | 14 +++++++-------
 src/daemon/cmdline.c                  |  3 ++-
 src/daemon/daemon-conf.c              |  3 ++-
 src/daemon/main.c                     |  2 +-
 src/modules/alsa-util.c               |  3 ++-
 src/modules/howl-wrap.c               |  3 ++-
 src/modules/module-alsa-sink.c        |  3 ++-
 src/modules/module-alsa-source.c      |  3 ++-
 src/modules/module-combine.c          |  3 ++-
 src/modules/module-detect.c           |  3 ++-
 src/modules/module-esound-sink.c      |  3 ++-
 src/modules/module-jack-sink.c        |  3 ++-
 src/modules/module-jack-source.c      |  3 ++-
 src/modules/module-lirc.c             |  3 ++-
 src/modules/module-match.c            |  3 ++-
 src/modules/module-mmkbd-evdev.c      |  3 ++-
 src/modules/module-null-sink.c        |  3 ++-
 src/modules/module-oss-mmap.c         |  3 ++-
 src/modules/module-oss.c              |  3 ++-
 src/modules/module-pipe-sink.c        |  3 ++-
 src/modules/module-pipe-source.c      |  3 ++-
 src/modules/module-protocol-stub.c    |  3 ++-
 src/modules/module-sine.c             |  3 ++-
 src/modules/module-solaris.c          |  2 +-
 src/modules/module-tunnel.c           |  2 +-
 src/modules/module-volume-restore.c   |  3 ++-
 src/modules/module-waveout.c          |  3 ++-
 src/modules/module-x11-bell.c         |  3 ++-
 src/modules/module-x11-publish.c      |  3 ++-
 src/modules/module-zeroconf-publish.c |  3 ++-
 src/modules/rtp/module-rtp-recv.c     |  3 ++-
 src/modules/rtp/module-rtp-send.c     |  3 ++-
 src/modules/rtp/sap.c                 |  3 ++-
 src/modules/rtp/sdp.c                 |  3 ++-
 src/polyp/browser.c                   |  3 ++-
 src/polyp/channelmap.c                |  4 +++-
 src/polyp/client-conf-x11.c           |  3 ++-
 src/polyp/client-conf.c               |  3 ++-
 src/polyp/context.c                   |  2 +-
 src/polyp/glib-mainloop.c             |  3 ++-
 src/polyp/glib12-mainloop.c           |  3 ++-
 src/polyp/mainloop-api.c              |  3 ++-
 src/polyp/mainloop-signal.c           |  3 ++-
 src/polyp/mainloop.c                  |  3 ++-
 src/polyp/operation.c                 |  2 +-
 src/polyp/simple.c                    |  2 +-
 src/polyp/stream.c                    |  3 ++-
 src/polyp/thread-mainloop.c           |  3 ++-
 src/{polypcore => polyp}/xmalloc.c    |  0
 src/{polypcore => polyp}/xmalloc.h    |  0
 src/polypcore/authkey-prop.c          |  3 ++-
 src/polypcore/autoload.c              |  3 ++-
 src/polypcore/cli-command.c           |  3 ++-
 src/polypcore/cli-text.c              |  3 ++-
 src/polypcore/cli.c                   |  3 ++-
 src/polypcore/client.c                |  3 ++-
 src/polypcore/conf-parser.c           |  3 ++-
 src/polypcore/core-scache.c           |  3 ++-
 src/polypcore/core-subscribe.c        |  3 ++-
 src/polypcore/core.c                  |  3 ++-
 src/polypcore/dynarray.c              |  2 +-
 src/polypcore/hashmap.c               |  3 ++-
 src/polypcore/idxset.c                |  2 +-
 src/polypcore/iochannel.c             |  3 ++-
 src/polypcore/ioline.c                |  3 ++-
 src/polypcore/log.c                   |  3 ++-
 src/polypcore/mcalign.c               |  2 +-
 src/polypcore/memblock.c              |  2 +-
 src/polypcore/memblockq.c             |  3 ++-
 src/polypcore/memchunk.c              |  2 +-
 src/polypcore/modargs.c               |  3 ++-
 src/polypcore/modinfo.c               |  3 ++-
 src/polypcore/module.c                |  3 ++-
 src/polypcore/namereg.c               |  3 ++-
 src/polypcore/packet.c                |  2 +-
 src/polypcore/parseaddr.c             |  3 ++-
 src/polypcore/pdispatch.c             |  3 ++-
 src/polypcore/pid.c                   |  3 ++-
 src/polypcore/play-memchunk.c         |  3 ++-
 src/polypcore/props.c                 |  3 ++-
 src/polypcore/protocol-cli.c          |  3 ++-
 src/polypcore/protocol-esound.c       |  3 ++-
 src/polypcore/protocol-http.c         |  3 ++-
 src/polypcore/protocol-native.c       |  2 +-
 src/polypcore/protocol-simple.c       |  3 ++-
 src/polypcore/pstream.c               |  3 ++-
 src/polypcore/queue.c                 |  2 +-
 src/polypcore/resampler.c             |  3 ++-
 src/polypcore/sink-input.c            |  3 ++-
 src/polypcore/sink.c                  |  2 +-
 src/polypcore/socket-client.c         |  3 ++-
 src/polypcore/socket-server.c         |  3 ++-
 src/polypcore/socket-util.c           |  3 ++-
 src/polypcore/sound-file-stream.c     |  3 ++-
 src/polypcore/source-output.c         |  3 ++-
 src/polypcore/source.c                |  3 ++-
 src/polypcore/strbuf.c                |  2 +-
 src/polypcore/strlist.c               |  3 ++-
 src/polypcore/tagstruct.c             |  2 +-
 src/polypcore/tokenizer.c             |  3 ++-
 src/polypcore/utf8.c                  |  3 ++-
 src/polypcore/util.c                  |  3 ++-
 src/polypcore/x11wrap.c               |  3 ++-
 src/tests/strlist-test.c              |  2 +-
 src/tests/utf8-test.c                 |  2 +-
 105 files changed, 193 insertions(+), 109 deletions(-)
 rename src/{polypcore => polyp}/xmalloc.c (100%)
 rename src/{polypcore => polyp}/xmalloc.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index bd48a0fb1..afbdedee1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -273,10 +273,10 @@ mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 memblockq_test_SOURCES = \
 	tests/memblockq-test.c \
+	polyp/xmalloc.c \
 	polypcore/memblockq.c \
 	polypcore/log.c \
 	polypcore/memblock.c \
-	polypcore/xmalloc.c \
 	polypcore/util.c \
 	polypcore/mcalign.c \
 	polypcore/memchunk.c
@@ -313,7 +313,8 @@ polypinclude_HEADERS = \
 		polyp/subscribe.h \
 		polyp/version.h \
 		polyp/sample.h \
-		polyp/volume.h
+		polyp/volume.h \
+		polyp/xmalloc.h
 
 if HAVE_HOWL
 polypinclude_HEADERS += \
@@ -360,6 +361,7 @@ libpolyp_la_SOURCES = \
 		polyp/mainloop.c polyp/mainloop.h \
 		polyp/mainloop-signal.c polyp/mainloop-signal.h \
 		polyp/thread-mainloop.c polyp/thread-mainloop.h \
+		polyp/xmalloc.c polyp/xmalloc.h \
 		polypcore/pipe.c polypcore/pipe.h \
 		polypcore/poll.c polypcore/poll.h
 
@@ -392,7 +394,6 @@ libpolyp_la_SOURCES += \
 		polypcore/tagstruct.c polypcore/tagstruct.h \
 		polypcore/util.c polypcore/util.h \
 		polypcore/winsock.h \
-		polypcore/xmalloc.c polypcore/xmalloc.h \
 		polypcore/llist.h
 
 if OS_IS_WIN32
@@ -485,8 +486,7 @@ polypcoreinclude_HEADERS = \
 		polypcore/strbuf.h \
 		polypcore/tokenizer.h \
 		polypcore/util.h \
-		polypcore/utf8.h \
-		polypcore/xmalloc.h
+		polypcore/utf8.h
 
 lib_LTLIBRARIES += libpolypcore.la
 
@@ -497,7 +497,8 @@ libpolypcore_la_SOURCES = \
 		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
+		polyp/volume.c polyp/volume.h \
+		polyp/xmalloc.c polyp/xmalloc.h
 
 # Pure core stuff (some are shared in libpolyp though).
 libpolypcore_la_SOURCES += \
@@ -546,7 +547,6 @@ libpolypcore_la_SOURCES += \
 		polypcore/tokenizer.c polypcore/tokenizer.h \
 		polypcore/util.c polypcore/util.h \
 		polypcore/winsock.h \
-		polypcore/xmalloc.c polypcore/xmalloc.h \
 		polypcore/utf8.c polypcore/utf8.h
 
 if OS_IS_WIN32
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index a6b95a812..1ed16a692 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -30,9 +30,10 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/strbuf.h>
-#include <polypcore/xmalloc.h>
 
 #include "cmdline.h"
 
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index f41bb4b19..f82d3d24f 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -29,8 +29,9 @@
 #include <assert.h>
 #include <unistd.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/resampler.h>
diff --git a/src/daemon/main.c b/src/daemon/main.c
index e14837a99..a7144eba0 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -51,6 +51,7 @@
 
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/core.h>
 #include <polypcore/memblock.h>
@@ -59,7 +60,6 @@
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 #include <polypcore/sioman.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/cli-text.h>
 #include <polypcore/pid.h>
 #include <polypcore/namereg.h>
diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c
index 503b8efbc..122f4419b 100644
--- a/src/modules/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -27,7 +27,8 @@
 #include <asoundlib.h>
 
 #include <polyp/sample.h>
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 
 #include "alsa-util.h"
diff --git a/src/modules/howl-wrap.c b/src/modules/howl-wrap.c
index f4605fb2d..467ab9e24 100644
--- a/src/modules/howl-wrap.c
+++ b/src/modules/howl-wrap.c
@@ -21,8 +21,9 @@
 
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/props.h>
 
 #include "howl-wrap.h"
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 47065659c..94de771c1 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -34,6 +34,8 @@
 
 #include <asoundlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core.h>
 #include <polypcore/module.h>
 #include <polypcore/memchunk.h>
@@ -41,7 +43,6 @@
 #include <polypcore/modargs.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "alsa-util.h"
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index d46f8e427..b9d1ff87c 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -34,6 +34,8 @@
 
 #include <asoundlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core.h>
 #include <polypcore/module.h>
 #include <polypcore/memchunk.h>
@@ -41,7 +43,6 @@
 #include <polypcore/modargs.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "alsa-util.h"
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 369778a6b..b31fe56ea 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -26,6 +26,8 @@
 #include <assert.h>
 #include <stdio.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/llist.h>
 #include <polypcore/sink.h>
@@ -33,7 +35,6 @@
 #include <polypcore/memblockq.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/modargs.h>
 #include <polypcore/namereg.h>
 
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 9cc13e817..ea14e68fb 100644
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -33,9 +33,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 1cc75502d..1d61e01b1 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.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>
diff --git a/src/modules/module-jack-sink.c b/src/modules/module-jack-sink.c
index 324a2cb3e..1aa734950 100644
--- a/src/modules/module-jack-sink.c
+++ b/src/modules/module-jack-sink.c
@@ -36,12 +36,13 @@
 
 #include <jack/jack.h>
 
+#include <polyp/xmalloc.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 <polyp/mainloop-api.h>
 
diff --git a/src/modules/module-jack-source.c b/src/modules/module-jack-source.c
index 94cabbea2..29c46d853 100644
--- a/src/modules/module-jack-source.c
+++ b/src/modules/module-jack-source.c
@@ -36,12 +36,13 @@
 
 #include <jack/jack.h>
 
+#include <polyp/xmalloc.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 <polyp/mainloop-api.h>
 
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c
index 3bb0dc749..918177a30 100644
--- a/src/modules/module-lirc.c
+++ b/src/modules/module-lirc.c
@@ -30,11 +30,12 @@
 #include <lirc/lirc_client.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.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"
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 9e3edb702..1692b5d82 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -32,12 +32,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sink-input.h>
 #include <polypcore/util.h>
 
diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index 8ea568110..654fbaa4b 100644
--- a/src/modules/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -33,11 +33,12 @@
 
 #include <linux/input.h>
 
+#include <polyp/xmalloc.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>
 
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 5cdfeab8c..2cc490630 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.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"
diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index ddf33532f..82e7d66dd 100644
--- a/src/modules/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -36,6 +36,8 @@
 #include <limits.h>
 #include <sys/mman.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -43,7 +45,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "oss-util.h"
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index f6d19544b..46d100f15 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -35,6 +35,8 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -42,7 +44,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "oss-util.h"
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 0fb73cd88..b59808fcb 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.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"
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index d999754af..4f3f9a6c9 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.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"
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index d5b5f63b1..79a59cd5f 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -42,6 +42,8 @@
 
 #include "../polypcore/winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/socket-server.h>
 #include <polypcore/socket-util.h>
@@ -49,7 +51,6 @@
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/native-common.h>
-#include <polypcore/xmalloc.h>
 
 #ifdef USE_TCP_SOCKETS
 #define SOCKET_DESCRIPTION "(TCP sockets)"
diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c
index 3267d49bb..15b6c8a94 100644
--- a/src/modules/module-sine.c
+++ b/src/modules/module-sine.c
@@ -27,10 +27,11 @@
 #include <assert.h>
 #include <math.h>
 
+#include <polyp/xmalloc.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>
 
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 3e7c2fb46..d82e33620 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -41,6 +41,7 @@
 #include <sys/audio.h>
 
 #include <polyp/mainloop-signal.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
@@ -49,7 +50,6 @@
 #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"
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 2e04b1208..a2a1e33de 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -32,13 +32,13 @@
 #include <stdlib.h>
 
 #include <polyp/version.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sink-input.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/pstream.h>
diff --git a/src/modules/module-volume-restore.c b/src/modules/module-volume-restore.c
index f9e7d0132..ea40d8622 100644
--- a/src/modules/module-volume-restore.c
+++ b/src/modules/module-volume-restore.c
@@ -32,12 +32,13 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sink-input.h>
 #include <polypcore/util.h>
 #include <polyp/volume.h>
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 2d9c42eba..3d1f1b01a 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -29,6 +29,8 @@
 
 #include <polyp/mainloop-api.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
@@ -36,7 +38,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "module-waveout-symdef.h"
 
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index e4d4020e3..2b891bc12 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -31,11 +31,12 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
 #include <polypcore/x11wrap.h>
diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index 7408b930f..e974487d8 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -32,11 +32,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
 #include <polypcore/x11wrap.h>
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index f8607befa..e5dce7559 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -29,7 +29,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/autoload.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index 925a1210c..89aa89830 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -31,6 +31,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/llist.h>
 #include <polypcore/sink.h>
@@ -38,7 +40,6 @@
 #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 <polypcore/sample-util.h>
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index d0def859e..8fc1d7fee 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -32,6 +32,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/llist.h>
 #include <polypcore/source.h>
@@ -39,7 +41,6 @@
 #include <polypcore/memblockq.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/modargs.h>
 #include <polypcore/namereg.h>
 
diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c
index d2bca04de..e579b5c57 100644
--- a/src/modules/rtp/sap.c
+++ b/src/modules/rtp/sap.c
@@ -38,9 +38,10 @@
 #include <sys/filio.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "sap.h"
 #include "sdp.h"
diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
index 84bcd83b0..3cece7110 100644
--- a/src/modules/rtp/sdp.c
+++ b/src/modules/rtp/sdp.c
@@ -31,9 +31,10 @@
 #include <arpa/inet.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "sdp.h"
 #include "rtp.h"
diff --git a/src/polyp/browser.c b/src/polyp/browser.c
index cef680e40..5442fd4c0 100644
--- a/src/polyp/browser.c
+++ b/src/polyp/browser.c
@@ -22,7 +22,8 @@
 #include <assert.h>
 #include <howl.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 
diff --git a/src/polyp/channelmap.c b/src/polyp/channelmap.c
index 7266a0a0e..ddd7b3ce7 100644
--- a/src/polyp/channelmap.c
+++ b/src/polyp/channelmap.c
@@ -28,8 +28,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
+
 #include "channelmap.h"
 
 const char *const table[] = {
diff --git a/src/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c
index 7187d86b2..17ee2d6ae 100644
--- a/src/polyp/client-conf-x11.c
+++ b/src/polyp/client-conf-x11.c
@@ -29,9 +29,10 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/x11prop.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "client-conf-x11.h"
diff --git a/src/polyp/client-conf.c b/src/polyp/client-conf.c
index d3ad0767e..567d2ae4c 100644
--- a/src/polyp/client-conf.c
+++ b/src/polyp/client-conf.c
@@ -29,7 +29,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/util.h>
diff --git a/src/polyp/context.c b/src/polyp/context.c
index d5cf90f8e..3c46e2e87 100644
--- a/src/polyp/context.c
+++ b/src/polyp/context.c
@@ -48,6 +48,7 @@
 #include "../polypcore/winsock.h"
 
 #include <polyp/version.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
 #include <polypcore/pdispatch.h>
@@ -56,7 +57,6 @@
 #include <polypcore/socket-client.h>
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/socket-util.h>
 
diff --git a/src/polyp/glib-mainloop.c b/src/polyp/glib-mainloop.c
index 3937a1a9f..bc5df3a9b 100644
--- a/src/polyp/glib-mainloop.c
+++ b/src/polyp/glib-mainloop.c
@@ -25,8 +25,9 @@
 
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "glib.h"
diff --git a/src/polyp/glib12-mainloop.c b/src/polyp/glib12-mainloop.c
index 5ad23adba..7af21210f 100644
--- a/src/polyp/glib12-mainloop.c
+++ b/src/polyp/glib12-mainloop.c
@@ -25,8 +25,9 @@
 
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "glib-mainloop.h"
diff --git a/src/polyp/mainloop-api.c b/src/polyp/mainloop-api.c
index 71f55c05d..f29598dc4 100644
--- a/src/polyp/mainloop-api.c
+++ b/src/polyp/mainloop-api.c
@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/gccmacro.h>
-#include <polypcore/xmalloc.h>
 
 #include "mainloop-api.h"
 
diff --git a/src/polyp/mainloop-signal.c b/src/polyp/mainloop-signal.c
index 4ffa00ba3..a225f78be 100644
--- a/src/polyp/mainloop-signal.c
+++ b/src/polyp/mainloop-signal.c
@@ -36,8 +36,9 @@
 #include <windows.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/gccmacro.h>
 
diff --git a/src/polyp/mainloop.c b/src/polyp/mainloop.c
index 589fe77ef..82e789c54 100644
--- a/src/polyp/mainloop.c
+++ b/src/polyp/mainloop.c
@@ -44,9 +44,10 @@
 #include "../polypcore/pipe.h"
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "mainloop.h"
diff --git a/src/polyp/operation.c b/src/polyp/operation.c
index 1c0cb99f2..5af9ec0b8 100644
--- a/src/polyp/operation.c
+++ b/src/polyp/operation.c
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "internal.h"
 #include "operation.h"
diff --git a/src/polyp/simple.c b/src/polyp/simple.c
index 1f25869b3..b56406c91 100644
--- a/src/polyp/simple.c
+++ b/src/polyp/simple.c
@@ -30,9 +30,9 @@
 
 #include <polyp/polypaudio.h>
 #include <polyp/thread-mainloop.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "simple.h"
diff --git a/src/polyp/stream.c b/src/polyp/stream.c
index b2711ce08..f188e7885 100644
--- a/src/polyp/stream.c
+++ b/src/polyp/stream.c
@@ -29,7 +29,8 @@
 #include <string.h>
 
 #include <polyp/def.h>
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
diff --git a/src/polyp/thread-mainloop.c b/src/polyp/thread-mainloop.c
index 20639e9e7..d036a2327 100644
--- a/src/polyp/thread-mainloop.c
+++ b/src/polyp/thread-mainloop.c
@@ -41,8 +41,9 @@
 #include <windows.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/hashmap.h>
 
 #include "mainloop.h"
diff --git a/src/polypcore/xmalloc.c b/src/polyp/xmalloc.c
similarity index 100%
rename from src/polypcore/xmalloc.c
rename to src/polyp/xmalloc.c
diff --git a/src/polypcore/xmalloc.h b/src/polyp/xmalloc.h
similarity index 100%
rename from src/polypcore/xmalloc.h
rename to src/polyp/xmalloc.h
diff --git a/src/polypcore/authkey-prop.c b/src/polypcore/authkey-prop.c
index 3faf0ef1f..6172d4320 100644
--- a/src/polypcore/authkey-prop.c
+++ b/src/polypcore/authkey-prop.c
@@ -22,7 +22,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/props.h>
 #include <polypcore/log.h>
 
diff --git a/src/polypcore/autoload.c b/src/polypcore/autoload.c
index 8d2dca30f..386de2192 100644
--- a/src/polypcore/autoload.c
+++ b/src/polypcore/autoload.c
@@ -27,8 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/memchunk.h>
 #include <polypcore/sound-file.h>
 #include <polypcore/log.h>
diff --git a/src/polypcore/cli-command.c b/src/polypcore/cli-command.c
index 180c61e9a..5556bcb34 100644
--- a/src/polypcore/cli-command.c
+++ b/src/polypcore/cli-command.c
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -44,7 +46,6 @@
 #include <polypcore/sound-file.h>
 #include <polypcore/play-memchunk.h>
 #include <polypcore/autoload.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sound-file-stream.h>
 #include <polypcore/props.h>
 #include <polypcore/util.h>
diff --git a/src/polypcore/cli-text.c b/src/polypcore/cli-text.c
index 74de57816..09ccaa00d 100644
--- a/src/polypcore/cli-text.c
+++ b/src/polypcore/cli-text.c
@@ -27,6 +27,8 @@
 #include <string.h>
 
 #include <polyp/volume.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/client.h>
 #include <polypcore/sink.h>
@@ -37,7 +39,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/autoload.h>
-#include <polypcore/xmalloc.h>
 
 #include "cli-text.h"
 
diff --git a/src/polypcore/cli.c b/src/polypcore/cli.c
index 583f6845a..683d29ec9 100644
--- a/src/polypcore/cli.c
+++ b/src/polypcore/cli.c
@@ -28,6 +28,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/ioline.h>
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
@@ -40,7 +42,6 @@
 #include <polypcore/namereg.h>
 #include <polypcore/cli-text.h>
 #include <polypcore/cli-command.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "cli.h"
diff --git a/src/polypcore/client.c b/src/polypcore/client.c
index be970470c..b5ed2fd0b 100644
--- a/src/polypcore/client.c
+++ b/src/polypcore/client.c
@@ -28,7 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 
diff --git a/src/polypcore/conf-parser.c b/src/polypcore/conf-parser.c
index 26fc33b56..64e66c2e1 100644
--- a/src/polypcore/conf-parser.c
+++ b/src/polypcore/conf-parser.c
@@ -28,9 +28,10 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 
 #include "conf-parser.h"
 
diff --git a/src/polypcore/core-scache.c b/src/polypcore/core-scache.c
index 3bba38ed3..8080fcd69 100644
--- a/src/polypcore/core-scache.c
+++ b/src/polypcore/core-scache.c
@@ -44,10 +44,11 @@
 #include <polyp/mainloop.h>
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/play-memchunk.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sound-file.h>
diff --git a/src/polypcore/core-subscribe.c b/src/polypcore/core-subscribe.c
index fa6c0e509..52babb7a3 100644
--- a/src/polypcore/core-subscribe.c
+++ b/src/polypcore/core-subscribe.c
@@ -26,8 +26,9 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/queue.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "core-subscribe.h"
diff --git a/src/polypcore/core.c b/src/polypcore/core.c
index 0093aebd7..ff8ec0810 100644
--- a/src/polypcore/core.c
+++ b/src/polypcore/core.c
@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <signal.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -35,7 +37,6 @@
 #include <polypcore/util.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/autoload.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/props.h>
 #include <polypcore/random.h>
diff --git a/src/polypcore/dynarray.c b/src/polypcore/dynarray.c
index 1aff7f511..234c2c03f 100644
--- a/src/polypcore/dynarray.c
+++ b/src/polypcore/dynarray.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "dynarray.h"
 
diff --git a/src/polypcore/hashmap.c b/src/polypcore/hashmap.c
index 8861fd3df..adc322f04 100644
--- a/src/polypcore/hashmap.c
+++ b/src/polypcore/hashmap.c
@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "hashmap.h"
diff --git a/src/polypcore/idxset.c b/src/polypcore/idxset.c
index f970ae5e0..bde5c2791 100644
--- a/src/polypcore/idxset.c
+++ b/src/polypcore/idxset.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "idxset.h"
 
diff --git a/src/polypcore/iochannel.c b/src/polypcore/iochannel.c
index aba0399c2..a1ad5dea2 100644
--- a/src/polypcore/iochannel.c
+++ b/src/polypcore/iochannel.c
@@ -38,9 +38,10 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/socket-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "iochannel.h"
diff --git a/src/polypcore/ioline.c b/src/polypcore/ioline.c
index eb8fdda53..9bb610fe9 100644
--- a/src/polypcore/ioline.c
+++ b/src/polypcore/ioline.c
@@ -29,7 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 
 #include "ioline.h"
diff --git a/src/polypcore/log.c b/src/polypcore/log.c
index 9c9ed2fd9..9908d168c 100644
--- a/src/polypcore/log.c
+++ b/src/polypcore/log.c
@@ -33,7 +33,8 @@
 #include <syslog.h>
 #endif
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 
 #include "log.h"
diff --git a/src/polypcore/mcalign.c b/src/polypcore/mcalign.c
index f90fd7e8c..d9267f99d 100644
--- a/src/polypcore/mcalign.c
+++ b/src/polypcore/mcalign.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "mcalign.h"
 
diff --git a/src/polypcore/memblock.c b/src/polypcore/memblock.c
index 04e8436fc..a0e5135b3 100644
--- a/src/polypcore/memblock.c
+++ b/src/polypcore/memblock.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "memblock.h"
 
diff --git a/src/polypcore/memblockq.c b/src/polypcore/memblockq.c
index 90e1d9ebe..caacd96f0 100644
--- a/src/polypcore/memblockq.c
+++ b/src/polypcore/memblockq.c
@@ -30,7 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/mcalign.h>
 
diff --git a/src/polypcore/memchunk.c b/src/polypcore/memchunk.c
index d6856ab83..918b3f0f0 100644
--- a/src/polypcore/memchunk.c
+++ b/src/polypcore/memchunk.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "memchunk.h"
 
diff --git a/src/polypcore/modargs.c b/src/polypcore/modargs.c
index 713326bfc..63cc779dd 100644
--- a/src/polypcore/modargs.c
+++ b/src/polypcore/modargs.c
@@ -28,13 +28,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/hashmap.h>
 #include <polypcore/idxset.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "modargs.h"
diff --git a/src/polypcore/modinfo.c b/src/polypcore/modinfo.c
index 39186ceb0..241076c66 100644
--- a/src/polypcore/modinfo.c
+++ b/src/polypcore/modinfo.c
@@ -26,7 +26,8 @@
 #include <ltdl.h>
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 
diff --git a/src/polypcore/module.c b/src/polypcore/module.c
index 5412f3973..fe177a5bf 100644
--- a/src/polypcore/module.c
+++ b/src/polypcore/module.c
@@ -30,7 +30,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
diff --git a/src/polypcore/namereg.c b/src/polypcore/namereg.c
index 9229a0f99..cf11f5a4d 100644
--- a/src/polypcore/namereg.c
+++ b/src/polypcore/namereg.c
@@ -29,10 +29,11 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/autoload.h>
 #include <polypcore/source.h>
 #include <polypcore/sink.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/util.h>
 
diff --git a/src/polypcore/packet.c b/src/polypcore/packet.c
index 31ddad95b..646b59e0e 100644
--- a/src/polypcore/packet.c
+++ b/src/polypcore/packet.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "packet.h"
 
diff --git a/src/polypcore/parseaddr.c b/src/polypcore/parseaddr.c
index c2b25c896..7e518a5d4 100644
--- a/src/polypcore/parseaddr.c
+++ b/src/polypcore/parseaddr.c
@@ -27,7 +27,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 
 #include "parseaddr.h"
diff --git a/src/polypcore/pdispatch.c b/src/polypcore/pdispatch.c
index b087f1a50..21e3644e0 100644
--- a/src/polypcore/pdispatch.c
+++ b/src/polypcore/pdispatch.c
@@ -27,8 +27,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/native-common.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/llist.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
diff --git a/src/polypcore/pid.c b/src/polypcore/pid.c
index b258290b5..53b8ad0a2 100644
--- a/src/polypcore/pid.c
+++ b/src/polypcore/pid.c
@@ -39,9 +39,10 @@
 #include <windows.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "pid.h"
 
diff --git a/src/polypcore/play-memchunk.c b/src/polypcore/play-memchunk.c
index 37ebdcf11..982cedc7b 100644
--- a/src/polypcore/play-memchunk.c
+++ b/src/polypcore/play-memchunk.c
@@ -28,8 +28,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/gccmacro.h>
 
 #include "play-memchunk.h"
diff --git a/src/polypcore/props.c b/src/polypcore/props.c
index 96cdc4f2d..1db44ee75 100644
--- a/src/polypcore/props.c
+++ b/src/polypcore/props.c
@@ -21,7 +21,8 @@
 
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 
 #include "props.h"
diff --git a/src/polypcore/protocol-cli.c b/src/polypcore/protocol-cli.c
index 7dd489f7e..076411cf3 100644
--- a/src/polypcore/protocol-cli.c
+++ b/src/polypcore/protocol-cli.c
@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/cli.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "protocol-cli.h"
diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c
index fcbeba6d1..86a8c9e3c 100644
--- a/src/polypcore/protocol-esound.c
+++ b/src/polypcore/protocol-esound.c
@@ -31,6 +31,8 @@
 #include <limits.h>
 
 #include <polyp/sample.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/esound.h>
 #include <polypcore/memblock.h>
 #include <polypcore/client.h>
@@ -42,7 +44,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/authkey.h>
 #include <polypcore/namereg.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 #include <polypcore/utf8.h>
diff --git a/src/polypcore/protocol-http.c b/src/polypcore/protocol-http.c
index 85ddebee4..68864237e 100644
--- a/src/polypcore/protocol-http.c
+++ b/src/polypcore/protocol-http.c
@@ -28,8 +28,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/ioline.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/namereg.h>
 #include <polypcore/cli-text.h>
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index 3b9041342..b0ad59551 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include <polyp/version.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
 #include <polypcore/packet.h>
@@ -43,7 +44,6 @@
 #include <polypcore/authkey.h>
 #include <polypcore/namereg.h>
 #include <polypcore/core-scache.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
diff --git a/src/polypcore/protocol-simple.c b/src/polypcore/protocol-simple.c
index 1e3b169c4..caffd5c9f 100644
--- a/src/polypcore/protocol-simple.c
+++ b/src/polypcore/protocol-simple.c
@@ -30,12 +30,13 @@
 #include <errno.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
 #include <polypcore/source-output.h>
 #include <polypcore/client.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/namereg.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "protocol-simple.h"
diff --git a/src/polypcore/pstream.c b/src/polypcore/pstream.c
index 09bd1e27e..074cab916 100644
--- a/src/polypcore/pstream.c
+++ b/src/polypcore/pstream.c
@@ -34,8 +34,9 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/queue.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/core-scache.h>
 
diff --git a/src/polypcore/queue.c b/src/polypcore/queue.c
index 77ca1ed39..01f957d9b 100644
--- a/src/polypcore/queue.c
+++ b/src/polypcore/queue.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "queue.h"
 
diff --git a/src/polypcore/resampler.c b/src/polypcore/resampler.c
index b2a8874b6..33e8c2959 100644
--- a/src/polypcore/resampler.c
+++ b/src/polypcore/resampler.c
@@ -30,8 +30,9 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sconv.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "resampler.h"
diff --git a/src/polypcore/sink-input.c b/src/polypcore/sink-input.c
index c10263903..5c0caa211 100644
--- a/src/polypcore/sink-input.c
+++ b/src/polypcore/sink-input.c
@@ -28,8 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/utf8.h>
diff --git a/src/polypcore/sink.c b/src/polypcore/sink.c
index b59f1eaa6..a873c00a3 100644
--- a/src/polypcore/sink.c
+++ b/src/polypcore/sink.c
@@ -29,12 +29,12 @@
 #include <stdio.h>
 
 #include <polyp/introspect.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/sink-input.h>
 #include <polypcore/namereg.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/utf8.h>
diff --git a/src/polypcore/socket-client.c b/src/polypcore/socket-client.c
index 734b9dde5..a61cf582f 100644
--- a/src/polypcore/socket-client.c
+++ b/src/polypcore/socket-client.c
@@ -54,9 +54,10 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/socket-util.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/parseaddr.h>
 
diff --git a/src/polypcore/socket-server.c b/src/polypcore/socket-server.c
index f7e0b6477..959173f26 100644
--- a/src/polypcore/socket-server.c
+++ b/src/polypcore/socket-server.c
@@ -62,8 +62,9 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/socket-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 
diff --git a/src/polypcore/socket-util.c b/src/polypcore/socket-util.c
index 915c7f224..0961db210 100644
--- a/src/polypcore/socket-util.c
+++ b/src/polypcore/socket-util.c
@@ -59,8 +59,9 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "socket-util.h"
diff --git a/src/polypcore/sound-file-stream.c b/src/polypcore/sound-file-stream.c
index fdacea54b..68fd8a89c 100644
--- a/src/polypcore/sound-file-stream.c
+++ b/src/polypcore/sound-file-stream.c
@@ -30,8 +30,9 @@
 
 #include <sndfile.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "sound-file-stream.h"
diff --git a/src/polypcore/source-output.c b/src/polypcore/source-output.c
index b31130718..c8db870b5 100644
--- a/src/polypcore/source-output.c
+++ b/src/polypcore/source-output.c
@@ -28,7 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/utf8.h>
diff --git a/src/polypcore/source.c b/src/polypcore/source.c
index fca281a79..4d96622bf 100644
--- a/src/polypcore/source.c
+++ b/src/polypcore/source.c
@@ -28,9 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/source-output.h>
 #include <polypcore/namereg.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/sample-util.h>
diff --git a/src/polypcore/strbuf.c b/src/polypcore/strbuf.c
index dcad5e78d..d1517a11e 100644
--- a/src/polypcore/strbuf.c
+++ b/src/polypcore/strbuf.c
@@ -30,7 +30,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "strbuf.h"
 
diff --git a/src/polypcore/strlist.c b/src/polypcore/strlist.c
index e165aefdd..4d70e9e99 100644
--- a/src/polypcore/strlist.c
+++ b/src/polypcore/strlist.c
@@ -26,7 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/strbuf.h>
 #include <polypcore/util.h>
 
diff --git a/src/polypcore/tagstruct.c b/src/polypcore/tagstruct.c
index 86b8368a3..27582cae1 100644
--- a/src/polypcore/tagstruct.c
+++ b/src/polypcore/tagstruct.c
@@ -36,7 +36,7 @@
 
 #include "winsock.h"
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "tagstruct.h"
 
diff --git a/src/polypcore/tokenizer.c b/src/polypcore/tokenizer.c
index 556a190a0..667643fe6 100644
--- a/src/polypcore/tokenizer.c
+++ b/src/polypcore/tokenizer.c
@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/dynarray.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/gccmacro.h>
 
 #include "tokenizer.h"
diff --git a/src/polypcore/utf8.c b/src/polypcore/utf8.c
index bb8621e23..01fbfccd1 100644
--- a/src/polypcore/utf8.c
+++ b/src/polypcore/utf8.c
@@ -33,8 +33,9 @@
 #include <inttypes.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include "utf8.h"
-#include "xmalloc.h"
 
 #define FILTER_CHAR '_'
 
diff --git a/src/polypcore/util.c b/src/polypcore/util.c
index 6f7f88198..9783b7461 100644
--- a/src/polypcore/util.c
+++ b/src/polypcore/util.c
@@ -70,7 +70,8 @@
 
 #include "winsock.h"
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 
 #include "util.h"
diff --git a/src/polypcore/x11wrap.c b/src/polypcore/x11wrap.c
index c1ca83ca2..41a407645 100644
--- a/src/polypcore/x11wrap.c
+++ b/src/polypcore/x11wrap.c
@@ -22,8 +22,9 @@
 #include <assert.h>
 #include <stdio.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/llist.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/props.h>
 
diff --git a/src/tests/strlist-test.c b/src/tests/strlist-test.c
index 145431126..415c94e6a 100644
--- a/src/tests/strlist-test.c
+++ b/src/tests/strlist-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
+#include <polyp/xmalloc.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[]) {
diff --git a/src/tests/utf8-test.c b/src/tests/utf8-test.c
index c8b2fabb7..57f445c7e 100644
--- a/src/tests/utf8-test.c
+++ b/src/tests/utf8-test.c
@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
 #include <polypcore/utf8.h>
-#include <polypcore/xmalloc.h>
 
 int main(int argc, char *argv[]) {
     char *c;