diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index 12379df344..853635047d 100644
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "build.h"
 #include "main-func.h"
 #include "udev-util.h"
 
diff --git a/src/activate/activate.c b/src/activate/activate.c
index 24ebde0283..5934e7a57a 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -9,6 +9,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "env-util.h"
 #include "errno-util.h"
 #include "escape.h"
@@ -23,7 +24,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static char **arg_listen = NULL;
 static bool arg_accept = false;
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 6e47357a11..74556ac0f7 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -37,6 +37,7 @@
 #include "analyze-unit-paths.h"
 #include "analyze-compare-versions.h"
 #include "analyze-verify.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
@@ -79,7 +80,6 @@
 #include "time-util.h"
 #include "tmpfile-util.h"
 #include "unit-name.h"
-#include "util.h"
 #include "verb-log-control.h"
 #include "verbs.h"
 #include "version.h"
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 093533182f..a92adbfca5 100644
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "ask-password-api.h"
+#include "build.h"
 #include "def.h"
 #include "log.h"
 #include "macro.h"
diff --git a/src/basic/build.c b/src/basic/build.c
index 4a15f901d0..360ff1357b 100644
--- a/src/basic/build.c
+++ b/src/basic/build.c
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdio.h>
+
 #include "build.h"
+#include "macro.h"
 
 const char* const systemd_features =
 
@@ -226,3 +229,9 @@ const char* const systemd_features =
 
         " default-hierarchy=" DEFAULT_HIERARCHY_NAME
         ;
+
+int version(void) {
+        printf("systemd " STRINGIFY(PROJECT_VERSION) " (" GIT_VERSION ")\n%s\n",
+               systemd_features);
+        return 0;
+}
diff --git a/src/basic/build.h b/src/basic/build.h
index 87276bf686..27d44111d4 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -4,3 +4,5 @@
 #include "version.h"
 
 extern const char* const systemd_features;
+
+int version(void);
diff --git a/src/basic/util.c b/src/basic/util.c
index c63e2bb583..e5e61e66d8 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -20,9 +20,3 @@
 
 int saved_argc = 0;
 char **saved_argv = NULL;
-
-int version(void) {
-        printf("systemd " STRINGIFY(PROJECT_VERSION) " (" GIT_VERSION ")\n%s\n",
-               systemd_features);
-        return 0;
-}
diff --git a/src/basic/util.h b/src/basic/util.h
index f28fd2f327..95f71a66ed 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -65,5 +65,3 @@ static inline unsigned log2u_round_up(unsigned x) {
 
         return log2u(x - 1) + 1;
 }
-
-int version(void);
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 71cb56aa4a..3fc954f7c6 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -11,6 +11,7 @@
 
 #include "alloc-util.h"
 #include "binfmt-util.h"
+#include "build.h"
 #include "conf-files.h"
 #include "def.h"
 #include "fd-util.h"
diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
index 554a716d8a..b2dd60f8ad 100644
--- a/src/boot/bless-boot.c
+++ b/src/boot/bless-boot.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "bootspec.h"
+#include "build.h"
 #include "devnum-util.h"
 #include "efi-api.h"
 #include "efi-loader.h"
@@ -19,7 +20,6 @@
 #include "pretty-print.h"
 #include "sync-util.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 #include "virt.h"
 
diff --git a/src/boot/boot-check-no-failures.c b/src/boot/boot-check-no-failures.c
index 78642063c4..4ff91cb906 100644
--- a/src/boot/boot-check-no-failures.c
+++ b/src/boot/boot-check-no-failures.c
@@ -8,12 +8,12 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "log.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static int help(void) {
         _cleanup_free_ char *link = NULL;
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index b53df11764..79b2676537 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -15,6 +15,7 @@
 #include "alloc-util.h"
 #include "blkid-util.h"
 #include "bootspec.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "copy.h"
 #include "devnum-util.h"
@@ -53,7 +54,6 @@
 #include "tpm2-util.h"
 #include "umask-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "verbs.h"
 #include "virt.h"
 
diff --git a/src/boot/measure.c b/src/boot/measure.c
index 4f16acedf0..b9cd2853b6 100644
--- a/src/boot/measure.c
+++ b/src/boot/measure.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "efi-loader.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/boot/pcrphase.c b/src/boot/pcrphase.c
index 267f66767c..a77a85fb2e 100644
--- a/src/boot/pcrphase.c
+++ b/src/boot/pcrphase.c
@@ -4,6 +4,7 @@
 
 #include <sd-messages.h>
 
+#include "build.h"
 #include "efivars.h"
 #include "main-func.h"
 #include "openssl-util.h"
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index f57a5d605d..32c6ed7cac 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -5,6 +5,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 6af95204e3..a6ec6326f3 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -8,6 +8,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-util.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
@@ -21,7 +22,6 @@
 #include "pretty-print.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 static PagerFlags arg_pager_flags = 0;
 static OutputFlags arg_output_flags = OUTPUT_CGROUP_XATTRS | OUTPUT_CGROUP_ID;
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 95c3987525..cf51024dcb 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -10,6 +10,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "cgroup-show.h"
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 30ea08702e..9507374307 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -11,6 +11,7 @@
 #include "sd-messages.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
@@ -42,7 +43,6 @@
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "verbs.h"
 
 #define SHORT_BUS_CALL_TIMEOUT_USEC (3 * USEC_PER_SEC)
diff --git a/src/creds/creds.c b/src/creds/creds.c
index a755a52c34..3c86b10aab 100644
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "creds-util.h"
 #include "dirent-util.h"
 #include "escape.h"
diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index 6a9170f000..dbf6cf45af 100644
--- a/src/cryptenroll/cryptenroll.c
+++ b/src/cryptenroll/cryptenroll.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 
 #include "ask-password-api.h"
+#include "build.h"
 #include "cryptenroll-fido2.h"
 #include "cryptenroll-list.h"
 #include "cryptenroll-password.h"
diff --git a/src/delta/delta.c b/src/delta/delta.c
index a08d35e43c..da648bc837 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "dirent-util.h"
 #include "fd-util.h"
diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index af2a58b78d..b75e3c34ca 100644
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -6,10 +6,10 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "string-table.h"
-#include "util.h"
 #include "virt.h"
 
 static bool arg_quiet = false;
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index b30144ec2e..db7e788422 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -12,6 +12,7 @@
 
 #include "architecture.h"
 #include "blockdev-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "copy.h"
 #include "device-util.h"
@@ -42,7 +43,6 @@
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static enum {
         ACTION_DISSECT,
diff --git a/src/escape/escape.c b/src/escape/escape.c
index 0ad77f3f94..abbc08b37f 100644
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "log.h"
 #include "main-func.h"
 #include "path-util.h"
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 63db78b52d..7cd9aed579 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "copy.h"
 #include "creds-util.h"
diff --git a/src/home/homectl.c b/src/home/homectl.c
index 87a1c6883f..3e846e370a 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -5,6 +5,7 @@
 #include "sd-bus.h"
 
 #include "ask-password-api.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index bb014973fb..826826d70b 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -11,6 +11,7 @@
 
 #include "alloc-util.h"
 #include "architecture.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-map-properties.h"
@@ -23,7 +24,6 @@
 #include "pretty-print.h"
 #include "spawn-polkit-agent.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static bool arg_ask_password = true;
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 6925aecd84..edc5dfc1f5 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -5,12 +5,12 @@
 #include "sd-hwdb.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "hwdb-util.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "selinux-util.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static const char *arg_hwdb_bin_dir = NULL;
diff --git a/src/id128/id128.c b/src/id128/id128.c
index 6f4d65103c..af88e315bb 100644
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "gpt.h"
 #include "id128-print.h"
 #include "main-func.h"
@@ -11,7 +12,6 @@
 #include "strv.h"
 #include "format-table.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static Id128PrettyPrintMode arg_mode = ID128_PRINT_ID128;
diff --git a/src/import/export.c b/src/import/export.c
index 26533baeb8..690e194453 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -7,6 +7,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "discover-image.h"
 #include "export-raw.h"
 #include "export-tar.h"
diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index 1c5581fd61..4e7250c02e 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -4,6 +4,7 @@
 #include <locale.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "btrfs-util.h"
 #include "discover-image.h"
 #include "fd-util.h"
diff --git a/src/import/import.c b/src/import/import.c
index c76212494b..13f34633d2 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -7,6 +7,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "discover-image.h"
 #include "env-util.h"
 #include "fd-util.h"
diff --git a/src/import/pull.c b/src/import/pull.c
index 2cf0cca14f..38821b5790 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -7,6 +7,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "discover-image.h"
 #include "env-util.h"
 #include "hexdecoct.h"
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 34def4670e..b3b44bceb8 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -14,6 +14,7 @@
 #include "sd-journal.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
@@ -30,7 +31,6 @@
 #include "pretty-print.h"
 #include "sigbus.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC)
 
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 0088652184..1ebcb8ddce 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -5,6 +5,7 @@
 
 #include "sd-daemon.h"
 
+#include "build.h"
 #include "conf-parser.h"
 #include "daemon-util.h"
 #include "def.h"
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 06448b2225..6d58e48bbf 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -10,6 +10,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "conf-parser.h"
 #include "daemon-util.h"
 #include "def.h"
@@ -32,7 +33,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tmpfile-util.h"
-#include "util.h"
 #include "version.h"
 
 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem"
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 0c2c0d6152..404a748736 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -10,6 +10,7 @@
 #include "sd-journal.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "fd-util.h"
 #include "main-func.h"
 #include "parse-argument.h"
@@ -18,7 +19,6 @@
 #include "string-util.h"
 #include "syslog-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static const char *arg_identifier = NULL;
 static int arg_priority = LOG_INFO;
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 11de07fcfa..7de1bd557a 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -19,6 +19,7 @@
 
 #include "acl-util.h"
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "catalog.h"
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index c23f1fa3f6..e44e287282 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -5,6 +5,7 @@
 
 #include "sd-bus.h"
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 211af404bd..6184d10cde 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -9,6 +9,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "fd-util.h"
@@ -22,7 +23,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static const char* arg_what = "idle:sleep:shutdown";
 static const char* arg_who = NULL;
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 4dbfa0db44..244708d2f5 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -8,6 +8,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 8a3b1efb4c..6aef48650d 100644
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "dissect-image.h"
 #include "id128-util.h"
 #include "log.h"
@@ -16,7 +17,6 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static char *arg_root = NULL;
 static char *arg_image = NULL;
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 14085f7397..a1671e3252 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -14,6 +14,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 9e20d59389..f8f0eb4900 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -5,6 +5,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#include "build.h"
 #include "conf-files.h"
 #include "def.h"
 #include "fd-util.h"
@@ -16,7 +17,6 @@
 #include "proc-cmdline.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 static char **arg_proc_cmdline_modules = NULL;
 static const char conf_file_dirs[] = CONF_PATHS_NULSTR("modules-load.d");
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 25e18d279c..95dcf1bab0 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -5,6 +5,7 @@
 #include "sd-bus.h"
 #include "sd-device.h"
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"
diff --git a/src/network/generator/main.c b/src/network/generator/main.c
index a36fe98c86..a0af0b831b 100644
--- a/src/network/generator/main.c
+++ b/src/network/generator/main.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "build.h"
 #include "fd-util.h"
 #include "generator.h"
 #include "macro.h"
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index a2e216e779..8146125fc8 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -22,6 +22,7 @@
 #include "alloc-util.h"
 #include "bond-util.h"
 #include "bridge-util.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"
diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index a679b858fa..5328bba2d8 100644
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -6,6 +6,7 @@
 
 #include "sd-daemon.h"
 
+#include "build.h"
 #include "daemon-util.h"
 #include "main-func.h"
 #include "manager.h"
diff --git a/src/notify/notify.c b/src/notify/notify.c
index 7b23e7bdb0..c4f54920ac 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -9,6 +9,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "env-util.h"
 #include "format-util.h"
 #include "log.h"
@@ -20,7 +21,6 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static bool arg_ready = false;
 static pid_t arg_pid = 0;
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 01a67b5553..fb9fbed12c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -28,6 +28,7 @@
 #include "base-filesystem.h"
 #include "blkid-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "cap-list.h"
@@ -110,7 +111,6 @@
 #include "umask-util.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 /* The notify socket inside the container it can use to talk to nspawn using the sd_notify(3) protocol */
 #define NSPAWN_NOTIFY_SOCKET_PATH "/run/host/notify"
diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c
index 2ffb9d4d19..e527abf5da 100644
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "bus-error.h"
 #include "copy.h"
 #include "main-func.h"
diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 6cfe1a3f4c..eb1b830605 100644
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "build.h"
 #include "bus-log-control-api.h"
 #include "bus-object.h"
 #include "cgroup-util.h"
diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 8a04071f17..bb2b53103f 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -14,6 +14,7 @@
 
 #include "blockdev-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "cryptsetup-util.h"
 #include "device-nodes.h"
 #include "device-util.h"
diff --git a/src/partition/repart.c b/src/partition/repart.c
index 44060c9413..51fdaabc42 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -19,6 +19,7 @@
 #include "blkid-util.h"
 #include "blockdev-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "conf-parser.h"
diff --git a/src/path/path.c b/src/path/path.c
index 0024a60611..d3348ce04f 100644
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -8,12 +8,12 @@
 #include "sd-path.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char *arg_suffix = NULL;
 
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index dbae8a4d47..d0d7bb1caf 100644
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -6,6 +6,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 22ddf659ae..65de1aa986 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -15,6 +15,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "io-util.h"
@@ -33,7 +34,6 @@
 #include "sync-util.h"
 #include "sha256.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "xattr-util.h"
 
 typedef enum SeedAction {
diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index d95df29793..0a0b97fa01 100644
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -4,6 +4,7 @@
 #include <net/if.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "def.h"
 #include "dns-domain.h"
 #include "extract-word.h"
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index b07761a495..dd0a8e121e 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -9,6 +9,7 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"
diff --git a/src/run/run.c b/src/run/run.c
index 627a6b11da..5f7d651b90 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -10,6 +10,7 @@
 #include "sd-event.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
diff --git a/src/shared/service-util.c b/src/shared/service-util.c
index 68aa5775f5..b0585ba546 100644
--- a/src/shared/service-util.c
+++ b/src/shared/service-util.c
@@ -4,10 +4,10 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "pretty-print.h"
 #include "service-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static int help(const char *program_path, const char *service, const char *description, bool bus_introspect) {
         _cleanup_free_ char *link = NULL;
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 3461d3e45f..4d5b9d5579 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -18,6 +18,7 @@
 #include "sd-messages.h"
 
 #include "btrfs-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
@@ -37,7 +38,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "util.h"
 
 static SleepOperation arg_operation = _SLEEP_OPERATION_INVALID;
 
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index c740b22057..2a6eeb661a 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -14,6 +14,7 @@
 #include "sd-resolve.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
@@ -25,7 +26,6 @@
 #include "set.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "util.h"
 
 #define BUFFER_SIZE (256 * 1024)
 
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index c851059a09..3c5ba074c7 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -10,13 +10,13 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-internal.h"
 #include "bus-util.h"
 #include "errno-util.h"
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "util.h"
 #include "version.h"
 
 #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 5de5d81655..34f0182fc9 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "build.h"
 #include "conf-files.h"
 #include "creds-util.h"
 #include "def.h"
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 839e2f92b8..9a7ef8eb29 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -7,6 +7,7 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "capability-util.h"
 #include "chase-symlinks.h"
 #include "devnum-util.h"
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 02a298d572..3f28bcc3dc 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6,6 +6,7 @@
 
 #include "sd-daemon.h"
 
+#include "build.h"
 #include "bus-util.h"
 #include "dissect-image.h"
 #include "install.h"
diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 944ac41a41..14a3cf95d7 100644
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "chase-symlinks.h"
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index e2533e0128..a520d76dce 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -4,6 +4,7 @@
 #include <utmp.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "copy.h"
@@ -38,7 +39,6 @@
 #include "uid-range.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 
 typedef enum ItemType {
         ADD_USER =   'u',
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index ac4d3dc3ed..e3c722610a 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -8,6 +8,7 @@
 
 #include "sd-bus.h"
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
@@ -24,7 +25,6 @@
 #include "string-table.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static PagerFlags arg_pager_flags = 0;
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 784b895577..06328d4959 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -20,6 +20,7 @@
 #include "acl-util.h"
 #include "alloc-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "capability-util.h"
 #include "chase-symlinks.h"
 #include "chattr-util.h"
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index b7d279cc22..50b6776039 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -18,6 +18,7 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
+#include "build.h"
 #include "conf-parser.h"
 #include "def.h"
 #include "dirent-util.h"
diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index 63b0c4dde1..49bdaf666f 100644
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <utmp.h>
 
+#include "build.h"
 #include "dirent-util.h"
 #include "errno-list.h"
 #include "escape.h"