diff --git a/src/timedate/hwclock-util.c b/src/timedate/hwclock-util.c
index 76a10f40b2..0a0045d2e0 100644
--- a/src/timedate/hwclock-util.c
+++ b/src/timedate/hwclock-util.c
@@ -3,7 +3,7 @@
 #include <fcntl.h>
 #include <linux/rtc.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
+#include <time.h>
 
 #include "errno-util.h"
 #include "fd-util.h"
diff --git a/src/timedate/hwclock-util.h b/src/timedate/hwclock-util.h
index 1503b5cf1f..ad24dad3a7 100644
--- a/src/timedate/hwclock-util.h
+++ b/src/timedate/hwclock-util.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <time.h>
+#include "forward.h"
 
 int hwclock_get(struct tm *tm);
 int hwclock_set(const struct tm *tm);
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 02ee9c226e..78b4feaebe 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -3,10 +3,10 @@
 #include <getopt.h>
 #include <locale.h>
 #include <math.h>
-#include <stdbool.h>
 #include <stdlib.h>
 
 #include "sd-bus.h"
+#include "sd-event.h"
 
 #include "alloc-util.h"
 #include "build.h"
@@ -23,10 +23,13 @@
 #include "parse-util.h"
 #include "polkit-agent.h"
 #include "pretty-print.h"
+#include "runtime-scope.h"
 #include "sparse-endian.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "verbs.h"
 
 static PagerFlags arg_pager_flags = 0;
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 8d8495a6e2..40bba14a31 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/timex.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
@@ -25,25 +24,26 @@
 #include "conf-files.h"
 #include "constants.h"
 #include "daemon-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "hashmap.h"
 #include "hwclock-util.h"
+#include "label-util.h"
 #include "list.h"
 #include "log.h"
 #include "log-context.h"
 #include "main-func.h"
 #include "memory-util.h"
 #include "path-util.h"
-#include "selinux-util.h"
 #include "service-util.h"
-#include "signal-util.h"
+#include "set.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "unit-def.h"
 #include "unit-name.h"
-#include "user-util.h"
 
 #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n"
 #define NULL_ADJTIME_LOCAL "0.0 0 0\n0\nLOCAL\n"