diff --git a/bin/tests/ratelimiter_test.c b/bin/tests/ratelimiter_test.c
index 17508ca480..1b55e99b80 100644
--- a/bin/tests/ratelimiter_test.c
+++ b/bin/tests/ratelimiter_test.c
@@ -27,6 +27,7 @@
 #include <isc/task.h>
 #include <isc/thread.h>
 #include <isc/result.h>
+#include <isc/time.h>
 #include <isc/timer.h>
 #include <isc/ratelimiter.h>
 #include <isc/util.h>
diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index 2a9d855f76..89fee56599 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -25,15 +25,15 @@
 #include <isc/error.h>
 #include <isc/mem.h>
 #include <isc/task.h>
+#include <isc/time.h>
+#include <isc/timer.h>
 #include <isc/thread.h>
 #include <isc/result.h>
-#include <isc/timer.h>
 
 isc_mem_t *mctx = NULL;
 
 static void
-my_callback(isc_task_t *task, isc_event_t *event)
-{
+my_callback(isc_task_t *task, isc_event_t *event) {
 	int i, j;
 	char *name = event->ev_arg;
 
@@ -53,8 +53,7 @@ my_shutdown(isc_task_t *task, isc_event_t *event) {
 }
 
 static void
-my_tick(isc_task_t *task, isc_event_t *event)
-{
+my_tick(isc_task_t *task, isc_event_t *event) {
 	char *name = event->ev_arg;
 
 	printf("task %p tick %s\n", task, name);
diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index bd76323590..40c0f95ca4 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -27,8 +27,9 @@
 #include <isc/mem.h>
 #include <isc/task.h>
 #include <isc/thread.h>
-#include <isc/result.h>
+#include <isc/time.h>
 #include <isc/timer.h>
+#include <isc/result.h>
 
 isc_mem_t *mctx1, *mctx2, *mctx3;
 isc_task_t *t1, *t2, *t3;
@@ -44,8 +45,7 @@ shutdown_task(isc_task_t *task, isc_event_t *event) {
 }
 
 static void
-tick(isc_task_t *task, isc_event_t *event)
-{
+tick(isc_task_t *task, isc_event_t *event) {
 	char *name = event->ev_arg;
 
 	INSIST(event->ev_type == ISC_TIMEREVENT_TICK);
@@ -73,8 +73,7 @@ tick(isc_task_t *task, isc_event_t *event)
 }
 
 static void
-timeout(isc_task_t *task, isc_event_t *event)
-{
+timeout(isc_task_t *task, isc_event_t *event) {
 	char *name = event->ev_arg;
 	char *type;