6 files changed, 5 insertions, 2 deletions
diff --git a/src/polypcore/authkey.c b/src/polypcore/authkey.c
index 1231c7a2..aee54fd4 100644
--- a/src/polypcore/authkey.c
+++ b/src/polypcore/authkey.c
@@ -35,6 +35,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#include <polyp/util.h>
 #include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/random.h>
diff --git a/src/polypcore/core-scache.c b/src/polypcore/core-scache.c
index 1ee3361f..5cb38bee 100644
--- a/src/polypcore/core-scache.c
+++ b/src/polypcore/core-scache.c
@@ -44,6 +44,7 @@
 #include <polyp/mainloop.h>
 #include <polyp/channelmap.h>
 #include <polyp/timeval.h>
+#include <polyp/util.h>
 #include <polyp/volume.h>
 #include <polyp/xmalloc.h>
 
diff --git a/src/polypcore/core-util.h b/src/polypcore/core-util.h
index d3db756f..989f8c16 100644
--- a/src/polypcore/core-util.h
+++ b/src/polypcore/core-util.h
@@ -28,7 +28,6 @@
 #include <stdio.h>
 
 #include <polypcore/gccmacro.h>
-#include <polyp/util.h>
 
 struct timeval;
 
diff --git a/src/polypcore/parseaddr.c b/src/polypcore/parseaddr.c
index b2c7d1c7..d0687b05 100644
--- a/src/polypcore/parseaddr.c
+++ b/src/polypcore/parseaddr.c
@@ -29,6 +29,7 @@
 
 #include <polyp/xmalloc.h>
 
+#include <polyp/util.h>
 #include <polypcore/core-util.h>
 
 #include "parseaddr.h"
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index 0a408c6d..a300c45d 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -32,6 +32,7 @@
 #include <polyp/timeval.h>
 #include <polyp/version.h>
 #include <polyp/utf8.h>
+#include <polyp/util.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
@@ -46,7 +47,6 @@
 #include <polypcore/authkey.h>
 #include <polypcore/namereg.h>
 #include <polypcore/core-scache.h>
-#include <polypcore/core-util.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/autoload.h>
diff --git a/src/polypcore/socket-server.c b/src/polypcore/socket-server.c
index 96f8e073..592b6a63 100644
--- a/src/polypcore/socket-server.c
+++ b/src/polypcore/socket-server.c
@@ -63,6 +63,7 @@
 #include "winsock.h"
 
 #include <polyp/xmalloc.h>
+#include <polyp/util.h>
 
 #include <polypcore/socket-util.h>
 #include <polypcore/core-util.h>