diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c
index 906277af0d..2bcd86cc30 100644
--- a/bin/dnssec/dnssec-makekeyset.c
+++ b/bin/dnssec/dnssec-makekeyset.c
@@ -30,6 +30,7 @@
 #include <isc/mem.h>
 #include <isc/stdtime.h>
 #include <isc/list.h>
+#include <isc/util.h>
 
 #include <dns/types.h>
 #include <dns/name.h>
diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c
index f694e29438..752cc851f5 100644
--- a/bin/dnssec/dnssec-signkey.c
+++ b/bin/dnssec/dnssec-signkey.c
@@ -30,6 +30,7 @@
 #include <isc/mem.h>
 #include <isc/stdtime.h>
 #include <isc/list.h>
+#include <isc/util.h>
 
 #include <dns/types.h>
 #include <dns/name.h>
diff --git a/bin/tests/keysettool.c b/bin/tests/keysettool.c
index 906277af0d..2bcd86cc30 100644
--- a/bin/tests/keysettool.c
+++ b/bin/tests/keysettool.c
@@ -30,6 +30,7 @@
 #include <isc/mem.h>
 #include <isc/stdtime.h>
 #include <isc/list.h>
+#include <isc/util.h>
 
 #include <dns/types.h>
 #include <dns/name.h>
diff --git a/bin/tests/keysigner.c b/bin/tests/keysigner.c
index f694e29438..752cc851f5 100644
--- a/bin/tests/keysigner.c
+++ b/bin/tests/keysigner.c
@@ -30,6 +30,7 @@
 #include <isc/mem.h>
 #include <isc/stdtime.h>
 #include <isc/list.h>
+#include <isc/util.h>
 
 #include <dns/types.h>
 #include <dns/name.h>
diff --git a/bin/tests/lex_test.c b/bin/tests/lex_test.c
index 78be9c3172..626c01d8ab 100644
--- a/bin/tests/lex_test.c
+++ b/bin/tests/lex_test.c
@@ -27,6 +27,7 @@
 #include <isc/lex.h>
 #include <isc/mem.h>
 #include <isc/result.h>
+#include <isc/util.h>
 
 isc_mem_t *mctx;
 isc_lex_t *lex;
diff --git a/bin/tests/lwres_test.c b/bin/tests/lwres_test.c
index f7eed98b4a..b8f33456f7 100644
--- a/bin/tests/lwres_test.c
+++ b/bin/tests/lwres_test.c
@@ -27,6 +27,7 @@
 #include <isc/error.h>
 #include <isc/mem.h>
 #include <isc/netaddr.h>
+#include <isc/util.h>
 
 #include <lwres/context.h>
 #include <lwres/lwbuffer.h>
diff --git a/bin/tests/lwresconf_test.c b/bin/tests/lwresconf_test.c
index 07f264381f..fbcf2e05d5 100644
--- a/bin/tests/lwresconf_test.c
+++ b/bin/tests/lwresconf_test.c
@@ -27,6 +27,7 @@
 #include <isc/error.h>
 #include <isc/mem.h>
 #include <isc/netaddr.h>
+#include <isc/util.h>
 
 #include <lwres/context.h>
 #include <lwres/lwbuffer.h>
diff --git a/bin/tests/mempool_test.c b/bin/tests/mempool_test.c
index b904abb97d..da56d5ae12 100644
--- a/bin/tests/mempool_test.c
+++ b/bin/tests/mempool_test.c
@@ -26,6 +26,7 @@
 #include <isc/mem.h>
 #include <isc/mutex.h>
 #include <isc/result.h>
+#include <isc/util.h>
 
 isc_mem_t *mctx;
 
diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c
index f254cf4e58..6d5ef36b98 100644
--- a/bin/tests/name_test.c
+++ b/bin/tests/name_test.c
@@ -26,6 +26,7 @@
 #include <isc/commandline.h>
 #include <isc/boolean.h>
 #include <isc/region.h>
+#include <isc/util.h>
 
 #include <dns/types.h>
 #include <dns/result.h>
diff --git a/bin/tests/nconf_test.c b/bin/tests/nconf_test.c
index 39d2e9b4bb..2d646bdab9 100644
--- a/bin/tests/nconf_test.c
+++ b/bin/tests/nconf_test.c
@@ -24,6 +24,7 @@
 #include <string.h>
 
 #include <isc/mem.h>
+#include <isc/util.h>
 
 #include <dns/log.h>
 #include <dns/namedconf.h>
diff --git a/bin/tests/ndcconf_test.c b/bin/tests/ndcconf_test.c
index f126ef975e..46d1c5b948 100644
--- a/bin/tests/ndcconf_test.c
+++ b/bin/tests/ndcconf_test.c
@@ -25,6 +25,7 @@
 
 #include <isc/mem.h>
 #include <isc/error.h>
+#include <isc/util.h>
 
 #include <dns/log.h>
 #include <dns/confndc.h>
diff --git a/bin/tests/rdata_test.c b/bin/tests/rdata_test.c
index 6557b19f67..3e6539795f 100644
--- a/bin/tests/rdata_test.c
+++ b/bin/tests/rdata_test.c
@@ -26,6 +26,7 @@
 #include <isc/commandline.h>
 #include <isc/error.h>
 #include <isc/lex.h>
+#include <isc/util.h>
 
 #include <dns/rdata.h>
 #include <dns/compress.h>
diff --git a/bin/tests/rwlock_test.c b/bin/tests/rwlock_test.c
index c30b9932b2..77f8d572f4 100644
--- a/bin/tests/rwlock_test.c
+++ b/bin/tests/rwlock_test.c
@@ -27,6 +27,7 @@
 #include <isc/thread.h>
 #include <isc/result.h>
 #include <isc/rwlock.h>
+#include <isc/util.h>
 
 isc_rwlock_t lock;
 
diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c
index ea5c280545..b7e9d3179d 100644
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/shutdown_test.c
@@ -34,6 +34,7 @@
 #include <isc/event.h>
 #include <isc/eventclass.h>
 #include <isc/app.h>
+#include <isc/util.h>
 
 typedef struct {
 	isc_mem_t *	mctx;
diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index b4e8239c2a..f9c9c28c9a 100644
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -31,6 +31,7 @@
 #include <isc/socket.h>
 #include <isc/timer.h>
 #include <isc/net.h>
+#include <isc/util.h>
 
 isc_mem_t *mctx;
 isc_taskmgr_t *manager;
diff --git a/bin/tests/sym_test.c b/bin/tests/sym_test.c
index 3210e7886f..cbb657c5e9 100644
--- a/bin/tests/sym_test.c
+++ b/bin/tests/sym_test.c
@@ -26,6 +26,7 @@
 #include <isc/error.h>
 #include <isc/result.h>
 #include <isc/symtab.h>
+#include <isc/util.h>
 
 isc_mem_t *mctx;
 isc_symtab_t *st;
diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index 89fee56599..c5a5908fd3 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -29,6 +29,7 @@
 #include <isc/timer.h>
 #include <isc/thread.h>
 #include <isc/result.h>
+#include <isc/util.h>
 
 isc_mem_t *mctx = NULL;
 
diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index 40c0f95ca4..af3798d2e9 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -30,6 +30,7 @@
 #include <isc/time.h>
 #include <isc/timer.h>
 #include <isc/result.h>
+#include <isc/util.h>
 
 isc_mem_t *mctx1, *mctx2, *mctx3;
 isc_task_t *t1, *t2, *t3;
diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index da1c9fdb99..9ab4675c6e 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -26,6 +26,7 @@
 #include <isc/error.h>
 #include <isc/boolean.h>
 #include <isc/region.h>
+#include <isc/util.h>
 
 #include <dns/types.h>
 #include <dns/result.h>
diff --git a/bin/tests/zone2_test.c b/bin/tests/zone2_test.c
index 8d3ac66400..788f9f3cbe 100644
--- a/bin/tests/zone2_test.c
+++ b/bin/tests/zone2_test.c
@@ -25,6 +25,7 @@
 #include <isc/assertions.h>
 #include <isc/error.h>
 #include <isc/mem.h>
+#include <isc/util.h>
 
 #include <dns/confparser.h>
 #include <dns/journal.h>
diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c
index 47bfa92c60..3a3d7f4575 100644
--- a/bin/tests/zone_test.c
+++ b/bin/tests/zone_test.c
@@ -25,6 +25,7 @@
 #include <isc/app.h>
 #include <isc/socket.h>
 #include <isc/timer.h>
+#include <isc/util.h>
 
 #include <dns/db.h>
 #include <dns/zone.h>