11 files changed, 11 insertions, 12 deletions
diff --git a/src/polyp/browser.c b/src/polyp/browser.c
index 5442fd4c..69760d8d 100644
--- a/src/polyp/browser.c
+++ b/src/polyp/browser.c
@@ -25,7 +25,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "browser.h"
 
diff --git a/src/polyp/channelmap.c b/src/polyp/channelmap.c
index ddd7b3ce..653331ba 100644
--- a/src/polyp/channelmap.c
+++ b/src/polyp/channelmap.c
@@ -29,8 +29,7 @@
 #include <string.h>
 
 #include <polyp/xmalloc.h>
-
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "channelmap.h"
 
diff --git a/src/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c
index 17ee2d6a..fb67df2f 100644
--- a/src/polyp/client-conf-x11.c
+++ b/src/polyp/client-conf-x11.c
@@ -33,7 +33,7 @@
 
 #include <polypcore/x11prop.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "client-conf-x11.h"
 
diff --git a/src/polyp/client-conf.c b/src/polyp/client-conf.c
index 567d2ae4..1ebcff43 100644
--- a/src/polyp/client-conf.c
+++ b/src/polyp/client-conf.c
@@ -33,7 +33,7 @@
 
 #include <polypcore/log.h>
 #include <polypcore/conf-parser.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/authkey.h>
 
 #include "client-conf.h"
diff --git a/src/polyp/context.c b/src/polyp/context.c
index 3c46e2e8..a3b49d4b 100644
--- a/src/polyp/context.c
+++ b/src/polyp/context.c
@@ -56,7 +56,7 @@
 #include <polypcore/dynarray.h>
 #include <polypcore/socket-client.h>
 #include <polypcore/pstream-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.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 bc5df3a9..51d437d2 100644
--- a/src/polyp/glib-mainloop.c
+++ b/src/polyp/glib-mainloop.c
@@ -28,7 +28,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/idxset.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "glib.h"
 #include "glib-mainloop.h"
diff --git a/src/polyp/glib12-mainloop.c b/src/polyp/glib12-mainloop.c
index 7af21210..f7459f19 100644
--- a/src/polyp/glib12-mainloop.c
+++ b/src/polyp/glib12-mainloop.c
@@ -28,7 +28,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/idxset.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "glib-mainloop.h"
 
diff --git a/src/polyp/mainloop-signal.c b/src/polyp/mainloop-signal.c
index a225f78b..c57437b6 100644
--- a/src/polyp/mainloop-signal.c
+++ b/src/polyp/mainloop-signal.c
@@ -38,7 +38,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/gccmacro.h>
 
diff --git a/src/polyp/mainloop.c b/src/polyp/mainloop.c
index 82e789c5..8f44c180 100644
--- a/src/polyp/mainloop.c
+++ b/src/polyp/mainloop.c
@@ -46,7 +46,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/idxset.h>
 #include <polypcore/log.h>
 
diff --git a/src/polyp/stream.c b/src/polyp/stream.c
index f188e788..ad6c9e43 100644
--- a/src/polyp/stream.c
+++ b/src/polyp/stream.c
@@ -32,7 +32,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/pstream-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/hashmap.h>
 
diff --git a/src/polyp/xmalloc.c b/src/polyp/xmalloc.c
index 1deeebd8..ffc7f7c8 100644
--- a/src/polyp/xmalloc.c
+++ b/src/polyp/xmalloc.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/gccmacro.h>
 
 #include "xmalloc.h"