shared: include what we use

The next step of a general cleanup of our includes. This one mostly
adds missing includes but there are a few removals as well.

diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
index 30e03c0652f4f1692ea10e283356885683e453fc..dcdef50a18cb054c3cbd83559c8b2f849ac0756d 100644 (file)
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -19,9 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
 #include <fcntl.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -30,7 +31,6 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "time-util.h"
-#include "util.h"
 
 struct acpi_table_header {
         char signature[4];

diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index f6ac43adfe7756536b6da19532a8b473adaaff21..f8cbb333d5ae6786e6402cb98eb1a2c9f95966c4 100644 (file)
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -19,11 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stddef.h>
+
 #include "alloc-util.h"
 #include "apparmor-util.h"
 #include "fileio.h"
 #include "parse-util.h"
-#include "util.h"
 
 bool mac_apparmor_use(void) {
         static int cached_use = -1;

diff --git a/src/shared/architecture.c b/src/shared/architecture.c
index 73937bd5a7f8d8e131854039e7e342f9c341be27..ca6821b4d8c7e18cc832fae2712e10605cdd60ef 100644 (file)
--- a/src/shared/architecture.c
+++ b/src/shared/architecture.c
@@ -22,6 +22,7 @@
 #include <sys/utsname.h>
 
 #include "architecture.h"
+#include "macro.h"
 #include "string-table.h"
 #include "string-util.h"
 

diff --git a/src/shared/architecture.h b/src/shared/architecture.h
index 61d067cad7bd6c8d1c4e86e2f8d5e7750348393b..c6af4a5b33dbdaca8ffa66ec258c341a5812f1e5 100644 (file)
--- a/src/shared/architecture.h
+++ b/src/shared/architecture.h
@@ -23,6 +23,7 @@
 
 #include <endian.h>
 
+#include "macro.h"
 #include "util.h"
 
 /* A cleaned up architecture definition. We don't want to get lost in

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index fbe2b6fecb95e7d6911641069b05f9d076cb0cae..bc12f89f02704f5ce8172b524cb7a4328442aaa5 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -21,13 +21,22 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
+#include <limits.h>
 #include <poll.h>
+#include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/inotify.h>
 #include <sys/signalfd.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/uio.h>
 #include <sys/un.h>
 #include <termios.h>
 #include <unistd.h>
@@ -38,6 +47,8 @@
 #include "fileio.h"
 #include "formats-util.h"
 #include "io-util.h"
+#include "log.h"
+#include "macro.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "random-util.h"
@@ -46,6 +57,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "umask-util.h"
 #include "util.h"
 

diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index e605490c3211c58c8ccafab1f09aff0317d9e6c6..2a7a38dd14dcc7d7509df899434eaf13da24050c 100644 (file)
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -20,8 +20,11 @@
 ***/
 
 #include <errno.h>
+#include <fcntl.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <syslog.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
index 879aca93744de074b709727ae3906735eba329f2..63daf932f0a3571ad5e0ac2f2ee5f360f3e00462 100644 (file)
--- a/src/shared/boot-timestamps.c
+++ b/src/shared/boot-timestamps.c
@@ -23,6 +23,8 @@
 #include "acpi-fpdt.h"
 #include "boot-timestamps.h"
 #include "efivars.h"
+#include "macro.h"
+#include "time-util.h"
 
 int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) {
         usec_t x = 0, y = 0, a;

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 6c241503266a6e5586a8bcc847c37f083164aa54..e427cc147013ff1174199b84cc4d9cbd47d0ff6c 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -19,14 +19,24 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
+#include <unistd.h>
 
+#include "sd-bus-protocol.h"
 #include "sd-bus.h"
 #include "sd-daemon.h"
 #include "sd-event.h"
+#include "sd-id128.h"
 
 #include "alloc-util.h"
-#include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-label.h"
 #include "bus-message.h"
@@ -35,7 +45,12 @@
 #include "def.h"
 #include "env-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
+#include "hashmap.h"
+#include "install.h"
+#include "kdbus.h"
+#include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "parse-util.h"
@@ -49,6 +64,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "syslog-util.h"
+#include "time-util.h"
 #include "unit-name.h"
 #include "user-util.h"
 #include "utf8.h"

diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index ec731d375efa44f1eeac1d49b2d3811ddc15869b..a5e3b6a0b5a4a45be118b57825be5e6dd0314b10 100644 (file)
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -21,11 +21,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "sd-bus-vtable.h"
 #include "sd-bus.h"
 #include "sd-event.h"
 
 #include "hashmap.h"
 #include "install.h"
+#include "macro.h"
 #include "string-util.h"
 #include "time-util.h"
 

diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 129ffc7056bebbd62be6829d5f3f6b8294900053..d256b5a7cc6464b4cb5f3b145422fdd09f7112cc 100644 (file)
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -21,7 +21,9 @@
 
 #include <dirent.h>
 #include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "alloc-util.h"
@@ -31,11 +33,11 @@
 #include "formats-util.h"
 #include "locale-util.h"
 #include "macro.h"
+#include "output-mode.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static int compare(const void *a, const void *b) {
         const pid_t *p = a, *q = b;

diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h
index 5842bdd15ea1620a627b1fe2dbb4bcd3e7e6743a..24b758658d637a49c3ffb1b5bd16c93fa3770c77 100644 (file)
--- a/src/shared/cgroup-show.h
+++ b/src/shared/cgroup-show.h
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 
 #include "logs-show.h"
+#include "output-mode.h"
 
 int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);
 int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);

diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 71cc613704cd99fbbc4a00dc73b479b5b2491ec6..2c494d3a31ad17e3fa546206716982bbdb76abc6 100644 (file)
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -20,22 +20,29 @@
 ***/
 
 #include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <mqueue.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/sem.h>
 #include <sys/shm.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "clean-ipc.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
+#include "log.h"
+#include "macro.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 static int clean_sysvipc_shm(uid_t delete_uid) {
         _cleanup_fclose_ FILE *f = NULL;

diff --git a/src/shared/condition.c b/src/shared/condition.c
index 14d18429b6fc60c947b95381bf1c98b2e35ced36..dedaf2291f7fb889927f3b367fb6442ade03f8a3 100644 (file)
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -20,9 +20,13 @@
 ***/
 
 #include <errno.h>
+#include <fcntl.h>
 #include <fnmatch.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "sd-id128.h"
@@ -38,6 +42,8 @@
 #include "glob-util.h"
 #include "hostname-util.h"
 #include "ima-util.h"
+#include "list.h"
+#include "macro.h"
 #include "mount-util.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 486122b0fd68ac9bfd35c0212aa7fc87222c1945..2aae49fbce8cd0c08c900c8de32fb21f688a7d57 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -20,15 +20,17 @@
 ***/
 
 #include <errno.h>
+#include <limits.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include "sd-messages.h"
+#include <sys/types.h>
 
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "log.h"
@@ -40,8 +42,8 @@
 #include "string-util.h"
 #include "strv.h"
 #include "syslog-util.h"
+#include "time-util.h"
 #include "utf8.h"
-#include "util.h"
 
 int config_item_table_lookup(
                 const void *table,

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index 2872b22d9d18b1896e31a6db8202c6918dea749d..027ed209d9717b80feb6130016d293871eaead3b 100644 (file)
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -21,9 +21,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
+#include <syslog.h>
 
+#include "alloc-util.h"
+#include "log.h"
 #include "macro.h"
 
 /* An abstract parser for simple, line based, shallow configuration

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index ad3c17d5bd108262fef6fad863a030086d90dc22..ff583faa6ed7fa376d0e1530ad47e55b02c17476 100644 (file)
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -26,6 +26,7 @@
 #include "alloc-util.h"
 #include "dev-setup.h"
 #include "label.h"
+#include "log.h"
 #include "path-util.h"
 #include "user-util.h"
 #include "util.h"

diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index 429aa6d2cb451580110094916b701db3590cfcd4..0466857042acf87fc761a9427c637d0e51c4a40b 100644 (file)
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -24,9 +24,18 @@
 #include <stringprep.h>
 #endif
 
+#include <endian.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+
 #include "alloc-util.h"
 #include "dns-domain.h"
+#include "hashmap.h"
 #include "hexdecoct.h"
+#include "in-addr-util.h"
+#include "macro.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h
index e48d8c6b9d38eb3a8972bb4febceedd95e76e1f1..3f8f621802f9df7d4e648a127831952816fc3f73 100644 (file)
--- a/src/shared/dns-domain.h
+++ b/src/shared/dns-domain.h
@@ -22,6 +22,11 @@
 #pragma once
 
 
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include "hashmap.h"
 #include "in-addr-util.h"
 

diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 0d44401cc2ed914fd5ad976ea62a0642b9fae0ea..692e8b83385cca475c464f248a8e176ec6629738 100644 (file)
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -19,17 +19,27 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <dirent.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "dropin.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio-label.h"
+#include "hashmap.h"
+#include "log.h"
+#include "macro.h"
 #include "mkdir.h"
 #include "path-util.h"
+#include "set.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
+#include "unit-name.h"
 
 int drop_in_file(const char *dir, const char *unit, unsigned level,
                  const char *name, char **_p, char **_q) {

diff --git a/src/shared/dropin.h b/src/shared/dropin.h
index d4531fca2da9c1feec0f4cbbdc0660aedf6ca2b3..a8d647e990b4b062c3847ea27019645ae3933aec 100644 (file)
--- a/src/shared/dropin.h
+++ b/src/shared/dropin.h
@@ -21,6 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "hashmap.h"
 #include "macro.h"
 #include "set.h"
 #include "unit-name.h"

diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 89deeb9b550137001ebb8a61b799a3bd7ae90c90..13af68d539e727235cb9ace15cccd228cd0fc3e4 100644 (file)
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -19,17 +19,27 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
+#include "sd-id128.h"
+
 #include "alloc-util.h"
 #include "dirent-util.h"
 #include "efivars.h"
 #include "fd-util.h"
 #include "io-util.h"
+#include "macro.h"
 #include "parse-util.h"
 #include "stdio-util.h"
+#include "time-util.h"
 #include "utf8.h"
 #include "util.h"
 #include "virt.h"

diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index 5cb4c3af4e55531184c85fe732d00ee9ceaae09d..94af9717b02d44e318f7d0f42ae26c53b773e197 100644 (file)
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -22,6 +22,8 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "sd-id128.h"
 

diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index 5acfb0191b45e7323511e1e294c072fd066b6b0b..96061223459a8cd7da0357de224afcaf500d517d 100644 (file)
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -19,9 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <alloca.h>
 #include <arpa/inet.h>
+#include <endian.h>
+#include <errno.h>
 #include <net/if.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <string.h>
+#include <sys/socket.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter/nf_nat.h>
 #include <linux/netfilter/xt_addrtype.h>
@@ -29,7 +34,8 @@
 
 #include "alloc-util.h"
 #include "firewall-util.h"
-#include "util.h"
+#include "in-addr-util.h"
+#include "macro.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct xtc_handle*, iptc_free);
 

diff --git a/src/shared/firewall-util.h b/src/shared/firewall-util.h
index 93152e3978c9b51abc1c39191b4fe3f0f780783d..463e09bcaf6a4db5bb73e805a99e8c6482bdabfb 100644 (file)
--- a/src/shared/firewall-util.h
+++ b/src/shared/firewall-util.h
@@ -21,6 +21,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "in-addr-util.h"
 
 #ifdef HAVE_LIBIPTC

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index eb2845cddf4f8b4eb23b9db080ad97434853b1e9..d0139019730c31f2df2214cfb5e9273c3427aeaf 100644 (file)
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -19,9 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+#include <mntent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "alloc-util.h"
 #include "device-nodes.h"
 #include "fstab-util.h"
+#include "macro.h"
 #include "mount-util.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 9998c6441605b827dee50226a8d3648fc7706fb4..37de3f7cb1847e7fa3424bfbfb8b706911fe505b 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -28,11 +29,13 @@
 #include "fileio.h"
 #include "fstab-util.h"
 #include "generator.h"
+#include "log.h"
+#include "macro.h"
 #include "mkdir.h"
-#include "mount-util.h"
 #include "path-util.h"
 #include "special.h"
 #include "string-util.h"
+#include "time-util.h"
 #include "unit-name.h"
 #include "util.h"
 

diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index ddc8c00a2d5644930bd71c919f03fd74ee42a223..29ce732b56fb2de693314e1b605432b4e4c0a48c 100644 (file)
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -19,9 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+#include <string.h>
+
 #include "alloc-util.h"
 #include "btrfs-util.h"
 #include "import-util.h"
+#include "log.h"
+#include "macro.h"
 #include "path-util.h"
 #include "string-table.h"
 #include "string-util.h"

diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 74b909d34d742dc397fb9efd89b987ceb7ae573d..645b3ce33cfb598b4a6fb6da1d0b2cd292d4e74c 100644 (file)
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -19,15 +19,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
-#include "alloc-util.h"
 #include "formats-util.h"
 #include "install-printf.h"
+#include "install.h"
+#include "macro.h"
 #include "specifier.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
         UnitFileInstallInfo *i = userdata;

diff --git a/src/shared/install.c b/src/shared/install.c
index 17e03e59cd4da58641911b50007d69fc1d73a551..b37f8922dfa91cf571ef1a2055de1dcfe76c7182 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -19,22 +19,31 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "dirent-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "hashmap.h"
 #include "install-printf.h"
 #include "install.h"
+#include "log.h"
+#include "macro.h"
 #include "mkdir.h"
 #include "path-lookup.h"
 #include "path-util.h"
@@ -45,7 +54,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 #define UNIT_FILE_FOLLOW_SYMLINK_MAX 64
 

diff --git a/src/shared/install.h b/src/shared/install.h
index 45a417df92af892c28c6d81bfaaf8dd97e5f716b..5519fbcf8f113d86152c02beee0513426bbe37fa 100644 (file)
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -30,7 +30,10 @@ typedef struct UnitFileChange UnitFileChange;
 typedef struct UnitFileList UnitFileList;
 typedef struct UnitFileInstallInfo UnitFileInstallInfo;
 
+#include <stdbool.h>
+
 #include "hashmap.h"
+#include "macro.h"
 #include "path-lookup.h"
 #include "strv.h"
 #include "unit-name.h"

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 0d7892ac1e7940dd6756c98ba84245a5c6541029..193dad194372a3cc35348be45be05a8b19273cc3 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -21,9 +21,17 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <signal.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
+#include <syslog.h>
 #include <time.h>
+#include <unistd.h>
+
+#include "sd-id128.h"
+#include "sd-journal.h"
 
 #include "alloc-util.h"
 #include "fd-util.h"
@@ -34,11 +42,15 @@
 #include "journal-internal.h"
 #include "log.h"
 #include "logs-show.h"
+#include "macro.h"
+#include "output-mode.h"
 #include "parse-util.h"
 #include "process-util.h"
+#include "sparse-endian.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "utf8.h"
 #include "util.h"
 

diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 98927bbc5982b6d2088ebe682c2ab385a9681cab..396050936da4eeca7fbcb482e14ae8aaba787f23 100644 (file)
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -22,11 +22,15 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
 #include <sys/types.h>
 
 #include "sd-journal.h"
 
+#include "macro.h"
 #include "output-mode.h"
+#include "time-util.h"
 #include "util.h"
 
 int output_journal(

diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 2c1da0a40d51ccc0cef05709633b009afb98244e..2ded0ff6983a3fa1e8070c1446846c26e45dd829 100644 (file)
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -19,10 +19,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <linux/fs.h>
-#include <sys/statfs.h>
-
 #include "alloc-util.h"
 #include "btrfs-util.h"
 #include "chattr-util.h"
@@ -30,6 +35,10 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
+#include "hashmap.h"
+#include "lockfile-util.h"
+#include "log.h"
+#include "macro.h"
 #include "machine-image.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -37,7 +46,9 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "utf8.h"
+#include "util.h"
 #include "xattr-util.h"
 
 static const char image_search_path[] =

diff --git a/src/shared/machine-image.h b/src/shared/machine-image.h
index 038db7453c3567afe1dfb5f8d8c6e1667c2ae540..5e9d8f6980798ddea597bee0f1e31ad9aac99611 100644 (file)
--- a/src/shared/machine-image.h
+++ b/src/shared/machine-image.h
@@ -21,8 +21,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "hashmap.h"
 #include "lockfile-util.h"
+#include "macro.h"
 #include "time-util.h"
 
 typedef enum ImageType {

diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index 4172a63fd056ddd507fa3fa85515648c0575bcb6..23cbd8d6000b85c4a0f7279163807c0145f90ead 100644 (file)
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -19,10 +19,23 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/loop.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
 #include <sys/statvfs.h>
-#include <sys/vfs.h>
+#include <unistd.h>
+
+#include "sd-bus-protocol.h"
+#include "sd-bus.h"
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
@@ -30,7 +43,10 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "lockfile-util.h"
+#include "log.h"
 #include "machine-pool.h"
+#include "macro.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "parse-util.h"
@@ -39,7 +55,6 @@
 #include "signal-util.h"
 #include "stat-util.h"
 #include "string-util.h"
-#include "util.h"
 
 #define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL)
 #define VAR_LIB_MACHINES_FREE_MIN (1024UL*1024UL*750UL)

diff --git a/src/shared/machine-pool.h b/src/shared/machine-pool.h
index fe01d3d47c96e6c885481a7b3bd37492217f06a3..a1f2c5c626168cfb1098f9f95eb48f8026caee86 100644 (file)
--- a/src/shared/machine-pool.h
+++ b/src/shared/machine-pool.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdint.h>
+
 #include "sd-bus.h"
 
 /* Grow the /var/lib/machines directory after each 10MiB written */

diff --git a/src/shared/pager.c b/src/shared/pager.c
index d149bc1722d5ded57abe0ba202c82b2ab9adb6a0..07ce926d752b8aee255af82c2a5585420f4ca2c6 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -19,7 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/prctl.h>
@@ -28,13 +32,13 @@
 #include "copy.h"
 #include "fd-util.h"
 #include "locale-util.h"
+#include "log.h"
 #include "macro.h"
 #include "pager.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static pid_t pager_pid = 0;
 

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 4a82bd18cde3ca86ec6e60bb831b96b9f337a35b..90114001ee88347c50eeb3214d58baa0517f9602 100644 (file)
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -26,6 +26,8 @@
 
 #include "alloc-util.h"
 #include "install.h"
+#include "log.h"
+#include "macro.h"
 #include "path-lookup.h"
 #include "path-util.h"
 #include "string-util.h"

diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index e35c8d3c046a83dd892a977afa1a286fe5a12bdc..b8036718baaa92c66a873bc85a5bc59ad2259d68 100644 (file)
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -21,6 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
 #include "macro.h"
 
 typedef struct LookupPaths {

diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 2666b8f7e22ffb7fac8f63d1d364fd6ddff58d88..e6a7a488c9d4f51c63412d10dab87570ec2a01fa 100644 (file)
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -19,15 +19,27 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
 #include <limits.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/epoll.h>
 #include <sys/ioctl.h>
+#include <sys/time.h>
 #include <termios.h>
+#include <unistd.h>
+
+#include "sd-event.h"
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "log.h"
+#include "macro.h"
 #include "ptyfwd.h"
-#include "util.h"
+#include "time-util.h"
 
 struct PTYForward {
         sd_event *event;

diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index 9b3214221bd2990a206ffc00d5b81a845da72278..002590d1cfa839587ee5e04acc033d3849462171 100644 (file)
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -25,6 +25,8 @@
 
 #include "sd-event.h"
 
+#include "macro.h"
+
 typedef struct PTYForward PTYForward;
 
 typedef enum PTYForwardFlags {

diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index 09baf51661c3ba5efa5421d89d418304d552751b..bd1d44a0abd260cdbfc1be616f0749fad40318f6 100644 (file)
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -19,11 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
 #include <seccomp.h>
+#include <stddef.h>
 
+#include "macro.h"
 #include "seccomp-util.h"
 #include "string-util.h"
-#include "util.h"
 
 const char* seccomp_arch_to_string(uint32_t c) {
 

diff --git a/src/shared/seccomp-util.h b/src/shared/seccomp-util.h
index 60d97154ec282edfc295aba514594d75dd4d2484..79ee8c728d1b4410e0cde5caa4940206035becda 100644 (file)
--- a/src/shared/seccomp-util.h
+++ b/src/shared/seccomp-util.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <seccomp.h>
+#include <stdint.h>
 
 const char* seccomp_arch_to_string(uint32_t c);
 int seccomp_arch_from_string(const char *n, uint32_t *ret);

diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 39b836d0535403c0c598ee8998dd6ecf5627d1c5..7ba11e2f0e96f3f962f2e456d8be83033b197218 100644 (file)
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -19,7 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "conf-parser.h"
@@ -27,11 +33,11 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
+#include "macro.h"
 #include "parse-util.h"
 #include "sleep-config.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 #define USE(x, y) do{ (x) = (y); (y) = NULL; } while(0)
 

diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 8ea6cb830bfc7ea9c1b8849a37749b57179cbf1c..ada4bdb17e284dfcc98e40d4a71bda0a76ae934a 100644 (file)
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -28,9 +28,11 @@
 #include "fd-util.h"
 #include "io-util.h"
 #include "log.h"
+#include "macro.h"
 #include "process-util.h"
 #include "spawn-polkit-agent.h"
 #include "stdio-util.h"
+#include "time-util.h"
 #include "util.h"
 
 #ifdef ENABLE_POLKIT

diff --git a/src/shared/specifier.c b/src/shared/specifier.c
index c5c4a4d7d7fad41bde406909cf40c86660aa1344..841f4654b08c1840d0ddce54cfe1afb87817fb75 100644 (file)
--- a/src/shared/specifier.c
+++ b/src/shared/specifier.c
@@ -19,15 +19,20 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/utsname.h>
 
+#include "sd-id128.h"
+
 #include "alloc-util.h"
 #include "hostname-util.h"
 #include "macro.h"
 #include "specifier.h"
 #include "string-util.h"
-#include "util.h"
 
 /*
  * Generic infrastructure for replacing %x style specifiers in

diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index fc885f6cb8140f2a79e81f7b16354916215477d7..b1bbbdaadddf1ac7d26ccbccb0cd9f467611b946 100644 (file)
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -21,14 +21,16 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdbool.h>
-#include <string.h>
+#include <stdio.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "base-filesystem.h"
 #include "fd-util.h"
+#include "log.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "path-util.h"

diff --git a/src/shared/switch-root.h b/src/shared/switch-root.h
index adf893a922e8219b362063d96a49bf382efd39b6..1350fd9b1c8e979d111484a138ae783f20b0342e 100644 (file)
--- a/src/shared/switch-root.h
+++ b/src/shared/switch-root.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <stdbool.h>
 /***
   This file is part of systemd.
 

diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 70caa542e740a6aa047c22650fd0280782b577fd..a2cb6e9763025d3171104856c3b37b84b8555b9d 100644 (file)
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -19,19 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <errno.h>
-#include <getopt.h>
-#include <limits.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "fileio.h"
 #include "log.h"
+#include "macro.h"
 #include "string-util.h"
 #include "sysctl-util.h"
-#include "util.h"
 
 char *sysctl_normalize(char *s) {
         char *n;

diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
index 079dd8752cceead399f81c0e8195ea8312a1848f..1ecef5a44c3207271bd110786b6eb7ba154dcb63 100644 (file)
--- a/src/shared/uid-range.c
+++ b/src/shared/uid-range.c
@@ -19,9 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "macro.h"
 #include "uid-range.h"
 #include "user-util.h"
-#include "util.h"
 
 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
         assert(range);

diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 13b32a0509b5b6ee33cddc1faae131e87022e993..e72f6fa1a26e0318cf9959d010cf7450ba87c0f4 100644 (file)
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -22,7 +22,11 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 #include <utmpx.h>
@@ -34,7 +38,9 @@
 #include "path-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "user-util.h"
+#include "util.h"
 #include "utmp-wtmp.h"
 
 int utmp_get_runlevel(int *runlevel, int *previous) {

diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index e0ceb873ac2a3f3859aa73f51b13a3be7efc13ab..3aec3f959dc1be73b5c55d54423933a4f0295e57 100644 (file)
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -21,6 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "time-util.h"
 #include "util.h"
 
 #ifdef HAVE_UTMP

diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 7131e94cdb77789b384382c7c0265cadfaf3a98f..bc171817eac47fe7dfaa4caa3e7e773c8175f41a 100644 (file)
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -22,11 +22,13 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <syslog.h>
 #include <unistd.h>
 #include <linux/watchdog.h>
 
 #include "fd-util.h"
 #include "log.h"
+#include "time-util.h"
 #include "watchdog.h"
 
 static int watchdog_fd = -1;

diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h
index b748b15857ba4b893bc3a03331cf14df9b92153c..fd1c11a6446cb1203fd80b3707d641e7ccdc69ee 100644 (file)
--- a/src/shared/watchdog.h
+++ b/src/shared/watchdog.h
@@ -21,6 +21,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
+#include "time-util.h"
 #include "util.h"
 
 int watchdog_set_timeout(usec_t *usec);