diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
index 9be6877a55..633cfd015b 100644
--- a/lib/dns/tests/db_test.c
+++ b/lib/dns/tests/db_test.c
@@ -23,6 +23,8 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
+
 #include <dns/db.h>
 #include <dns/dbiterator.h>
 #include <dns/journal.h>
diff --git a/lib/dns/tests/dbdiff_test.c b/lib/dns/tests/dbdiff_test.c
index 6b2bc1ab25..e1f39d667c 100644
--- a/lib/dns/tests/dbdiff_test.c
+++ b/lib/dns/tests/dbdiff_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <dns/db.h>
diff --git a/lib/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c
index 81fa3ab5b2..14b57e64a9 100644
--- a/lib/dns/tests/dbiterator_test.c
+++ b/lib/dns/tests/dbiterator_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <dns/db.h>
diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c
index 16e8bbae66..128ccfd9a5 100644
--- a/lib/dns/tests/dbversion_test.c
+++ b/lib/dns/tests/dbversion_test.c
@@ -25,10 +25,11 @@
 #include <cmocka.h>
 
 #include <isc/file.h>
+#include <isc/msgcat.h>
+#include <isc/print.h>
 #include <isc/result.h>
 #include <isc/serial.h>
 #include <isc/stdtime.h>
-#include <isc/msgcat.h>
 #include <isc/string.h>
 #include <isc/util.h>
 
diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c
index 57cf64612f..96d28034d4 100644
--- a/lib/dns/tests/dh_test.c
+++ b/lib/dns/tests/dh_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 #include <isc/string.h>
 
diff --git a/lib/dns/tests/dispatch_test.c b/lib/dns/tests/dispatch_test.c
index f54e92dc40..dab6e5d211 100644
--- a/lib/dns/tests/dispatch_test.c
+++ b/lib/dns/tests/dispatch_test.c
@@ -28,6 +28,7 @@
 
 #include <isc/app.h>
 #include <isc/buffer.h>
+#include <isc/print.h>
 #include <isc/socket.h>
 #include <isc/task.h>
 #include <isc/timer.h>
diff --git a/lib/dns/tests/dst_test.c b/lib/dns/tests/dst_test.c
index 6e47e3a138..02ddc7431e 100644
--- a/lib/dns/tests/dst_test.c
+++ b/lib/dns/tests/dst_test.c
@@ -27,6 +27,7 @@
 #include <isc/util.h>
 
 #include <isc/file.h>
+#include <isc/print.h>
 #include <isc/util.h>
 #include <isc/stdio.h>
 #include <isc/string.h>
diff --git a/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c
index f74c57c451..64533f0caf 100644
--- a/lib/dns/tests/keytable_test.c
+++ b/lib/dns/tests/keytable_test.c
@@ -28,6 +28,7 @@
 
 #include <isc/base64.h>
 #include <isc/buffer.h>
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <dns/name.h>
diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c
index e313f7a8bc..49579a1317 100644
--- a/lib/dns/tests/nsec3_test.c
+++ b/lib/dns/tests/nsec3_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 #include <isc/string.h>
 
diff --git a/lib/dns/tests/peer_test.c b/lib/dns/tests/peer_test.c
index 8155e2c692..bff6f43c15 100644
--- a/lib/dns/tests/peer_test.c
+++ b/lib/dns/tests/peer_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <dns/peer.h>
diff --git a/lib/dns/tests/private_test.c b/lib/dns/tests/private_test.c
index 517bb1a147..243d5370c8 100644
--- a/lib/dns/tests/private_test.c
+++ b/lib/dns/tests/private_test.c
@@ -26,6 +26,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 #include <isc/buffer.h>
 
diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c
index 213bd6a3ad..1ab3dae4b1 100644
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -27,6 +27,7 @@
 
 #include <isc/hex.h>
 #include <isc/lex.h>
+#include <isc/print.h>
 #include <isc/stdio.h>
 #include <isc/types.h>
 #include <isc/util.h>
diff --git a/lib/dns/tests/rdataset_test.c b/lib/dns/tests/rdataset_test.c
index 36d4e2dc4e..c828fc5e82 100644
--- a/lib/dns/tests/rdataset_test.c
+++ b/lib/dns/tests/rdataset_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <dns/rdataset.h>
diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index 0bf87a6e56..213bf50cf9 100644
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -25,6 +25,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <dns/db.h>
diff --git a/lib/dns/tests/time_test.c b/lib/dns/tests/time_test.c
index e51239bc39..204766ddd4 100644
--- a/lib/dns/tests/time_test.c
+++ b/lib/dns/tests/time_test.c
@@ -26,6 +26,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <dns/time.h>
diff --git a/lib/dns/tests/update_test.c b/lib/dns/tests/update_test.c
index 94f9c97923..1d7907a88e 100644
--- a/lib/dns/tests/update_test.c
+++ b/lib/dns/tests/update_test.c
@@ -27,6 +27,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/serial.h>
 #include <isc/stdtime.h>
 #include <isc/util.h>
diff --git a/lib/dns/tests/zonemgr_test.c b/lib/dns/tests/zonemgr_test.c
index be856b2314..f458f3c95f 100644
--- a/lib/dns/tests/zonemgr_test.c
+++ b/lib/dns/tests/zonemgr_test.c
@@ -25,6 +25,7 @@
 #include <cmocka.h>
 
 #include <isc/buffer.h>
+#include <isc/print.h>
 #include <isc/task.h>
 #include <isc/timer.h>
 #include <isc/util.h>
diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c
index 3afa82d267..137b739276 100644
--- a/lib/irs/tests/resconf_test.c
+++ b/lib/irs/tests/resconf_test.c
@@ -26,6 +26,7 @@
 #include <cmocka.h>
 
 #include <isc/mem.h>
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include <irs/types.h>
diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index df734dd9c3..76530e7325 100644
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -27,6 +27,7 @@
 #include <isc/buffer.h>
 #include <isc/hex.h>
 #include <isc/platform.h>
+#include <isc/print.h>
 #include <isc/region.h>
 #include <isc/string.h>
 #include <isc/util.h>
diff --git a/lib/isc/tests/counter_test.c b/lib/isc/tests/counter_test.c
index 28c1fbb355..d70d8ee0d1 100644
--- a/lib/isc/tests/counter_test.c
+++ b/lib/isc/tests/counter_test.c
@@ -24,6 +24,7 @@
 #include <cmocka.h>
 
 #include <isc/counter.h>
+#include <isc/print.h>
 #include <isc/result.h>
 #include <isc/util.h>
 
diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c
index 4ba2532896..c2d25cffa6 100644
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -24,6 +24,7 @@
 #include <cmocka.h>
 
 #include <isc/errno.h>
+#include <isc/print.h>
 #include <isc/result.h>
 #include <isc/util.h>
 
diff --git a/lib/isc/tests/file_test.c b/lib/isc/tests/file_test.c
index 86bc1ea774..3db0a62cd4 100644
--- a/lib/isc/tests/file_test.c
+++ b/lib/isc/tests/file_test.c
@@ -26,6 +26,7 @@
 #include <cmocka.h>
 
 #include <isc/file.h>
+#include <isc/print.h>
 #include <isc/result.h>
 #include <isc/util.h>
 
diff --git a/lib/isc/tests/heap_test.c b/lib/isc/tests/heap_test.c
index a38a1b0018..3520901b91 100644
--- a/lib/isc/tests/heap_test.c
+++ b/lib/isc/tests/heap_test.c
@@ -29,6 +29,7 @@
 
 #include <isc/heap.h>
 #include <isc/mem.h>
+#include <isc/print.h>
 #include <isc/util.h>
 
 struct e {
diff --git a/lib/isc/tests/inet_ntop_test.c b/lib/isc/tests/inet_ntop_test.c
index 3c44683e5e..d2959055df 100644
--- a/lib/isc/tests/inet_ntop_test.c
+++ b/lib/isc/tests/inet_ntop_test.c
@@ -21,6 +21,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/util.h>
 
 /*
diff --git a/lib/isc/tests/lex_test.c b/lib/isc/tests/lex_test.c
index cb485f6706..fc843961a0 100644
--- a/lib/isc/tests/lex_test.c
+++ b/lib/isc/tests/lex_test.c
@@ -27,6 +27,7 @@
 #include <isc/buffer.h>
 #include <isc/lex.h>
 #include <isc/mem.h>
+#include <isc/print.h>
 #include <isc/util.h>
 
 /* check handling of 0xff */
diff --git a/lib/isc/tests/netaddr_test.c b/lib/isc/tests/netaddr_test.c
index 875d501e18..8465ca0880 100644
--- a/lib/isc/tests/netaddr_test.c
+++ b/lib/isc/tests/netaddr_test.c
@@ -25,6 +25,7 @@
 #include <cmocka.h>
 
 #include <isc/netaddr.h>
+#include <isc/print.h>
 #include <isc/sockaddr.h>
 #include <isc/util.h>
 
diff --git a/lib/isc/tests/parse_test.c b/lib/isc/tests/parse_test.c
index b0f232d48a..dd6533c1c3 100644
--- a/lib/isc/tests/parse_test.c
+++ b/lib/isc/tests/parse_test.c
@@ -29,6 +29,7 @@
 #include <cmocka.h>
 
 #include <isc/parseint.h>
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include "isctest.h"
diff --git a/lib/isc/tests/pool_test.c b/lib/isc/tests/pool_test.c
index 2e6c75044f..69f8003eb4 100644
--- a/lib/isc/tests/pool_test.c
+++ b/lib/isc/tests/pool_test.c
@@ -26,6 +26,7 @@
 
 #include <isc/mem.h>
 #include <isc/pool.h>
+#include <isc/print.h>
 #include <isc/util.h>
 
 #include "isctest.h"
diff --git a/lib/isc/tests/queue_test.c b/lib/isc/tests/queue_test.c
index de10a54262..45b56be7cf 100644
--- a/lib/isc/tests/queue_test.c
+++ b/lib/isc/tests/queue_test.c
@@ -25,6 +25,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/queue.h>
 #include <isc/util.h>
 
diff --git a/lib/isc/tests/radix_test.c b/lib/isc/tests/radix_test.c
index a8345249ec..bbe462c6c5 100644
--- a/lib/isc/tests/radix_test.c
+++ b/lib/isc/tests/radix_test.c
@@ -25,6 +25,7 @@
 
 #include <isc/mem.h>
 #include <isc/netaddr.h>
+#include <isc/print.h>
 #include <isc/radix.h>
 #include <isc/result.h>
 #include <isc/util.h>
diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c
index ac01b086eb..8063e4513c 100644
--- a/lib/isc/tests/safe_test.c
+++ b/lib/isc/tests/safe_test.c
@@ -25,6 +25,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/safe.h>
 #include <isc/util.h>
 
diff --git a/lib/isc/tests/taskpool_test.c b/lib/isc/tests/taskpool_test.c
index 3ea3728280..ca2bd44549 100644
--- a/lib/isc/tests/taskpool_test.c
+++ b/lib/isc/tests/taskpool_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/task.h>
 #include <isc/taskpool.h>
 #include <isc/util.h>
diff --git a/lib/isc/tests/time_test.c b/lib/isc/tests/time_test.c
index 50afbc441e..040c422f38 100644
--- a/lib/isc/tests/time_test.c
+++ b/lib/isc/tests/time_test.c
@@ -24,6 +24,7 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
 #include <isc/time.h>
 #include <isc/result.h>
 #include <isc/util.h>
diff --git a/lib/isccfg/tests/parser_test.c b/lib/isccfg/tests/parser_test.c
index 9cadf19a46..16dfef4106 100644
--- a/lib/isccfg/tests/parser_test.c
+++ b/lib/isccfg/tests/parser_test.c
@@ -29,6 +29,7 @@
 #include <isc/lex.h>
 #include <isc/log.h>
 #include <isc/mem.h>
+#include <isc/print.h>
 #include <isc/types.h>
 #include <isc/util.h>
 
diff --git a/lib/ns/tests/query_test.c b/lib/ns/tests/query_test.c
index 0261c81d89..5e3c52bd6b 100644
--- a/lib/ns/tests/query_test.c
+++ b/lib/ns/tests/query_test.c
@@ -25,12 +25,14 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/print.h>
+#include <isc/util.h>
+
 #include <dns/badcache.h>
 #include <dns/view.h>
-#include <isc/util.h>
+
 #include <ns/client.h>
 #include <ns/query.h>
-#include <isc/util.h>
 
 #include "../hooks.h"