static-destruct: Reduce transitive includes

src/ac-power/ac-power.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "battery-util.h"
 #include "build.h"

src/analyze/analyze-critical-chain.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-critical-chain.h"
 #include "analyze-time-data.h"

src/ask-password/ask-password.c

@@ -7,6 +7,7 @@
 
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "ask-password-api.h"
 #include "build.h"
 #include "bus-polkit.h"

src/basic/static-destruct.h

@@ -2,10 +2,11 @@
 
 #pragma once
 
-#include "alloc-util.h"
 #include "macro.h"
 #include "memory-util.h"
 
+typedef void (*free_func_t)(void *p);
+
 /* A framework for registering static variables that shall be freed on shutdown of a process. It's a bit like gcc's
  * destructor attribute, but allows us to precisely schedule when we want to free the variables. This is supposed to
  * feel a bit like the gcc cleanup attribute, but for static variables. Note that this does not work for static

src/battery-check/battery-check.c

@@ -7,6 +7,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "battery-util.h"
 #include "build.h"
 #include "errno-util.h"

src/environment-d-generator/environment-d-generator.c

@@ -2,6 +2,7 @@
 
 #include "sd-path.h"
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "constants.h"
 #include "env-file.h"

src/factory-reset/factory-reset-tool.c

@@ -5,6 +5,7 @@
 #include "sd-json.h"
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "build.h"
 #include "device-util.h"

src/hibernate-resume/hibernate-resume.c

@@ -4,6 +4,7 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "devnum-util.h"
 #include "hibernate-resume-config.h"

src/import/import-generator.c

@@ -2,6 +2,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "creds-util.h"
 #include "discover-image.h"
 #include "efivars.h"

src/libsystemd-network/test-ndisc-send.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "ether-addr-util.h"
 #include "fd-util.h"

src/locale/localectl.c

@@ -5,6 +5,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"

src/modules-load/modules-load.c

@@ -5,6 +5,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "conf-files.h"
 #include "constants.h"

src/network/generator/main.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "creds-util.h"
 #include "errno-util.h"

src/network/networkctl.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "log.h"
 #include "logs-show.h"

src/network/wait-online/wait-online.c

@@ -6,6 +6,7 @@
 
 #include "sd-daemon.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "daemon-util.h"
 #include "log.h"

src/oom/oomctl.c

@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"

src/oom/oomd.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "bus-log-control-api.h"
 #include "bus-object.h"

src/pcrextend/pcrextend.c

@@ -6,6 +6,7 @@
 #include "sd-messages.h"
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "efi-loader.h"
 #include "escape.h"

src/pcrlock/pcrlock.c

@@ -9,6 +9,7 @@
 #include "sd-json.h"
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "ask-password-api.h"
 #include "bitfield.h"
 #include "blockdev-util.h"

src/rc-local-generator/rc-local-generator.c

@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "generator.h"
 #include "initrd-util.h"
 #include "log.h"

src/sbsign/sbsign.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "authenticode.h"
 #include "build.h"

src/sleep/sleep.c

@@ -19,6 +19,7 @@
 #include "sd-json.h"
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "battery-capacity.h"
 #include "battery-util.h"
 #include "blockdev-util.h"

src/ssh-generator/ssh-generator.c

@@ -4,6 +4,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "creds-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/ssh-generator/ssh-proxy.c

@@ -6,6 +6,7 @@
 
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "io-util.h"
 #include "iovec-util.h"

src/system-update-generator/system-update-generator.c

@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "fs-util.h"
 #include "generator.h"
 #include "initrd-util.h"

src/sysupdate/updatectl.c

@@ -6,6 +6,7 @@
 #include "sd-bus.h"
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "bus-error.h"
 #include "bus-label.h"

src/timedate/timedatectl.c

@@ -8,6 +8,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"

src/tpm2-setup/tpm2-clear.c

@@ -4,6 +4,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "env-util.h"
 #include "fileio.h"

src/tpm2-setup/tpm2-setup.c

@@ -5,6 +5,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "build.h"
 #include "fd-util.h"
 #include "fileio.h"

src/udev/cdrom_id/cdrom_id.c

@@ -10,6 +10,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "fd-util.h"
 #include "main-func.h"

src/udev/fido_id/fido_id.c

@@ -15,6 +15,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "device-private.h"
 #include "device-util.h"

src/udev/udevadm-cat.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "log.h"
 #include "parse-argument.h"
 #include "pretty-print.h"

src/userdb/userdbctl.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "build.h"
 #include "copy.h"

src/validatefs/validatefs.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "blkid-util.h"
 #include "blockdev-util.h"
 #include "build.h"

src/vpick/vpick-tool.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "build.h"
 #include "format-table.h"

src/xdg-autostart-generator/xdg-autostart-generator.c

@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "generator.h"

src/xdg-autostart-generator/xdg-autostart-service.c

@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "conf-parser.h"
 #include "escape.h"
 #include "extract-word.h"