diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index eddcb3b80..70d750384 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -32,6 +32,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <polyp/util.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/module.h>
diff --git a/src/polyp/stream.c b/src/polyp/stream.c
index ad6c9e43c..2e1680452 100644
--- a/src/polyp/stream.c
+++ b/src/polyp/stream.c
@@ -29,10 +29,10 @@
 #include <string.h>
 
 #include <polyp/def.h>
+#include <polyp/timeval.h>
 #include <polyp/xmalloc.h>
 
 #include <polypcore/pstream-util.h>
-#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/hashmap.h>
 
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index ee0cb8452..668361c6f 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -31,6 +31,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <polyp/util.h>
+
 #include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/authkey.h>