From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 6 Nov 2022 15:54:32 +0000 (+0100)
Subject: basic: rename util.h to logarithm.h
X-Git-Tag: v253-rc1~572^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ae6b3bf723addaa8263292e19ed4c496b947a9c;p=thirdparty%2Fsystemd.git

basic: rename util.h to logarithm.h

util.h is now about logarithms only, so we can rename it. Many files included
util.h for no apparent reason… Those includes are dropped.
---

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index b6474d31a72..e66477f3288 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -19,7 +19,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 #define PCI_CLASS_GRAPHICS_CARD 0x30000
 
diff --git a/src/basic/architecture.h b/src/basic/architecture.h
index b86f5f35d0f..096526a8570 100644
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -4,7 +4,6 @@
 #include <endian.h>
 
 #include "macro.h"
-#include "util.h"
 
 /* A cleaned up architecture definition. We don't want to get lost in
  * processor features, models, generations or even ABIs. Hence we
diff --git a/src/basic/async.c b/src/basic/async.c
index 443cfa95ab7..241803f33a6 100644
--- a/src/basic/async.c
+++ b/src/basic/async.c
@@ -12,7 +12,6 @@
 #include "macro.h"
 #include "process-util.h"
 #include "signal-util.h"
-#include "util.h"
 
 int asynchronous_job(void* (*func)(void *p), void *arg) {
         sigset_t ss, saved_ss;
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index fdc7948a23f..fb1ad14fd3b 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -10,7 +10,6 @@
 #include "macro.h"
 #include "parse-util.h"
 #include "stdio-util.h"
-#include "util.h"
 
 static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
 
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index fa74b5b9c63..5ab110d3417 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -11,11 +11,11 @@
 #include "cap-list.h"
 #include "fileio.h"
 #include "log.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "missing_prctl.h"
 #include "parse-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int have_effective_cap(int value) {
         _cleanup_cap_free_ cap_t cap = NULL;
diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index dbce54531d1..4d1b0521f40 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -8,7 +8,6 @@
 
 #include "macro.h"
 #include "missing_capability.h"
-#include "util.h"
 
 #define CAP_ALL UINT64_MAX
 
diff --git a/src/basic/compress.c b/src/basic/compress.c
index 1e94635397c..0a330ecb551 100644
--- a/src/basic/compress.c
+++ b/src/basic/compress.c
@@ -32,7 +32,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "unaligned.h"
-#include "util.h"
 
 #if HAVE_LZ4
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(LZ4F_compressionContext_t, LZ4F_freeCompressionContext, NULL);
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 66bb7569bbb..ec33a61588e 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -29,7 +29,6 @@
 #include "stat-util.h"
 #include "stdio-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 /* The maximum number of iterations in the loop to close descriptors in the fallback case
  * when /proc/self/fd/ is inaccessible. */
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 6b757bd5705..8b4d81ebdc0 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -32,7 +32,6 @@
 #include "tmpfile-util.h"
 #include "umask-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int unlink_noerrno(const char *path) {
         PROTECT_ERRNO;
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index f68cd36bb72..d19627595f0 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "fileio.h"
 #include "hashmap.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "mempool.h"
diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 91b3fe862b0..ebb5a63eb44 100644
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -7,7 +7,6 @@
 
 #include "hash-funcs.h"
 #include "macro.h"
-#include "util.h"
 
 /*
  * A hash table implementation. As a minor optimization a NULL hashmap object
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index 05c729d34da..8ee5c0cc209 100644
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -11,13 +11,13 @@
 #include "alloc-util.h"
 #include "errno-util.h"
 #include "in-addr-util.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "random-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strxcpyx.h"
-#include "util.h"
 
 bool in4_addr_is_null(const struct in_addr *a) {
         assert(a);
diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
index 19fa35f1d28..8d6efaa0062 100644
--- a/src/basic/in-addr-util.h
+++ b/src/basic/in-addr-util.h
@@ -8,7 +8,6 @@
 
 #include "hash-funcs.h"
 #include "macro.h"
-#include "util.h"
 
 union in_addr_union {
         struct in_addr in;
diff --git a/src/basic/util.h b/src/basic/logarithm.h
similarity index 100%
rename from src/basic/util.h
rename to src/basic/logarithm.h
diff --git a/src/basic/meson.build b/src/basic/meson.build
index c5dd116964d..a4d7cb5fb30 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -130,6 +130,7 @@ basic_sources = files(
         'locale-util.h',
         'log.c',
         'log.h',
+        'logarithm.h',
         'login-util.c',
         'login-util.h',
         'macro.h',
@@ -258,7 +259,6 @@ basic_sources = files(
         'user-util.h',
         'utf8.c',
         'utf8.h',
-        'util.h',
         'virt.c',
         'virt.h',
         'xattr-util.c',
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 17d35fe1a45..5e3a92c7c0c 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -18,7 +18,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "utf8.h"
-#include "util.h"
 
 char* first_word(const char *s, const char *word) {
         size_t sl, wl;
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 0c092597eb8..77f13c7bea0 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -44,7 +44,6 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static volatile unsigned cached_columns = 0;
 static volatile unsigned cached_lines = 0;
diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index 6002af5b2a9..a248205f3f3 100644
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -6,7 +6,6 @@
 #include "busctl-introspect.h"
 #include "path-util.h"
 #include "string-util.h"
-#include "util.h"
 #include "xml.h"
 
 #define NODE_DEPTH_MAX 16
diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index 097bea39b3e..872280f7981 100644
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -12,7 +12,6 @@
 #include "capability-util.h"
 #include "fd-util.h"
 #include "log.h"
-#include "util.h"
 
 static bool initialized = false;
 static int audit_fd;
diff --git a/src/core/kill.c b/src/core/kill.c
index e858ae9607e..c8b581d05d5 100644
--- a/src/core/kill.c
+++ b/src/core/kill.c
@@ -3,7 +3,6 @@
 #include "kill.h"
 #include "signal-util.h"
 #include "string-table.h"
-#include "util.h"
 
 void kill_context_init(KillContext *c) {
         assert(c);
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index c1744cff92d..e05ebdc631d 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -23,7 +23,6 @@
 #include "selinux-util.h"
 #include "stdio-util.h"
 #include "strv.h"
-#include "util.h"
 
 static bool initialized = false;
 
diff --git a/src/core/service.c b/src/core/service.c
index 42de40e1375..bd44c379534 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -41,7 +41,6 @@
 #include "unit-name.h"
 #include "unit.h"
 #include "utf8.h"
-#include "util.h"
 
 #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__)
 
diff --git a/src/core/show-status.c b/src/core/show-status.c
index df254299389..2ba7a8588d2 100644
--- a/src/core/show-status.c
+++ b/src/core/show-status.c
@@ -12,7 +12,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static const char* const show_status_table[_SHOW_STATUS_MAX] = {
         [SHOW_STATUS_NO]        = "no",
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index b76bb744650..58552f79e73 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -19,7 +19,6 @@
 #include "macro.h"
 #include "smack-setup.h"
 #include "string-util.h"
-#include "util.h"
 
 #if ENABLE_SMACK
 
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 07903f1044e..083878e42a3 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -23,7 +23,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 typedef struct crypto_device {
         char *uuid;
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 595434ab571..73c76fceea5 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -32,7 +32,6 @@
 #include "socket-util.h"
 #include "special.h"
 #include "stdio-util.h"
-#include "util.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;
diff --git a/src/fuzz/fuzz-time-util.c b/src/fuzz/fuzz-time-util.c
index bf2a66336ca..f1c95ae09b8 100644
--- a/src/fuzz/fuzz-time-util.c
+++ b/src/fuzz/fuzz-time-util.c
@@ -4,7 +4,6 @@
 #include "fd-util.h"
 #include "fuzz.h"
 #include "time-util.h"
-#include "util.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_free_ char *str = NULL;
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 4e8162a3198..b3f5ddc5860 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -18,7 +18,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "unit-name.h"
-#include "util.h"
 #include "virt.h"
 
 static const char *arg_dest = NULL;
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 486b093062f..ee3ef047400 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -36,7 +36,6 @@
 #include "string-table.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 #define VALID_DEPLOYMENT_CHARS (DIGITS LETTERS "-.:")
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index a3ff6a39341..6b15884e777 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -16,7 +16,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 78f0a7ca752..b9953a4bf37 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -11,7 +11,6 @@
 #include "ratelimit.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 
diff --git a/src/import/import-common.c b/src/import/import-common.c
index 4eda9087c5a..3c46aedf618 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -21,7 +21,6 @@
 #include "signal-util.h"
 #include "stat-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 int import_fork_tar_x(const char *path, pid_t *ret) {
         _cleanup_close_pair_ int pipefd[2] = { -1, -1 };
diff --git a/src/import/import-compress.c b/src/import/import-compress.c
index 03f5efa00ec..28cf6f841a2 100644
--- a/src/import/import-compress.c
+++ b/src/import/import-compress.c
@@ -2,7 +2,6 @@
 
 #include "import-compress.h"
 #include "string-table.h"
-#include "util.h"
 
 void import_compress_free(ImportCompress *c) {
         assert(c);
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 30f5b9050ba..ee904bc4e0e 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -25,7 +25,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 struct RawImport {
         sd_event *event;
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index f31d3d75a1f..90b4e51d2c1 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -26,7 +26,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 struct TarImport {
         sd_event *event;
diff --git a/src/import/importd.c b/src/import/importd.c
index 74e8ffb0cf3..a6efb5315d3 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -32,7 +32,6 @@
 #include "strv.h"
 #include "syslog-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "web-util.h"
 
 typedef struct Transfer Transfer;
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index 028bae82a86..7633d3e74b3 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -22,7 +22,6 @@
 #include "siphash24.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 #include "web-util.h"
 
 #define FILENAME_ESCAPE "/.#\"\'"
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index f4f869d38e9..d3d14af6d1d 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -28,7 +28,6 @@
 #include "strv.h"
 #include "tmpfile-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "web-util.h"
 
 typedef enum RawProgress {
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index fd866fc514e..cf18461db30 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -28,7 +28,6 @@
 #include "tmpfile-util.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "web-util.h"
 
 typedef enum TarProgress {
diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c
index 5a7232d3edc..fe2b5350875 100644
--- a/src/import/qcow2-util.c
+++ b/src/import/qcow2-util.c
@@ -6,7 +6,6 @@
 #include "btrfs-util.h"
 #include "qcow2-util.h"
 #include "sparse-endian.h"
-#include "util.h"
 
 #define QCOW2_MAGIC 0x514649fb
 
diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 7a8f50dd0df..8206ca89bf2 100644
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -10,7 +10,6 @@
 #include "log.h"
 #include "string-util.h"
 #include "utf8.h"
-#include "util.h"
 
 /**
  * Write up to size bytes to buf. Return negative on error, and number of
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 271e304273b..9e6c36f87d1 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -14,7 +14,6 @@
 #include "microhttpd-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         char *f;
diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index 842882bc596..65fbe400a8f 100644
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -6,6 +6,7 @@
 #include "hashmap.h"
 #include "journald-rate-limit.h"
 #include "list.h"
+#include "logarithm.h"
 #include "random-util.h"
 #include "string-util.h"
 #include "time-util.h"
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 378bf162ca9..c5288000af8 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -14,7 +14,6 @@
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"
-#include "util.h"
 
 /* This program tests skipping around in a multi-file journal. */
 
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index ac5b7f00054..9f4494c6c0a 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -15,7 +15,6 @@
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"
-#include "util.h"
 
 #define N_ENTRIES 200
 
diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index e36ea8cae11..0c58d05ced3 100644
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -14,7 +14,6 @@
 #include "rm-rf.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 
 #define N_ENTRIES 6000
 #define RANDOM_RANGE 77
diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c
index 99a5f69b702..eec794a653b 100644
--- a/src/libsystemd-network/arp-util.c
+++ b/src/libsystemd-network/arp-util.c
@@ -12,7 +12,6 @@
 #include "fd-util.h"
 #include "in-addr-util.h"
 #include "unaligned.h"
-#include "util.h"
 
 int arp_update_filter(int fd, const struct in_addr *a, const struct ether_addr *mac) {
         struct sock_filter filter[] = {
diff --git a/src/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h
index c67e9511a13..a660e522018 100644
--- a/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/libsystemd-network/dhcp-lease-internal.h
@@ -10,7 +10,6 @@
 #include "dhcp-internal.h"
 #include "dhcp-protocol.h"
 #include "list.h"
-#include "util.h"
 
 struct sd_dhcp_route {
         struct in_addr dst_addr;
diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index 4b0fac3cf1a..a29279e6afc 100644
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -20,7 +20,6 @@
 #include "siphash24.h"
 #include "sparse-endian.h"
 #include "string-util.h"
-#include "util.h"
 
 #define IPV4LL_NETWORK UINT32_C(0xA9FE0000)
 #define IPV4LL_NETMASK UINT32_C(0xFFFF0000)
diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c
index 73105f5a041..4b5ad70cf15 100644
--- a/src/libsystemd-network/test-acd.c
+++ b/src/libsystemd-network/test-acd.c
@@ -13,7 +13,6 @@
 
 #include "in-addr-util.h"
 #include "tests.h"
-#include "util.h"
 
 static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) {
         assert_se(acd);
diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index 0f3a68e9907..92b9b5b9bc5 100644
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -21,7 +21,6 @@
 #include "fd-util.h"
 #include "random-util.h"
 #include "tests.h"
-#include "util.h"
 
 static struct hw_addr_data hw_addr = {
         .length = ETH_ALEN,
diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c
index 5453ef93a4a..5dc6b103476 100644
--- a/src/libsystemd-network/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test-ipv4ll-manual.c
@@ -15,7 +15,6 @@
 #include "parse-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
         assert_se(ll);
diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c
index 2a078a502e7..bb42930cf55 100644
--- a/src/libsystemd-network/test-ipv4ll.c
+++ b/src/libsystemd-network/test-ipv4ll.c
@@ -16,7 +16,6 @@
 #include "fd-util.h"
 #include "socket-util.h"
 #include "tests.h"
-#include "util.h"
 
 static bool verbose = false;
 static bool extended = false;
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index 4468b45dd1e..45e7473c29f 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -21,7 +21,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "user-util.h"
-#include "util.h"
 
 enum {
         CAP_OFFSET_INHERITABLE = 0,
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index 73939d8f7a7..6d24f3b1c97 100644
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -17,7 +17,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static char *indent(unsigned level, uint64_t flags) {
         char *p;
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 4d687cfac9e..413e2dd43f3 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -14,7 +14,6 @@
 #include "errno-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed",                           EACCES),
diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c
index bd0842fdbc5..78c743648bb 100644
--- a/src/libsystemd/sd-bus/bus-signature.c
+++ b/src/libsystemd/sd-bus/bus-signature.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <util.h>
-
 #include "sd-bus.h"
 
 #include "bus-signature.h"
diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index 317653bedc2..f9595e34770 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -13,7 +13,6 @@
 #include "missing_resource.h"
 #include "string-util.h"
 #include "time-util.h"
-#include "util.h"
 
 #define MAX_SIZE (2*1024*1024)
 
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 09401a97844..9b5efcce597 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -18,7 +18,6 @@
 #include "macro.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         log_info("Match triggered! destination=%s interface=%s member=%s",
diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c
index e1afbc2f1be..3361b0675e0 100644
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/sd-bus/test-bus-marshal.c
@@ -23,7 +23,6 @@
 #include "fileio.h"
 #include "log.h"
 #include "tests.h"
-#include "util.h"
 
 static void test_bus_path_encode_unique(void) {
         _cleanup_free_ char *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL;
diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index 949ef07c341..0d4a6db1e3b 100644
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -12,7 +12,6 @@
 #include "log.h"
 #include "macro.h"
 #include "strv.h"
-#include "util.h"
 
 struct context {
         int fds[2];
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 199d10a00ea..80206a7d914 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -26,7 +26,6 @@
 #include "stat-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index f2e142457ba..55a0ee730e8 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -33,7 +33,6 @@
 #include "strv.h"
 #include "strxcpyx.h"
 #include "user-util.h"
-#include "util.h"
 
 int device_new_aux(sd_device **ret) {
         sd_device *device;
diff --git a/src/libsystemd/sd-device/test-sd-device-monitor.c b/src/libsystemd/sd-device/test-sd-device-monitor.c
index 9e64ba01c61..4654ef709d1 100644
--- a/src/libsystemd/sd-device/test-sd-device-monitor.c
+++ b/src/libsystemd/sd-device/test-sd-device-monitor.c
@@ -14,7 +14,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 #include "virt.h"
 
 static int monitor_handler(sd_device_monitor *m, sd_device *d, void *userdata) {
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 778070a5fb7..1f611c6a25f 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -16,6 +16,7 @@
 #include "glyph-util.h"
 #include "hashmap.h"
 #include "list.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index 246658d0246..9ec988d76e6 100644
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -21,7 +21,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static int prepare_handler(sd_event_source *s, void *userdata) {
         log_info("preparing %c", PTR_TO_INT(userdata));
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index 709c8ffb575..c8f051196df 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -16,7 +16,6 @@
 #include "missing_syscall.h"
 #include "random-util.h"
 #include "user-util.h"
-#include "util.h"
 
 _public_ char *sd_id128_to_string(sd_id128_t id, char s[_SD_ARRAY_STATIC SD_ID128_STRING_MAX]) {
         assert_return(s, NULL);
diff --git a/src/libsystemd/sd-journal/fsprg.h b/src/libsystemd/sd-journal/fsprg.h
index dfe2d792220..d3d88aab31a 100644
--- a/src/libsystemd/sd-journal/fsprg.h
+++ b/src/libsystemd/sd-journal/fsprg.h
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "macro.h"
-#include "util.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/libsystemd/sd-journal/journal-verify.c b/src/libsystemd/sd-journal/journal-verify.c
index ad4039dee0f..34b1d8b9093 100644
--- a/src/libsystemd/sd-journal/journal-verify.c
+++ b/src/libsystemd/sd-journal/journal-verify.c
@@ -18,7 +18,6 @@
 #include "macro.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static void draw_progress(uint64_t p, usec_t *last_usec) {
         unsigned n, i, j, k;
diff --git a/src/libsystemd/sd-journal/test-catalog.c b/src/libsystemd/sd-journal/test-catalog.c
index ad062211751..526b8200ba1 100644
--- a/src/libsystemd/sd-journal/test-catalog.c
+++ b/src/libsystemd/sd-journal/test-catalog.c
@@ -18,7 +18,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static char** catalog_dirs = NULL;
 static const char *no_catalog_dirs[] = {
diff --git a/src/libsystemd/sd-journal/test-journal-init.c b/src/libsystemd/sd-journal/test-journal-init.c
index 80aff75bb96..d5702db3300 100644
--- a/src/libsystemd/sd-journal/test-journal-init.c
+++ b/src/libsystemd/sd-journal/test-journal-init.c
@@ -7,7 +7,6 @@
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         sd_journal *j;
diff --git a/src/libsystemd/sd-journal/test-journal-match.c b/src/libsystemd/sd-journal/test-journal-match.c
index ded67563d7a..571a88c1ac6 100644
--- a/src/libsystemd/sd-journal/test-journal-match.c
+++ b/src/libsystemd/sd-journal/test-journal-match.c
@@ -9,7 +9,6 @@
 #include "log.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_(sd_journal_closep) sd_journal *j = NULL;
diff --git a/src/libsystemd/sd-journal/test-mmap-cache.c b/src/libsystemd/sd-journal/test-mmap-cache.c
index 6ec36931fda..e3dfbada327 100644
--- a/src/libsystemd/sd-journal/test-mmap-cache.c
+++ b/src/libsystemd/sd-journal/test-mmap-cache.c
@@ -9,7 +9,6 @@
 #include "macro.h"
 #include "mmap-cache.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         MMapFileDescriptor *fx;
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index f134f0a8c98..872d39e9ab7 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -27,7 +27,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 /* Error codes:
  *
diff --git a/src/libsystemd/sd-netlink/netlink-message-rtnl.c b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
index 109f3ee814d..008e8022b1d 100644
--- a/src/libsystemd/sd-netlink/netlink-message-rtnl.c
+++ b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
@@ -15,7 +15,6 @@
 #include "netlink-types.h"
 #include "netlink-util.h"
 #include "socket-util.h"
-#include "util.h"
 
 static bool rtnl_message_type_is_neigh(uint16_t type) {
         return IN_SET(type, RTM_NEWNEIGH, RTM_GETNEIGH, RTM_DELNEIGH);
diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c
index 605e80916c7..1da459c0148 100644
--- a/src/libsystemd/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/sd-netlink/netlink-socket.c
@@ -14,7 +14,6 @@
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "socket-util.h"
-#include "util.h"
 
 static int broadcast_groups_get(sd_netlink *nl) {
         _cleanup_free_ uint32_t *groups = NULL;
diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h
index d14392a018e..72d16fa9a91 100644
--- a/src/libsystemd/sd-netlink/netlink-util.h
+++ b/src/libsystemd/sd-netlink/netlink-util.h
@@ -9,7 +9,6 @@
 #include "in-addr-util.h"
 #include "ordered-set.h"
 #include "socket-util.h"
-#include "util.h"
 
 /* See struct rtvia in rtnetlink.h */
 typedef struct RouteVia {
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index 3d6b07f39f0..00687e5cc82 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -16,7 +16,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 static int network_get_string(const char *field, char **ret) {
         _cleanup_free_ char *s = NULL;
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index ac33e349c06..601f61bf639 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -12,7 +12,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int from_environment(const char *envname, const char *fallback, const char **ret) {
         assert(ret);
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 0314ae17743..f16be0f4e1a 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -13,7 +13,6 @@
 #include "logind-button.h"
 #include "missing_input.h"
 #include "string-util.h"
-#include "util.h"
 
 #define CONST_MAX5(a, b, c, d, e) CONST_MAX(CONST_MAX(a, b), CONST_MAX(CONST_MAX(c, d), e))
 
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 592ee3b9d65..f6050345260 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -5,7 +5,6 @@
 #include "alloc-util.h"
 #include "logind-device.h"
 #include "logind-seat-dbus.h"
-#include "util.h"
 
 Device* device_new(Manager *m, const char *sysfs, bool master) {
         Device *d;
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 16612ddf180..9cf00a502f9 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -24,7 +24,6 @@
 #include "string-util.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static void inhibitor_remove_fifo(Inhibitor *i);
 
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 03a419229e4..877b9c1af14 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -17,7 +17,6 @@
 #include "missing_capability.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_const_true, "b", true);
 static BUS_DEFINE_PROPERTY_GET(property_get_can_tty, "b", Seat, seat_can_tty);
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index d8ad424bfe5..863b8cc3b48 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -23,7 +23,6 @@
 #include "string-util.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 int seat_new(Seat** ret, Manager *m, const char *id) {
         _cleanup_(seat_freep) Seat *s = NULL;
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 56f6307dcd3..ea4800d8276 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -24,7 +24,6 @@
 #include "signal-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int property_get_user(
                 sd_bus *bus,
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 4f934dd01dc..eccc1aeb5d4 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -17,7 +17,6 @@
 #include "missing_drm.h"
 #include "missing_input.h"
 #include "parse-util.h"
-#include "util.h"
 
 enum SessionDeviceNotifications {
         SESSION_DEVICE_RESUME,
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 5bd4abc474f..85cb4eba9ea 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -38,7 +38,6 @@
 #include "tmpfile-util.h"
 #include "uid-alloc-range.h"
 #include "user-util.h"
-#include "util.h"
 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index e02ad754eeb..5680a300f3c 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -35,7 +35,6 @@
 #include "uid-alloc-range.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 int user_new(User **ret,
              Manager *m,
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index d79f753c9a0..0a8c02a2a26 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -11,7 +11,6 @@
 #include "string-util.h"
 #include "sysfs-show.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static int show_sysfs_one(
                 const char *seat,
diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index dbe79c7074d..aefae277fc0 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -8,7 +8,6 @@
 #include "bus-util.h"
 #include "fd-util.h"
 #include "macro.h"
-#include "util.h"
 
 static int inhibit(sd_bus *bus, const char *what) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 335a4e96fb9..de7b20ff2db 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -32,7 +32,6 @@
 #include "tmpfile-util.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 Machine* machine_new(Manager *manager, MachineClass class, const char *name) {
         Machine *m;
diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c
index acd609f2961..7baec1529f4 100644
--- a/src/network/netdev/fou-tunnel.c
+++ b/src/network/netdev/fou-tunnel.c
@@ -13,7 +13,6 @@
 #include "parse-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char* const fou_encap_type_table[_NETDEV_FOO_OVER_UDP_ENCAP_MAX] = {
         [NETDEV_FOO_OVER_UDP_ENCAP_DIRECT] = "FooOverUDP",
diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c
index 2bce0fc5b28..7d51a619bd5 100644
--- a/src/network/netdev/l2tp-tunnel.c
+++ b/src/network/netdev/l2tp-tunnel.c
@@ -15,7 +15,6 @@
 #include "socket-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char* const l2tp_l2spec_type_table[_NETDEV_L2TP_L2SPECTYPE_MAX] = {
         [NETDEV_L2TP_L2SPECTYPE_NONE]    = "none",
diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
index 1e3f6a9c4b5..0da3dd4bd22 100644
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -18,7 +18,6 @@
 #include "socket-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static void security_association_clear(SecurityAssociation *sa) {
         if (!sa)
diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index db414a89437..2addfeecaa8 100644
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -18,7 +18,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "tunnel.h"
-#include "util.h"
 
 #define DEFAULT_IPV6_TTL   64
 #define IP6_FLOWINFO_FLOWLABEL  htobe32(0x000FFFFF)
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 259cd312c99..107f19fd154 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "firewall-util.h"
+#include "logarithm.h"
 #include "memory-util.h"
 #include "netlink-util.h"
 #include "networkd-address-pool.h"
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 95b08cb885f..4ed622cfe66 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -27,6 +27,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "glyph-util.h"
+#include "logarithm.h"
 #include "missing_network.h"
 #include "netlink-util.h"
 #include "network-internal.h"
@@ -66,7 +67,6 @@
 #include "tmpfile-util.h"
 #include "tuntap.h"
 #include "udev-util.h"
-#include "util.h"
 #include "vrf.h"
 
 bool link_ipv6_enabled(Link *link) {
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 41a0766f078..d516918c786 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -42,7 +42,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tclass.h"
-#include "util.h"
 
 /* Let's assume that anything above this number is a user misconfiguration. */
 #define MAX_NTP_SERVERS 128U
diff --git a/src/network/networkd-route-util.c b/src/network/networkd-route-util.c
index 03663820931..84866d3f84b 100644
--- a/src/network/networkd-route-util.c
+++ b/src/network/networkd-route-util.c
@@ -3,6 +3,7 @@
 #include <linux/rtnetlink.h>
 
 #include "alloc-util.h"
+#include "logarithm.h"
 #include "networkd-address.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
diff --git a/src/network/networkd-util.c b/src/network/networkd-util.c
index 69347d80ffd..33352ba772e 100644
--- a/src/network/networkd-util.c
+++ b/src/network/networkd-util.c
@@ -3,6 +3,7 @@
 #include "condition.h"
 #include "conf-parser.h"
 #include "escape.h"
+#include "logarithm.h"
 #include "networkd-link.h"
 #include "networkd-util.h"
 #include "parse-util.h"
diff --git a/src/network/tc/fq.c b/src/network/tc/fq.c
index c588f385c7f..149a72e37c4 100644
--- a/src/network/tc/fq.c
+++ b/src/network/tc/fq.c
@@ -6,6 +6,7 @@
 #include "alloc-util.h"
 #include "conf-parser.h"
 #include "fq.h"
+#include "logarithm.h"
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "string-util.h"
diff --git a/src/network/tc/hhf.c b/src/network/tc/hhf.c
index 2d71a42c53d..d44522f98cc 100644
--- a/src/network/tc/hhf.c
+++ b/src/network/tc/hhf.c
@@ -9,7 +9,6 @@
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "string-util.h"
-#include "util.h"
 
 static int heavy_hitter_filter_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
         HeavyHitterFilter *hhf;
diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
index 624029a8128..43ac10704b7 100644
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@ -10,7 +10,6 @@
 #include "netlink-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "util.h"
 
 static bool link_in_command_line_interfaces(Link *link, Manager *m) {
         assert(link);
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index 9e6379ae7b2..bdb8985fbed 100644
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -18,7 +18,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int chown_cgroup_path(const char *path, uid_t uid_shift) {
         _cleanup_close_ int fd = -1;
diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c
index bb54f8c1e77..a8b14371711 100644
--- a/src/nspawn/nspawn-expose-ports.c
+++ b/src/nspawn/nspawn-expose-ports.c
@@ -13,7 +13,6 @@
 #include "parse-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "util.h"
 
 int expose_port_parse(ExposePort **l, const char *s) {
         const char *split, *e;
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 536e3692311..3a0e155f383 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -25,7 +25,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "udev-util.h"
-#include "util.h"
 
 #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1)
 #define CONTAINER_HASH_KEY SD_ID128_MAKE(c3,c4,f9,19,b5,57,b2,1c,e6,cf,14,27,03,9c,ee,a2)
diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index c78bead4a4b..8995e0f7b38 100644
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -11,7 +11,6 @@
 #include "special.h"
 #include "stat-util.h"
 #include "strv.h"
-#include "util.h"
 
 static int append_machine_properties(
                 sd_bus_message *m,
diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index e06de68072e..05bde1c7567 100644
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -16,7 +16,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 Settings *settings_new(void) {
         Settings *s;
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 34758d8b0fa..475147c2a02 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -17,7 +17,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
         int pipe_fds[2], r;
diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index d820ceb9f68..f8e6582d5bf 100644
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -45,7 +45,6 @@
 #include "strv.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 /* Command line argument handling */
 typedef enum PStoreStorage {
diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 575965c470e..ef5fec3f102 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -13,7 +13,6 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
-#include "util.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;
diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index c2b9e642172..d8c06b1d2dc 100644
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -8,7 +8,6 @@
 #include "log.h"
 #include "mkdir-label.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char *arg_dest = NULL;
 
diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index d747d60d5db..4515592387b 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -18,7 +18,6 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "strv.h"
-#include "util.h"
 
 /* Goes through /etc/fstab and remounts all API file systems, applying options that are in /etc/fstab that systemd
  * might not have respected */
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index a9aa4b832a9..feb1d1ef7c4 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -13,7 +13,6 @@
 #include "memory-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "util.h"
 
 static int send_on_socket(int fd, const char *socket_name, const void *packet, size_t size) {
         union sockaddr_union sa = {};
diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index 88c52e411b3..f90e5974c4d 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -14,7 +14,6 @@
 #include "strv.h"
 #include "unaligned.h"
 #include "utf8.h"
-#include "util.h"
 
 #define EDNS0_OPT_DO (1<<15)
 
diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 8aec9b21e43..773b25d8166 100644
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -24,7 +24,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "udev-util.h"
-#include "util.h"
 
 /* Note that any write is delayed until exit and the rfkill state will not be
  * stored for rfkill indices that disappear after a change. */
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 2bdc529b803..c6c673984d2 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -10,7 +10,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *ret_entry) {
         acl_entry_t i;
diff --git a/src/shared/btrfs-util.c b/src/shared/btrfs-util.c
index 58ba286a240..92a9bcde4f7 100644
--- a/src/shared/btrfs-util.c
+++ b/src/shared/btrfs-util.c
@@ -31,7 +31,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "time-util.h"
-#include "util.h"
 
 /* WARNING: Be careful with file system ioctls! When we get an fd, we
  * need to make sure it either refers to only a regular file or
diff --git a/src/shared/calendarspec.h b/src/shared/calendarspec.h
index d756efcdb79..5a04ac018d4 100644
--- a/src/shared/calendarspec.h
+++ b/src/shared/calendarspec.h
@@ -7,7 +7,6 @@
 #include <stdbool.h>
 
 #include "time-util.h"
-#include "util.h"
 
 typedef struct CalendarComponent {
         int start;
diff --git a/src/shared/cpu-set-util.c b/src/shared/cpu-set-util.c
index b1873b6409d..34c13cf9692 100644
--- a/src/shared/cpu-set-util.c
+++ b/src/shared/cpu-set-util.c
@@ -18,7 +18,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 char* cpu_set_to_string(const CPUSet *a) {
         _cleanup_free_ char *str = NULL;
diff --git a/src/shared/devnode-acl.c b/src/shared/devnode-acl.c
index 66e3a40f2f6..5911c2f84d6 100644
--- a/src/shared/devnode-acl.c
+++ b/src/shared/devnode-acl.c
@@ -15,7 +15,6 @@
 #include "glyph-util.h"
 #include "set.h"
 #include "string-util.h"
-#include "util.h"
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c
index 181735409d4..77915454166 100644
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@ -24,7 +24,6 @@
 #include "process-util.h"
 #include "rlimit-util.h"
 #include "string-util.h"
-#include "util.h"
 
 #define FRAMES_MAX 64
 #define THREADS_MAX 64
diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 19ddf049862..cd57016964e 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -29,7 +29,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 /* Put this test here for a lack of better place */
 assert_cc(EAGAIN == EWOULDBLOCK);
diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index b62445faa6a..0549c9f12ef 100644
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -30,7 +30,6 @@
 #include "time-util.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 
 #define DEFAULT_WEIGHT 100
 
diff --git a/src/shared/hostname-setup.c b/src/shared/hostname-setup.c
index 0fac0ecab71..0a560702243 100644
--- a/src/shared/hostname-setup.c
+++ b/src/shared/hostname-setup.c
@@ -17,7 +17,6 @@
 #include "proc-cmdline.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static int sethostname_idempotent_full(const char *s, bool really) {
         struct utsname u;
diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 71e39ebb1fa..0800b55c03d 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -11,7 +11,6 @@
 #include "macro.h"
 #include "output-mode.h"
 #include "time-util.h"
-#include "util.h"
 
 int show_journal_entry(
                 FILE *f,
diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c
index df4ac419cbb..c694a185ba9 100644
--- a/src/shared/machine-id-setup.c
+++ b/src/shared/machine-id-setup.c
@@ -24,7 +24,6 @@
 #include "string-util.h"
 #include "sync-util.h"
 #include "umask-util.h"
-#include "util.h"
 #include "virt.h"
 
 static int generate_machine_id(const char *root, sd_id128_t *ret) {
diff --git a/src/shared/pager.c b/src/shared/pager.c
index dc717cd1fe8..74a6f9fd419 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -25,7 +25,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static pid_t pager_pid = 0;
 
diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index 98619c25d4d..f1658395369 100644
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -16,7 +16,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 bool urlify_enabled(void) {
 #if ENABLE_URLIFY
diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index 902d7543a59..d34cfffa839 100644
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -8,7 +8,6 @@
 #include "log.h"
 #include "process-util.h"
 #include "spawn-ask-password-agent.h"
-#include "util.h"
 
 static pid_t agent_pid = 0;
 
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 3abb02d03e7..ce3c5fb9486 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -15,7 +15,6 @@
 #include "spawn-polkit-agent.h"
 #include "stdio-util.h"
 #include "time-util.h"
-#include "util.h"
 
 #if ENABLE_POLKIT
 static pid_t agent_pid = 0;
diff --git a/src/shared/tests.c b/src/shared/tests.c
index a65080cbf43..ad6f978f98b 100644
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -6,7 +6,6 @@
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
-#include <util.h>
 
 /* When we include libgen.h because we need dirname() we immediately
  * undefine basename() since libgen.h defines it as a macro to the POSIX
diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index 188d011fdd7..97be719abf8 100644
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -5,7 +5,6 @@
 #include <sys/types.h>
 
 #include "time-util.h"
-#include "util.h"
 
 #if ENABLE_UTMP
 #include <utmpx.h>
diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h
index a0a80efc976..a490183fa12 100644
--- a/src/shared/watchdog.h
+++ b/src/shared/watchdog.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 #include "time-util.h"
-#include "util.h"
 
 const char *watchdog_get_device(void);
 usec_t watchdog_get_last_ping(clockid_t clock);
diff --git a/src/shutdown/test-umount.c b/src/shutdown/test-umount.c
index c92105b62b4..80ec9b6dd67 100644
--- a/src/shutdown/test-umount.c
+++ b/src/shutdown/test-umount.c
@@ -7,7 +7,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "umount.h"
-#include "util.h"
 
 static void test_mount_points_list_one(const char *fname) {
         _cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, mp_list_head);
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index e650b821700..c442f5544b5 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -43,7 +43,6 @@
 #include "strv.h"
 #include "sync-util.h"
 #include "umount.h"
-#include "util.h"
 #include "virt.h"
 
 static void mount_point_free(MountPoint **head, MountPoint *m) {
diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index fc5aaa9bac3..54cd943af7a 100644
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -10,7 +10,6 @@
 #include "special.h"
 #include "string-util.h"
 #include "unit-file.h"
-#include "util.h"
 
 /*
  * Implements the logic described in systemd.offline-updates(7).
diff --git a/src/sysupdate/sysupdate-partition.c b/src/sysupdate/sysupdate-partition.c
index 812007fa3b3..fa46574fd6b 100644
--- a/src/sysupdate/sysupdate-partition.c
+++ b/src/sysupdate/sysupdate-partition.c
@@ -10,7 +10,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "sysupdate-partition.h"
-#include "util.h"
 
 void partition_info_destroy(PartitionInfo *p) {
         assert(p);
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 3c5df6c3ec8..9b465e8c848 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -25,7 +25,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 static const struct {
         const char *path;
diff --git a/src/test/meson.build b/src/test/meson.build
index 413dcdec621..12e65a8c433 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -211,7 +211,7 @@ tests += [
 
         [files('test-limits-util.c')],
 
-        [files('test-util.c')],
+        [files('test-logarithm.c')],
 
         [files('test-macro.c')],
 
diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
index 644bc9e27b8..45655d792ed 100644
--- a/src/test/test-af-list.c
+++ b/src/test/test-af-list.c
@@ -5,7 +5,6 @@
 #include "macro.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 _unused_
 static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index b542fe1ddf1..043978e9a62 100644
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -4,7 +4,6 @@
 #include "errno-util.h"
 #include "log.h"
 #include "tests.h"
-#include "util.h"
 #include "virt.h"
 
 int main(int argc, char *argv[]) {
diff --git a/src/test/test-async.c b/src/test/test-async.c
index 8eefad50447..b97fedcfc6d 100644
--- a/src/test/test-async.c
+++ b/src/test/test-async.c
@@ -6,7 +6,6 @@
 #include "async.h"
 #include "macro.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static bool test_async = false;
 
diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index 50ceb3a3559..b255dba0682 100644
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -18,7 +18,6 @@
 #include "errno-util.h"
 #include "tests.h"
 #include "time-util.h"
-#include "util.h"
 #include "virt.h"
 
 /* 20ms to test deadlocks; All timings use multiples of this constant as
diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index a9875defdd9..53e378eaab6 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -9,7 +9,6 @@
 #include "errno-util.h"
 #include "log.h"
 #include "tests.h"
-#include "util.h"
 
 static int test_acpi_fpdt(void) {
         usec_t loader_start, loader_exit;
diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index 77ec8019031..67acba23a79 100644
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -8,7 +8,6 @@
 #include "format-util.h"
 #include "log.h"
 #include "string-util.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         BtrfsQuotaInfo quota;
diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 38f74203246..68f0461a621 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -9,7 +9,6 @@
 #include "parse-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 /* verify the capability parser */
 TEST(cap_list) {
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 7113b07a952..0b286ed8e45 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -15,7 +15,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 #include "version.h"
 
 static void check_p_d_u(const char *path, int code, const char *result) {
diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index da8f3a97f21..beda749fb88 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -19,7 +19,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 
 static void setup_test_dir(char *tmp_dir, const char *files, ...) {
         va_list ap;
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 8c27dcac3f6..0acb4131b59 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -9,7 +9,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static void test_config_parse_path_one(const char *rvalue, const char *expected) {
         _cleanup_free_ char *path = NULL;
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 4091b425d16..e4e38ac731b 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -20,7 +20,6 @@
 #include "tests.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "xattr-util.h"
 
 TEST(copy_file) {
diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index 7317193363a..b10db0ae9dd 100644
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -8,7 +8,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 #include "utf8.h"
 
 static void test_ellipsize_mem_one(const char *s, size_t old_length, size_t new_length) {
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index cc37d96327b..4796e3c2080 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -10,7 +10,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(strv_env_delete) {
         _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL;
diff --git a/src/test/test-errno-list.c b/src/test/test-errno-list.c
index 6c8f384cab5..f91a1f770f0 100644
--- a/src/test/test-errno-list.c
+++ b/src/test/test-errno-list.c
@@ -7,7 +7,6 @@
 #include "macro.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(errno_list) {
         for (size_t i = 0; i < ELEMENTSOF(errno_names); i++) {
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 0283caeca61..51c3e755e04 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -32,7 +32,6 @@
 #include "tmpfile-util.h"
 #include "unit.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 static char *user_runtime_unit_dir = NULL;
diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c
index 5d63eeee37c..b6ad290eef9 100644
--- a/src/test/test-fdset.c
+++ b/src/test/test-fdset.c
@@ -8,7 +8,6 @@
 #include "macro.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(fdset_new_fill) {
         int fd = -1;
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index ba6dd9ace9d..6f27cd43d67 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -24,7 +24,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(parse_env_file) {
         _cleanup_(unlink_tempfilep) char
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 9c1ced7591a..d0259843b67 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -22,7 +22,6 @@
 #include "tmpfile-util.h"
 #include "umask-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 static const char *arg_test_dir = NULL;
diff --git a/src/test/test-gpt.c b/src/test/test-gpt.c
index 5037f498bb3..8c313c66cc8 100644
--- a/src/test/test-gpt.c
+++ b/src/test/test-gpt.c
@@ -8,7 +8,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(gpt_types_against_architectures) {
         int r;
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index dbf762cc0b1..5daa0e64f65 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -3,7 +3,6 @@
 #include "hashmap.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 unsigned custom_counter = 0;
 static void custom_destruct(void* p) {
diff --git a/src/test/test-json.c b/src/test/test-json.c
index 946c827ccf0..17ad2017f8c 100644
--- a/src/test/test-json.c
+++ b/src/test/test-json.c
@@ -12,7 +12,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 static void test_tokenizer_one(const char *data, ...) {
         unsigned line = 0, column = 0;
diff --git a/src/test/test-list.c b/src/test/test-list.c
index 2c764d7b711..ea45f5b95cf 100644
--- a/src/test/test-list.c
+++ b/src/test/test-list.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "list.h"
-#include "util.h"
 
 int main(int argc, const char *argv[]) {
         size_t i;
diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index 9f50c6227fa..aa501b650aa 100644
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -6,7 +6,6 @@
 #include "macro.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(get_locales) {
         _cleanup_strv_free_ char **locales = NULL;
diff --git a/src/test/test-log.c b/src/test/test-log.c
index ae3d073d827..f21d88f39ab 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -7,7 +7,6 @@
 #include "log.h"
 #include "process-util.h"
 #include "string-util.h"
-#include "util.h"
 
 assert_cc(IS_SYNTHETIC_ERRNO(SYNTHETIC_ERRNO(EINVAL)));
 assert_cc(!IS_SYNTHETIC_ERRNO(EINVAL));
diff --git a/src/test/test-util.c b/src/test/test-logarithm.c
similarity index 98%
rename from src/test/test-util.c
rename to src/test/test-logarithm.c
index 8d0c4a3a42d..b6818b422cf 100644
--- a/src/test/test-util.c
+++ b/src/test/test-logarithm.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "logarithm.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(LOG2ULL) {
         assert_se(LOG2ULL(0) == 0);
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 37acc782eb8..e4d763ecd57 100644
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -11,7 +11,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 TEST(namespace_cleanup_tmpdir) {
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index f3987619826..06b9793fe31 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -16,7 +16,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(print_paths) {
         log_info("DEFAULT_PATH=%s", DEFAULT_PATH);
diff --git a/src/test/test-path.c b/src/test/test-path.c
index 4066f6ad939..f325b4e51a0 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -17,7 +17,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "unit.h"
-#include "util.h"
 
 typedef void (*test_function_t)(Manager *m);
 
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index a9b2f537ca0..7e4b5d82557 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -34,7 +34,6 @@
 #include "terminal-util.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 static void test_get_process_comm_one(pid_t pid) {
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index 3eb7ad30cf5..717cb0db16d 100644
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -9,7 +9,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "time-util.h"
-#include "util.h"
 
 static void test_testing(void) {
         bool b;
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 799e93dcedc..de64f920d17 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -15,7 +15,6 @@
 #include "sleep-config.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(parse_sleep_config) {
         _cleanup_(free_sleep_configp) SleepConfig *sleep_config = NULL;
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 9233c63f90a..5c12a0597ad 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -6,7 +6,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 static ssize_t add_string(struct strbuf *sb, const char *s) {
         return strbuf_add_string(sb, s, strlen(s));
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index d0a2272794c..4047139c269 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -9,7 +9,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "utf8.h"
-#include "util.h"
 
 TEST(string_erase) {
         char *x;
diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c
index 5152cf2cf86..6f73d2686de 100644
--- a/src/test/test-strip-tab-ansi.c
+++ b/src/test/test-strip-tab-ansi.c
@@ -7,7 +7,6 @@
 #include "string-util.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(strip_tab_ansi) {
         _cleanup_free_ char *urlified = NULL, *q = NULL, *qq = NULL;
diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index dd8dbdea613..b679522fc62 100644
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -5,7 +5,6 @@
 #include "string-util.h"
 #include "strxcpyx.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(strpcpy) {
         char target[25];
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 30ca1871cb9..6301dedb09e 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -36,7 +36,6 @@
 #include "timer.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "util.h"
 #include "virt.h"
 
 int main(int argc, char **argv) {
diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index 292e5348bcc..8d0e4520382 100644
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -14,7 +14,6 @@
 #include "terminal-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define LOREM_IPSUM "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor " \
         "incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation " \
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index f26701767f3..c58ac933bbf 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -15,7 +15,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(tmpfiles) {
         _cleanup_free_ char *cmd = NULL, *cmd2 = NULL, *ans = NULL, *ans2 = NULL, *d = NULL, *tmp = NULL, *line = NULL;
diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index ce8b8e4bcaf..c7595731739 100644
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -11,7 +11,6 @@
 #include "tmpfile-util.h"
 #include "uid-range.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 TEST(uid_range) {
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 43fdb15d1cc..98fffc7c87e 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -22,7 +22,6 @@
 #include "unit-printf.h"
 #include "unit.h"
 #include "user-util.h"
-#include "util.h"
 
 static char *runtime_dir = NULL;
 
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index f070c171fe4..7ba0cb7dd23 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -5,7 +5,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "utf8.h"
-#include "util.h"
 
 TEST(utf8_is_printable) {
         assert_se(utf8_is_printable("ascii is valid\tunicode", 22));
diff --git a/src/test/test-xml.c b/src/test/test-xml.c
index e69d6d0fe4b..5dee5c1beda 100644
--- a/src/test/test-xml.c
+++ b/src/test/test-xml.c
@@ -4,7 +4,6 @@
 
 #include "alloc-util.h"
 #include "string-util.h"
-#include "util.h"
 #include "xml.h"
 
 static void test_one(const char *data, ...) {
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index e9fa00aacab..da540856ee9 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -22,6 +22,7 @@
 #include "fs-util.h"
 #include "list.h"
 #include "log.h"
+#include "logarithm.h"
 #include "network-util.h"
 #include "ratelimit.h"
 #include "resolve-private.h"
@@ -32,7 +33,6 @@
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
 #include "user-util.h"
-#include "util.h"
 
 #ifndef ADJ_SETOFFSET
 #define ADJ_SETOFFSET                   0x0100  /* add 'time' to current time */
diff --git a/src/udev/test-udev-event.c b/src/udev/test-udev-event.c
index b6b2c91b2e9..42f435916bd 100644
--- a/src/udev/test-udev-event.c
+++ b/src/udev/test-udev-event.c
@@ -5,7 +5,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "udev-event.h"
-#include "util.h"
 
 #define BUF_SIZE 1024
 
diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index 8cd627807f9..faaafb23f66 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -11,7 +11,6 @@
 #include "string-util.h"
 #include "strxcpyx.h"
 #include "udev-builtin.h"
-#include "util.h"
 
 static int builtin_btrfs(sd_device *dev, sd_netlink **rtnl, int argc, char *argv[], bool test) {
         struct btrfs_ioctl_vol_args args = {};
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 07421202483..465913ce31f 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -19,7 +19,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "udev-builtin.h"
-#include "util.h"
 
 /* we must use this kernel-compatible implementation */
 #define BITS_PER_LONG (sizeof(unsigned long) * 8)
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index c8b773611f9..625c4faad83 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -18,7 +18,6 @@
 #include "socket-util.h"
 #include "strxcpyx.h"
 #include "udev-ctrl.h"
-#include "util.h"
 
 /* wire protocol magic must match */
 #define UDEV_CTRL_MAGIC                                0xdead1dea
diff --git a/src/udev/udev-event.h b/src/udev/udev-event.h
index 6d823331aa1..c54c7891b61 100644
--- a/src/udev/udev-event.h
+++ b/src/udev/udev-event.h
@@ -12,7 +12,6 @@
 #include "macro.h"
 #include "udev-rules.h"
 #include "udev-util.h"
-#include "util.h"
 
 #define READ_END  0
 #define WRITE_END 1
diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 06c61e5c07c..8dc3a8d955a 100644
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -25,7 +25,6 @@
 #include "time-util.h"
 #include "udevadm.h"
 #include "udev-ctrl.h"
-#include "util.h"
 #include "virt.h"
 
 static int help(void) {
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 972cda129df..a4468cf24f0 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -4,7 +4,6 @@
 
 #include "hwdb-util.h"
 #include "udevadm.h"
-#include "util.h"
 
 static const char *arg_test = NULL;
 static const char *arg_root = NULL;
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index cd3786b416d..b742c1a2873 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -14,7 +14,6 @@
 #include "udev-util.h"
 #include "udevadm.h"
 #include "udevd.h"
-#include "util.h"
 #include "verbs.h"
 
 static int help(void) {
diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index c2312c79099..13b4839989f 100644
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -27,7 +27,6 @@
 #include <linux/videodev2.h>
 
 #include "fd-util.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         static const struct option options[] = {
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 0995e3557eb..675526f3ace 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -23,7 +23,6 @@
 #include "stdio-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 #include "utmp-wtmp.h"
 
 typedef struct Context {
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index cdf28ac6aca..98f978df0af 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -33,7 +33,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "virt.h"
 
 static int verify_vc_device(int fd) {