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.

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
 

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

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;

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);
 

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;

src/basic/capability-util.h

@@ -8,7 +8,6 @@
 
 #include "macro.h"
 #include "missing_capability.h"
-#include "util.h"
 
 #define CAP_ALL UINT64_MAX
 

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);

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. */

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;

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"

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

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);

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;

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',

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;

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;

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

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;

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);

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;
 

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__)
 

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",

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
 

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;

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;

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;

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;

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 "-.:")

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)
 

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)
 

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 };

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);

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;

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;

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;

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 "/.#\"\'"

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 {

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 {

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
 

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

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;

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"

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. */
 

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
 

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

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[] = {

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;

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)

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);

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,

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);

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;

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,

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;

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),

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"

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)
 

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",

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;

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];

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)
 

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;

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) {

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"

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));

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);

src/libsystemd/sd-journal/fsprg.h

@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "macro.h"
-#include "util.h"
 
 #ifdef __cplusplus
 extern "C" {

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;

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[] = {

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;

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;

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;

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:
  *

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);

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;

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 {

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;

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);

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))
 

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;

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);
 

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);

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;

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,

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,

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)
 

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,

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,

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;

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;

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",

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",

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)

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)

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"

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) {

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

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"

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"