diff --git a/src/Makefile.am b/src/Makefile.am
index afbdedee1..72db5f80e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -313,6 +313,7 @@ polypinclude_HEADERS = \
 		polyp/subscribe.h \
 		polyp/version.h \
 		polyp/sample.h \
+		polyp/utf8.h \
 		polyp/volume.h \
 		polyp/xmalloc.h
 
@@ -358,6 +359,7 @@ libpolyp_la_SOURCES = \
 		polyp/subscribe.c polyp/subscribe.h \
 		polyp/sample.c polyp/sample.h \
 		polyp/volume.c polyp/volume.h \
+		polyp/utf8.c polyp/utf8.h \
 		polyp/mainloop.c polyp/mainloop.h \
 		polyp/mainloop-signal.c polyp/mainloop-signal.h \
 		polyp/thread-mainloop.c polyp/thread-mainloop.h \
@@ -485,8 +487,7 @@ polypcoreinclude_HEADERS = \
 		polypcore/source-output.h \
 		polypcore/strbuf.h \
 		polypcore/tokenizer.h \
-		polypcore/util.h \
-		polypcore/utf8.h
+		polypcore/util.h
 
 lib_LTLIBRARIES += libpolypcore.la
 
@@ -498,6 +499,7 @@ libpolypcore_la_SOURCES = \
 		polyp/mainloop-signal.c polyp/mainloop-signal.h \
 		polyp/sample.c polyp/sample.h \
 		polyp/volume.c polyp/volume.h \
+		polyp/utf8.c polyp/utf8.h \
 		polyp/xmalloc.c polyp/xmalloc.h
 
 # Pure core stuff (some are shared in libpolyp though).
@@ -546,8 +548,7 @@ libpolypcore_la_SOURCES += \
 		polypcore/strbuf.c polypcore/strbuf.h \
 		polypcore/tokenizer.c polypcore/tokenizer.h \
 		polypcore/util.c polypcore/util.h \
-		polypcore/winsock.h \
-		polypcore/utf8.c polypcore/utf8.h
+		polypcore/winsock.h
 
 if OS_IS_WIN32
 libpolypcore_la_SOURCES += \
diff --git a/src/polypcore/utf8.c b/src/polyp/utf8.c
similarity index 99%
rename from src/polypcore/utf8.c
rename to src/polyp/utf8.c
index 01fbfccd1..bb8621e23 100644
--- a/src/polypcore/utf8.c
+++ b/src/polyp/utf8.c
@@ -33,9 +33,8 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
-
 #include "utf8.h"
+#include "xmalloc.h"
 
 #define FILTER_CHAR '_'
 
diff --git a/src/polypcore/utf8.h b/src/polyp/utf8.h
similarity index 100%
rename from src/polypcore/utf8.h
rename to src/polyp/utf8.h
diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c
index 86a8c9e3c..8f53694e7 100644
--- a/src/polypcore/protocol-esound.c
+++ b/src/polypcore/protocol-esound.c
@@ -31,6 +31,7 @@
 #include <limits.h>
 
 #include <polyp/sample.h>
+#include <polyp/utf8.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/esound.h>
@@ -46,7 +47,6 @@
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/utf8.h>
 
 #include "endianmacros.h"
 
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index b0ad59551..338db0020 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/utf8.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
@@ -53,7 +54,6 @@
 #include <polypcore/props.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/llist.h>
-#include <polypcore/utf8.h>
 
 #include "protocol-native.h"
 
diff --git a/src/polypcore/sink-input.c b/src/polypcore/sink-input.c
index 5c0caa211..bd2a1dcd1 100644
--- a/src/polypcore/sink-input.c
+++ b/src/polypcore/sink-input.c
@@ -28,12 +28,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/utf8.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/sample-util.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
-#include <polypcore/utf8.h>
 
 #include "sink-input.h"
 
diff --git a/src/polypcore/sink.c b/src/polypcore/sink.c
index a873c00a3..6931d396d 100644
--- a/src/polypcore/sink.c
+++ b/src/polypcore/sink.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 
 #include <polyp/introspect.h>
+#include <polyp/utf8.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/sink-input.h>
@@ -37,7 +38,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
-#include <polypcore/utf8.h>
 
 #include "sink.h"
 
diff --git a/src/polypcore/source-output.c b/src/polypcore/source-output.c
index c8db870b5..8ac3a33d4 100644
--- a/src/polypcore/source-output.c
+++ b/src/polypcore/source-output.c
@@ -28,11 +28,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/utf8.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
-#include <polypcore/utf8.h>
 
 #include "source-output.h"
 
diff --git a/src/polypcore/source.c b/src/polypcore/source.c
index 4d96622bf..c53bf079f 100644
--- a/src/polypcore/source.c
+++ b/src/polypcore/source.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/utf8.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/source-output.h>
@@ -35,7 +36,6 @@
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/utf8.h>
 
 #include "source.h"
 
diff --git a/src/tests/utf8-test.c b/src/tests/utf8-test.c
index 57f445c7e..2c21613e9 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/utf8.h>
 #include <polyp/xmalloc.h>
-#include <polypcore/utf8.h>
 
 int main(int argc, char *argv[]) {
     char *c;