=== modified file 'dracut-module/password-agent.c'
--- dracut-module/password-agent.c	2020-12-06 12:02:04 +0000
+++ dracut-module/password-agent.c	2021-02-03 00:12:25 +0000
@@ -23,11 +23,13 @@
  * Contact the authors at <mandos@recompile.se>.
  */
 
-#define _GNU_SOURCE
-#include <inttypes.h>		/* uintmax_t, PRIuMAX, PRIdMAX,
-				   intmax_t, uint32_t, SCNx32,
-				   SCNuMAX, SCNxMAX */
-#include <stddef.h>		/* size_t */
+#define _GNU_SOURCE		/* pipe2(), O_CLOEXEC, setresgid(),
+				   setresuid(), asprintf(), getline(),
+				   basename() */
+#include <inttypes.h>		/* uintmax_t, strtoumax(), PRIuMAX,
+				   PRIdMAX, intmax_t, uint32_t,
+				   SCNx32, SCNuMAX, SCNxMAX */
+#include <stddef.h>		/* size_t, NULL */
 #include <sys/types.h>		/* pid_t, uid_t, gid_t, getuid(),
 				   getpid() */
 #include <stdbool.h>		/* bool, true, false */
@@ -40,10 +42,17 @@
 				   NSIG, sigismember(), SA_ONSTACK,
 				   SIG_DFL, SIG_IGN, SIGINT, SIGQUIT,
 				   SIGHUP, SIGSTOP, SIG_UNBLOCK */
+#include <unistd.h>		/* uid_t, gid_t, close(), pipe2(),
+				   fork(), _exit(), dup2(),
+				   STDOUT_FILENO, setresgid(),
+				   setresuid(), execv(), ssize_t,
+				   read(), dup3(), getuid(), dup(),
+				   STDERR_FILENO, pause(), write(),
+				   rmdir(), unlink(), getpid() */
 #include <stdlib.h>		/* EXIT_SUCCESS, EXIT_FAILURE,
-				   malloc(), free(), strtoumax(),
-				   realloc(), setenv(), calloc(),
-				   mkdtemp(), mkostemp() */
+				   malloc(), free(), realloc(),
+				   setenv(), calloc(), mkdtemp(),
+				   mkostemp() */
 #include <iso646.h>		/* not, or, and, xor */
 #include <error.h>		/* error() */
 #include <sysexits.h>		/* EX_USAGE, EX_OSERR, EX_OSFILE */
@@ -57,7 +66,7 @@
 #include <string.h>		/* strdup(), memcpy(),
 				   explicit_bzero(), memset(),
 				   strcmp(), strlen(), strncpy(),
-				   memcmp(), basename() */
+				   memcmp(), basename(), strerror() */
 #include <argz.h>		/* argz_create(), argz_count(),
 				   argz_extract(), argz_next(),
 				   argz_add() */
@@ -73,14 +82,7 @@
 				   ARGP_ERR_UNKNOWN, ARGP_KEY_ARGS,
 				   struct argp, argp_parse(),
 				   ARGP_NO_EXIT */
-#include <stdint.h>		/* SIZE_MAX */
-#include <unistd.h>		/* uid_t, gid_t, close(), pipe2(),
-				   fork(), _exit(), dup2(),
-				   STDOUT_FILENO, setresgid(),
-				   setresuid(), execv(), ssize_t,
-				   read(), dup3(), getuid(), dup(),
-				   STDERR_FILENO, pause(), write(),
-				   rmdir(), unlink(), getpid() */
+#include <stdint.h>		/* SIZE_MAX, uint32_t */
 #include <sys/mman.h>		/* munlock(), mlock() */
 #include <fcntl.h>		/* O_CLOEXEC, O_NONBLOCK, fcntl(),
 				   F_GETFD, F_GETFL, FD_CLOEXEC,
@@ -110,8 +112,9 @@
 			g_assert_null(), g_assert_false(),
 			g_assert_cmpint(), g_assert_cmpuint(),
 			g_test_skip(), g_assert_cmpstr(),
-			g_test_init(), g_test_add(), g_test_run(),
-			GOptionContext, g_option_context_new(),
+			g_test_message(), g_test_init(), g_test_add(),
+			g_test_run(), GOptionContext,
+			g_option_context_new(),
 			g_option_context_set_help_enabled(), FALSE,
 			g_option_context_set_ignore_unknown_options(),
 			gboolean, GOptionEntry, G_OPTION_ARG_NONE,

=== modified file 'plugin-helpers/mandos-client-iprouteadddel.c'
--- plugin-helpers/mandos-client-iprouteadddel.c	2018-02-18 01:29:21 +0000
+++ plugin-helpers/mandos-client-iprouteadddel.c	2021-02-03 00:12:25 +0000
@@ -25,49 +25,57 @@
 
 #define _GNU_SOURCE		/* program_invocation_short_name */
 #include <stdbool.h>		/* bool, false, true */
-#include <stdio.h>		/* fprintf(), stderr, FILE, vfprintf */
-#include <errno.h>		/* program_invocation_short_name,
-				   errno, perror(), EINVAL, ENOMEM */
-#include <stdarg.h>		/* va_list, va_start */
-#include <stdlib.h> 		/* EXIT_SUCCESS */
-#include <argp.h>		/* struct argp_option, error_t, struct
-				   argp_state, ARGP_KEY_ARG,
+#include <argp.h>		/* argp_program_version,
+				   argp_program_bug_address,
+				   struct argp_option,
+				   struct argp_state, ARGP_KEY_ARG,
 				   argp_usage(), ARGP_KEY_END,
 				   ARGP_ERR_UNKNOWN, struct argp,
-				   argp_parse() */
-#include <sysexits.h>		/* EX_USAGE, EX_OSERR */
-#include <netinet/ip.h>		/* sa_family_t, AF_INET6, AF_INET */
-#include <inttypes.h>		/* PRIdMAX, intmax_t */
-
+				   argp_parse(), ARGP_IN_ORDER */
+#include <errno.h>		/* errno,
+				   program_invocation_short_name,
+				   error_t, EINVAL, ENOMEM */
+#include <stdio.h>		/* fprintf(), stderr, perror(), FILE,
+				   vfprintf() */
+#include <stdarg.h>		/* va_list, va_start(), vfprintf() */
+#include <stdlib.h>		/* EXIT_SUCCESS */
 #include <netlink/netlink.h>	/* struct nl_addr, nl_addr_parse(),
 				   nl_geterror(),
-				   nl_addr_get_family(),
+				   nl_addr_get_family(), NLM_F_EXCL,
 				   nl_addr_put() */
-#include <netlink/route/route.h> /* struct rtnl_route,
-				    struct rtnl_nexthop,
-				    rtnl_route_alloc(),
-				    rtnl_route_set_family(),
-				    rtnl_route_set_protocol(),
-				    RTPROT_BOOT,
-				    rtnl_route_set_scope(),
-				    RT_SCOPE_LINK,
-				    rtnl_route_set_type(),
-				    RTN_UNICAST,
-				    rtnl_route_set_dst(),
-				    rtnl_route_set_table(),
-				    RT_TABLE_MAIN,
-				    rtnl_route_nh_alloc(),
-				    rtnl_route_nh_set_ifindex(),
-				    rtnl_route_add_nexthop(),
-				    rtnl_route_add(),
-				    rtnl_route_delete(),
-				    rtnl_route_put(),
-				    rtnl_route_nh_free() */
+#include <stddef.h>		/* NULL */
+#include <netlink/route/route.h>/* struct rtnl_route,
+				   struct rtnl_nexthop, NETLINK_ROUTE,
+				   rtnl_route_alloc(),
+				   rtnl_route_set_family(),
+				   rtnl_route_set_protocol(),
+				   RTPROT_BOOT,
+				   rtnl_route_set_scope(),
+				   RT_SCOPE_LINK,
+				   rtnl_route_set_type(), RTN_UNICAST,
+				   rtnl_route_set_dst(),
+				   rtnl_route_set_table(),
+				   RT_TABLE_MAIN,
+				   rtnl_route_nh_alloc(),
+				   rtnl_route_nh_set_ifindex(),
+				   rtnl_route_add_nexthop(),
+				   rtnl_route_add(),
+				   rtnl_route_delete(),
+				   rtnl_route_put(),
+				   rtnl_route_nh_free() */
 #include <netlink/socket.h>	/* struct nl_sock, nl_socket_alloc(),
 				   nl_connect(), nl_socket_free() */
-#include <netlink/route/link.h>	/* rtnl_link_get_kernel(),
+#include <strings.h>		/* strcasecmp() */
+#include <sys/socket.h>		/* AF_UNSPEC, AF_INET6, AF_INET */
+#include <sysexits.h>		/* EX_USAGE, EX_OSERR */
+#include <netlink/route/link.h> /* struct rtnl_link,
+				   rtnl_link_get_kernel(),
 				   rtnl_link_get_ifindex(),
 				   rtnl_link_put() */
+#include <netinet/in.h>		/* sa_family_t */
+#include <inttypes.h>		/* PRIdMAX, intmax_t */
+#include <stdint.h>		/* uint8_t */
+
 
 bool debug = false;
 const char *argp_program_version = "mandos-client-iprouteadddel " VERSION;

=== modified file 'plugin-runner.c'
--- plugin-runner.c	2021-01-31 21:40:15 +0000
+++ plugin-runner.c	2021-02-03 00:12:25 +0000
@@ -23,55 +23,69 @@
  * Contact the authors at <mandos@recompile.se>.
  */
 
-#define _GNU_SOURCE		/* TEMP_FAILURE_RETRY(), getline(),
-				   O_CLOEXEC, pipe2() */
+#define _GNU_SOURCE		/* strchrnul(), TEMP_FAILURE_RETRY(),
+				   getline(), asprintf(), O_CLOEXEC,
+				   scandirat(), pipe2() */
+#include <argp.h>		/* argp_program_version,
+				   argp_program_bug_address,
+				   struct argp_option,
+				   struct argp_state, argp_error(),
+				   ARGP_NO_EXIT, argp_state_help,
+				   ARGP_HELP_STD_HELP,
+				   ARGP_HELP_USAGE, ARGP_HELP_EXIT_OK,
+				   ARGP_KEY_ARG, ARGP_ERR_UNKNOWN,
+				   struct argp, argp_parse(),
+				   ARGP_IN_ORDER, ARGP_NO_HELP */
+#include <stdbool.h>		/* bool, false, true */
+#include <sys/types.h>		/* pid_t, sig_atomic_t, uid_t, gid_t,
+				   getuid(), setgid(), setuid() */
 #include <stddef.h>		/* size_t, NULL */
-#include <stdlib.h>		/* malloc(), reallocarray(), realloc(),
-				   EXIT_SUCCESS, exit() */
-#include <stdbool.h>		/* bool, true, false */
-#include <stdio.h>		/* fileno(), fprintf(),
-				   stderr, STDOUT_FILENO, fclose() */
-#include <sys/types.h>	        /* fstat(), struct stat, waitpid(),
-				   WIFEXITED(), WEXITSTATUS(), wait(),
-				   pid_t, uid_t, gid_t, getuid(),
-				   getgid() */
-#include <sys/select.h>		/* fd_set, select(), FD_ZERO(),
-				   FD_SET(), FD_ISSET(), FD_CLR */
-#include <sys/wait.h>		/* wait(), waitpid(), WIFEXITED(),
-				   WEXITSTATUS(), WTERMSIG() */
-#include <sys/stat.h>		/* struct stat, fstat(), S_ISREG() */
-#include <iso646.h>		/* and, or, not */
-#include <dirent.h>		/* struct dirent, scandirat() */
-#include <unistd.h>		/* fcntl(), F_GETFD, F_SETFD,
-				   FD_CLOEXEC, write(), STDOUT_FILENO,
-				   struct stat, fstat(), close(),
-				   setgid(), setuid(), S_ISREG(),
-				   faccessat() pipe2(), fork(),
-				   _exit(), dup2(), fexecve(), read(),
-				   lstat(), symlink() */
+#include <iso646.h>		/* or, and, not */
+#include <string.h>		/* strcmp(), strdup(), strchrnul(),
+				   strncmp(), strlen(), strcpy(),
+				   strsep(), strchr(), strsignal() */
+#include <stdlib.h>		/* malloc(), free(), reallocarray(),
+				   realloc(), EXIT_SUCCESS */
+#include <errno.h>		/* errno, EINTR, ENOMEM, ECHILD,
+				   error_t, EINVAL, EMFILE, ENFILE,
+				   ENOENT, ESRCH */
+#include <stdint.h>		/* SIZE_MAX */
+#define _GNU_SOURCE		/* strchrnul(), TEMP_FAILURE_RETRY(),
+				   getline(), asprintf(), O_CLOEXEC,
+				   scandirat(), pipe2() */
+#include <unistd.h>		/* TEMP_FAILURE_RETRY(), ssize_t,
+				   write(), STDOUT_FILENO, uid_t,
+				   gid_t, getuid(), fchown(), close(),
+				   symlink(), setgid(), setuid(),
+				   faccessat(), X_OK, pipe(), pipe2(),
+				   fork(), _exit(), dup2(), fexecve(),
+				   read(), getpass() */
 #include <fcntl.h>		/* fcntl(), F_GETFD, F_SETFD,
-				   FD_CLOEXEC, openat(), scandirat(),
-				   pipe2() */
-#include <string.h>		/* strsep, strlen(), strsignal(),
-				   strcmp(), strncmp() */
-#include <errno.h>		/* errno */
-#include <argp.h>		/* struct argp_option, struct
-				   argp_state, struct argp,
-				   argp_parse(), ARGP_ERR_UNKNOWN,
-				   ARGP_KEY_END, ARGP_KEY_ARG,
-				   error_t */
-#include <signal.h> 		/* struct sigaction, sigemptyset(),
-				   sigaddset(), sigaction(),
-				   sigprocmask(), SIG_BLOCK, SIGCHLD,
-				   SIG_UNBLOCK, kill(), sig_atomic_t
-				*/
-#include <errno.h>		/* errno, EBADF */
-#include <inttypes.h>		/* intmax_t, PRIdMAX, strtoimax() */
+				   FD_CLOEXEC, open(), O_RDONLY,
+				   O_CLOEXEC, openat() */
+#include <sys/wait.h>		/* waitpid(), WNOHANG, WIFEXITED(),
+				   WEXITSTATUS(), WIFSIGNALED(),
+				   WTERMSIG(), wait() */
+#include <error.h>		/* error() */
+#include <stdio.h>		/* FILE, fprintf(), fopen(),
+				   getline(), fclose(), EOF,
+				   asprintf(), stderr */
+#include <dirent.h>		/* struct dirent, scandirat(),
+				   alphasort() */
+#include <sys/stat.h>		/* struct stat, fstat(), S_ISDIR(),
+				   lstat(), S_ISREG() */
+#include <sys/select.h>		/* fd_set, FD_ZERO(), FD_SETSIZE,
+				   FD_SET(), select(), FD_CLR(),
+				   FD_ISSET() */
+#include <signal.h>		/* struct sigaction, SA_NOCLDSTOP,
+				   sigemptyset(), sigaddset(),
+				   SIGCHLD, sigprocmask(), SIG_BLOCK,
+				   SIG_UNBLOCK, kill(), SIGTERM */
 #include <sysexits.h>		/* EX_OSERR, EX_USAGE, EX_IOERR,
 				   EX_CONFIG, EX_UNAVAILABLE, EX_OK */
-#include <errno.h> 		/* errno */
-#include <error.h>		/* error() */
-#include <fnmatch.h>		/* fnmatch() */
+#include <inttypes.h>		/* intmax_t, strtoimax(), PRIdMAX */
+#include <fnmatch.h>		/* fnmatch(), FNM_FILE_NAME,
+				   FNM_PERIOD, FNM_NOMATCH */
 
 #define BUFFER_SIZE 256
 

=== modified file 'plugins.d/askpass-fifo.c'
--- plugins.d/askpass-fifo.c	2019-02-11 07:06:55 +0000
+++ plugins.d/askpass-fifo.c	2021-02-03 00:12:25 +0000
@@ -23,27 +23,31 @@
  * Contact the authors at <mandos@recompile.se>.
  */
 
-#define _GNU_SOURCE		/* TEMP_FAILURE_RETRY() */
-#include <sys/types.h>		/* uid_t, gid_t, ssize_t */
-#include <sys/stat.h>		/* mkfifo(), S_IRUSR, S_IWUSR */
-#include <iso646.h>		/* and */
-#include <errno.h>		/* errno, EACCES, ENOTDIR, ELOOP,
+#define _GNU_SOURCE		/* vasprintf(),
+				   program_invocation_short_name */
+#include <sys/types.h>		/* uid_t, gid_t, getuid(), getgid(),
+				   setgid(), setuid() */
+#include <unistd.h>		/* uid_t, gid_t, ssize_t, getuid(),
+				   getgid(), setgid(), setuid(),
+				   read(), close(), write(),
+				   STDOUT_FILENO */
+#include <stdarg.h>		/* va_list, va_start(), vfprintf() */
+#include <stdio.h>		/* vasprintf(), fprintf(), stderr,
+				   vfprintf() */
+#include <errno.h>		/* program_invocation_short_name,
+				   errno, EACCES, ENOTDIR, ELOOP,
 				   ENAMETOOLONG, ENOSPC, EROFS,
 				   ENOENT, EEXIST, EFAULT, EMFILE,
 				   ENFILE, ENOMEM, EBADF, EINVAL, EIO,
 				   EISDIR, EFBIG */
+#include <string.h>		/* strerror() */
 #include <error.h>		/* error() */
-#include <stdio.h>		/* fprintf(), vfprintf(),
-				   vasprintf() */
-#include <stdlib.h>		/* EXIT_FAILURE, NULL, size_t, free(),
-				   realloc(), EXIT_SUCCESS */
+#include <stdlib.h>		/* free(), realloc(), EXIT_SUCCESS */
+#include <sys/stat.h>		/* mkfifo(), S_IRUSR, S_IWUSR */
+#include <sysexits.h>		/* EX_OSFILE, EX_OSERR,
+				   EX_UNAVAILABLE, EX_IOERR */
 #include <fcntl.h>		/* open(), O_RDONLY */
-#include <unistd.h>		/* read(), close(), write(),
-				   STDOUT_FILENO */
-#include <sysexits.h>		/* EX_OSERR, EX_OSFILE,
-				   EX_UNAVAILABLE, EX_IOERR */
-#include <string.h> 		/* strerror() */
-#include <stdarg.h>		/* va_list, va_start(), ... */
+#include <stddef.h>		/* NULL, size_t */
 
 uid_t uid = 65534;
 gid_t gid = 65534;

=== modified file 'plugins.d/mandos-client.c'
--- plugins.d/mandos-client.c	2021-01-31 21:40:15 +0000
+++ plugins.d/mandos-client.c	2021-02-03 00:12:25 +0000
@@ -38,69 +38,103 @@
 #define _FILE_OFFSET_BITS 64
 #endif	/* not _FILE_OFFSET_BITS */
 
-#define _GNU_SOURCE		/* TEMP_FAILURE_RETRY(), asprintf() */
-
-#include <stdio.h>		/* fprintf(), stderr, fwrite(),
-				   stdout, ferror() */
-#include <stdint.h> 		/* uint16_t, uint32_t, intptr_t */
-#include <stddef.h>		/* NULL, size_t, ssize_t */
-#include <stdlib.h> 		/* free(), EXIT_SUCCESS, srand(),
-				   strtof(), abort() */
+#define _GNU_SOURCE		/* program_invocation_short_name,
+				   TEMP_FAILURE_RETRY(), O_CLOEXEC,
+				   scandirat(), asprintf() */
 #include <stdbool.h>		/* bool, false, true */
-#include <string.h>		/* strcmp(), strlen(), strerror(),
-				   asprintf(), strncpy(), strsignal()
-				*/
-#include <sys/ioctl.h>		/* ioctl */
-#include <sys/types.h>		/* socket(), inet_pton(), sockaddr,
-				   sockaddr_in6, PF_INET6,
-				   SOCK_STREAM, uid_t, gid_t, open(),
-				   opendir(), DIR */
-#include <sys/stat.h>		/* open(), S_ISREG */
-#include <sys/socket.h>		/* socket(), struct sockaddr_in6,
-				   inet_pton(), connect(),
-				   getnameinfo() */
-#include <fcntl.h>		/* open(), unlinkat(), AT_REMOVEDIR */
-#include <dirent.h>		/* opendir(), struct dirent, readdir()
-				 */
-#include <inttypes.h>		/* PRIu16, PRIdMAX, intmax_t,
-				   strtoimax() */
-#include <errno.h>		/* perror(), errno, EINTR, EINVAL,
-				   EAI_SYSTEM, ENETUNREACH,
+#include <argp.h>		/* argp_program_version,
+				   argp_program_bug_address,
+				   struct argp_option,
+				   struct argp_state, argp_error(),
+				   argp_state_help,
+				   ARGP_HELP_STD_HELP,
+				   ARGP_HELP_EXIT_ERR,
+				   ARGP_HELP_EXIT_OK, ARGP_HELP_USAGE,
+				   argp_err_exit_status,
+				   ARGP_ERR_UNKNOWN, struct argp,
+				   argp_parse(), ARGP_IN_ORDER,
+				   ARGP_NO_HELP */
+#include <stddef.h>		/* NULL, size_t */
+#include <sys/types.h>		/* uid_t, gid_t, sig_atomic_t,
+				   seteuid(), setuid(), pid_t,
+				   setgid(), getuid(), getgid() */
+#include <unistd.h>		/* uid_t, gid_t, TEMP_FAILURE_RETRY(),
+				   seteuid(), setuid(), close(),
+				   ssize_t, read(), fork(), setgid(),
+				   _exit(), dup2(), STDIN_FILENO,
+				   STDERR_FILENO, STDOUT_FILENO,
+				   fexecve(), write(), getuid(),
+				   getgid(), fchown(), symlink(),
+				   sleep(), unlinkat(), pause() */
+#include <netinet/in.h>		/* in_port_t, struct sockaddr_in6,
+				   sa_family_t, struct sockaddr_in,
+				   htons(), IN6_IS_ADDR_LINKLOCAL,
+				   INET_ADDRSTRLEN, INET6_ADDRSTRLEN,
+				   ntohl(), IPPROTO_IP */
+#include <time.h>		/* struct timespec, clock_gettime(),
+				   CLOCK_MONOTONIC, time_t, struct tm,
+				   gmtime_r(), clock_settime(),
+				   CLOCK_REALTIME, nanosleep() */
+#include <errno.h>		/* errno,
+				   program_invocation_short_name,
+				   EINTR, EINVAL, ENETUNREACH,
 				   EHOSTUNREACH, ECONNREFUSED, EPROTO,
-				   EIO, ENOENT, ENXIO, ENOMEM, EISDIR,
-				   ENOTEMPTY,
-				   program_invocation_short_name */
-#include <time.h>		/* nanosleep(), time(), sleep() */
-#include <net/if.h>		/* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP,
-				   SIOCSIFFLAGS, if_indextoname(),
-				   if_nametoindex(), IF_NAMESIZE */
-#include <netinet/in.h>		/* IN6_IS_ADDR_LINKLOCAL,
-				   INET_ADDRSTRLEN, INET6_ADDRSTRLEN
-				*/
-#include <unistd.h>		/* close(), SEEK_SET, off_t, write(),
-				   getuid(), getgid(), seteuid(),
-				   setgid(), pause(), _exit(),
-				   unlinkat(), lstat(), symlink() */
-#include <arpa/inet.h>		/* inet_pton(), htons() */
-#include <iso646.h>		/* not, or, and */
-#include <argp.h>		/* struct argp_option, error_t, struct
-				   argp_state, struct argp,
-				   argp_parse(), ARGP_KEY_ARG,
-				   ARGP_KEY_END, ARGP_ERR_UNKNOWN */
-#include <signal.h>		/* sigemptyset(), sigaddset(),
-				   sigaction(), SIGTERM, sig_atomic_t,
-				   raise() */
-#include <sysexits.h>		/* EX_OSERR, EX_USAGE, EX_UNAVAILABLE,
-				   EX_NOHOST, EX_IOERR, EX_PROTOCOL */
+				   EIO, ENOENT, ENXIO, error_t,
+				   ENOMEM, EISDIR, ENOTEMPTY */
+#include <stdio.h>		/* fprintf(), stderr, perror(), FILE,
+				   vfprintf(), off_t, SEEK_SET,
+				   stdout, fwrite(), ferror(),
+				   fflush(), asprintf() */
+#include <stdarg.h>		/* va_list, va_start(), vfprintf() */
+#include <stdlib.h>		/* realloc(), free(), malloc(),
+				   getenv(), EXIT_FAILURE, setenv(),
+				   EXIT_SUCCESS, strtof(), strtod(),
+				   srand(), mkdtemp(), abort() */
+#include <string.h>		/* strdup(), strcmp(), strlen(),
+				   strerror(), strncpy(), strspn(),
+				   memcpy(), strrchr(), strchr(),
+				   strsignal() */
+#include <fcntl.h>		/* open(), O_RDONLY, O_DIRECTORY,
+				   O_PATH, O_CLOEXEC, openat(),
+				   O_NOFOLLOW, AT_REMOVEDIR */
+#include <iso646.h>		/* or, and, not */
+#include <sys/stat.h>		/* struct stat, fstat(), fstatat(),
+				   S_ISREG(), S_IXUSR, S_IXGRP,
+				   S_IXOTH, lstat() */
+#include <net/if.h>		/* IF_NAMESIZE, if_indextoname(),
+				   if_nametoindex(), SIOCGIFFLAGS,
+				   IFF_LOOPBACK, IFF_POINTOPOINT,
+				   IFF_BROADCAST, IFF_NOARP, IFF_UP,
+				   IFF_RUNNING, SIOCSIFFLAGS */
+#include <sysexits.h>		/* EX_NOPERM, EX_OSERR,
+				   EX_UNAVAILABLE, EX_USAGE */
+#include <grp.h>		/* setgroups() */
 #include <sys/wait.h>		/* waitpid(), WIFEXITED(),
-				   WEXITSTATUS(), WTERMSIG() */
-#include <grp.h>		/* setgroups() */
-#include <argz.h>		/* argz_add_sep(), argz_next(),
-				   argz_delete(), argz_append(),
-				   argz_stringify(), argz_add(),
-				   argz_count() */
+				   WEXITSTATUS(), WIFSIGNALED(),
+				   WTERMSIG() */
+#include <signal.h>		/* kill(), SIGTERM, struct sigaction,
+				   SIG_DFL, sigemptyset(),
+				   sigaddset(), SIGINT, SIGHUP,
+				   SIG_IGN, raise() */
+#include <sys/socket.h>		/* struct sockaddr_storage, AF_INET6,
+				   PF_INET6, AF_INET, PF_INET,
+				   socket(), SOCK_STREAM,
+				   SOCK_CLOEXEC, struct sockaddr,
+				   connect(), SOCK_DGRAM */
+#include <argz.h>		/* argz_next(), argz_add_sep(),
+				   argz_delete(), argz_stringify(),
+				   argz_add(), argz_count() */
+#include <inttypes.h>		/* PRIuMAX, uintmax_t, uint32_t,
+				   PRIdMAX, PRIu16, intmax_t,
+				   strtoimax() */
+#include <arpa/inet.h>		/* inet_pton() */
+#include <stdint.h>		/* uint32_t, intptr_t, uint16_t */
 #include <netdb.h>		/* getnameinfo(), NI_NUMERICHOST,
 				   EAI_SYSTEM, gai_strerror() */
+#include <sys/ioctl.h>		/* ioctl() */
+#include <dirent.h>		/* struct dirent, scandirat(),
+				   alphasort(), scandir() */
+#include <limits.h>		/* INT_MAX */
 
 #ifdef __linux__
 #include <sys/klog.h> 		/* klogctl() */
@@ -119,26 +153,22 @@
 
 /* GnuTLS */
 #include <gnutls/gnutls.h>	/* All GnuTLS types, constants and
-				   functions:
-				   gnutls_*
-				   init_gnutls_session(),
-				   GNUTLS_* */
+				   functions: gnutls_*, GNUTLS_* */
 #if GNUTLS_VERSION_NUMBER < 0x030600
 #include <gnutls/openpgp.h>
 			 /* gnutls_certificate_set_openpgp_key_file(),
 			    GNUTLS_OPENPGP_FMT_BASE64 */
 #elif GNUTLS_VERSION_NUMBER >= 0x030606
-#include <gnutls/x509.h>	/* gnutls_pkcs_encrypt_flags_t,
-				 GNUTLS_PKCS_PLAIN,
-				 GNUTLS_PKCS_NULL_PASSWORD */
+#include <gnutls/x509.h>	/* GNUTLS_PKCS_PLAIN,
+				   GNUTLS_PKCS_NULL_PASSWORD */
 #endif
 
 /* GPGME */
 #include <gpgme.h> 		/* All GPGME types, constants and
 				   functions:
-				   gpgme_*
-				   GPGME_PROTOCOL_OpenPGP,
-				   GPG_ERR_NO_* */
+				   gpgme_*, GPG_ERR_NO_*,
+				   GPGME_IMPORT_*
+				   GPGME_PROTOCOL_OpenPGP */
 
 #define BUFFER_SIZE 256
 

=== modified file 'plugins.d/password-prompt.c'
--- plugins.d/password-prompt.c	2019-07-27 10:11:45 +0000
+++ plugins.d/password-prompt.c	2021-02-03 00:12:25 +0000
@@ -23,47 +23,52 @@
  * Contact the authors at <mandos@recompile.se>.
  */
 
-#define _GNU_SOURCE		/* getline(), asprintf() */
-
-#include <termios.h>		/* struct termios, tcsetattr(),
-				   TCSAFLUSH, tcgetattr(), ECHO */
-#include <unistd.h>		/* access(), struct termios,
-				   tcsetattr(), STDIN_FILENO,
-				   TCSAFLUSH, tcgetattr(), ECHO,
-				   readlink() */
-#include <signal.h>		/* sig_atomic_t, raise(), struct
-				   sigaction, sigemptyset(),
-				   sigaction(), sigaddset(), SIGINT,
-				   SIGQUIT, SIGHUP, SIGTERM,
+#define _GNU_SOURCE		/* vasprintf(),
+				   program_invocation_short_name,
+				   asprintf(), getline() */
+#include <sys/types.h>		/* sig_atomic_t, pid_t */
+#include <stdbool.h>		/* bool, false, true */
+#include <argp.h>		/* argp_program_version,
+				   argp_program_bug_address,
+				   struct argp_option,
+				   struct argp_state, argp_state_help,
+				   ARGP_HELP_STD_HELP,
+				   ARGP_HELP_EXIT_ERR,
+				   ARGP_HELP_EXIT_OK, ARGP_HELP_USAGE,
+				   argp_err_exit_status,
+				   ARGP_ERR_UNKNOWN, argp_parse(),
+				   ARGP_IN_ORDER, ARGP_NO_HELP */
+#include <stdarg.h>		/* va_list, va_start(), vfprintf() */
+#include <stdio.h>		/* vasprintf(), fprintf(), stderr,
+				   vfprintf(), asprintf(), getline(),
+				   stdin, feof(), clearerr(),
+				   fputc() */
+#include <errno.h>		/* program_invocation_short_name,
+				   errno, ENOENT, error_t, ENOMEM,
+				   EINVAL, EBADF, ENOTTY, EFAULT,
+				   EFBIG, EIO, ENOSPC, EINTR */
+#include <string.h>		/* strerror(), strrchr(), strcmp() */
+#include <error.h>		/* error() */
+#include <stdlib.h>		/* free(), realloc(), EXIT_SUCCESS,
+				   EXIT_FAILURE, getenv() */
+#include <unistd.h>		/* access(), R_OK, ssize_t, close(),
+				   read(), STDIN_FILENO, write(),
+				   STDOUT_FILENO */
+#include <dirent.h>		/* struct dirent, scandir(),
+				   alphasort() */
+#include <inttypes.h>		/* uintmax_t, strtoumax() */
+#include <iso646.h>		/* or, and, not */
+#include <fcntl.h>		/* open(), O_RDONLY */
+#include <stddef.h>		/* NULL, size_t */
+#include <termios.h>		/* struct termios, tcgetattr(),
+				   tcflag_t, ECHO, tcsetattr(),
+				   TCSAFLUSH */
+#include <signal.h>		/* struct sigaction, sigemptyset(),
+				   sigaddset(), SIGINT, SIGHUP,
+				   SIGTERM, SIG_IGN, SIG_DFL,
 				   raise() */
-#include <stddef.h>		/* NULL, size_t, ssize_t */
-#include <sys/types.h>		/* ssize_t, struct dirent, pid_t,
-				   ssize_t, open() */
-#include <stdlib.h>		/* EXIT_SUCCESS, EXIT_FAILURE,
-				   getenv(), free() */
-#include <dirent.h>		/* scandir(), alphasort() */
-#include <stdio.h>		/* fprintf(), stderr, getline(),
-				   stdin, feof(), fputc(), vfprintf(),
-				   vasprintf() */
-#include <errno.h>		/* errno, EBADF, ENOTTY, EINVAL,
-				   EFAULT, EFBIG, EIO, ENOSPC, EINTR
-				*/
-#include <error.h>		/* error() */
-#include <iso646.h>		/* or, not */
-#include <stdbool.h>		/* bool, false, true */
-#include <inttypes.h>		/* strtoumax() */
-#include <sys/stat.h>		/* struct stat, lstat(), open() */
-#include <string.h>		/* strlen, rindex, memcmp, strerror()
-				 */
-#include <argp.h>		/* struct argp_option, struct
-				   argp_state, struct argp,
-				   argp_parse(), error_t,
-				   ARGP_KEY_ARG, ARGP_KEY_END,
-				   ARGP_ERR_UNKNOWN */
-#include <sysexits.h>		/* EX_SOFTWARE, EX_OSERR,
-				   EX_UNAVAILABLE, EX_IOERR, EX_OK */
-#include <fcntl.h>		/* open() */
-#include <stdarg.h>		/* va_list, va_start(), ... */
+#include <sysexits.h>		/* EX_OSERR, EX_USAGE, EX_UNAVAILABLE,
+				   EX_IOERR, EX_OSFILE, EX_OK */
 
 volatile sig_atomic_t quit_now = 0;
 int signal_received;

=== modified file 'plugins.d/plymouth.c'
--- plugins.d/plymouth.c	2020-07-04 11:58:52 +0000
+++ plugins.d/plymouth.c	2021-02-03 00:12:25 +0000
@@ -23,37 +23,55 @@
  * Contact the authors at <mandos@recompile.se>.
  */
 
-#define _GNU_SOURCE		/* asprintf(), TEMP_FAILURE_RETRY() */
-#include <signal.h>		/* sig_atomic_t, struct sigaction,
-				   sigemptyset(), sigaddset(), SIGINT,
-				   SIGHUP, SIGTERM, sigaction(),
-				   kill(), SIG_IGN */
+#define _GNU_SOURCE		/* program_invocation_short_name,
+				   vasprintf(), asprintf(),
+				   TEMP_FAILURE_RETRY() */
+#include <sys/types.h>		/* sig_atomic_t, pid_t, setuid(),
+				   geteuid(), setsid() */
+#include <argp.h>		/* argp_program_version,
+				   argp_program_bug_address,
+				   struct argp_option,
+				   struct argp_state,
+				   ARGP_ERR_UNKNOWN, struct argp,
+				   argp_parse(), ARGP_IN_ORDER */
+#include <stddef.h>		/* NULL, size_t */
 #include <stdbool.h>		/* bool, false, true */
+#include <stdio.h>		/* FILE, fprintf(), vfprintf(),
+				   vasprintf(), stderr, asprintf(),
+				   fopen(), fscanf(), fclose(),
+				   sscanf() */
+#include <stdarg.h>		/* va_list, va_start(), vfprintf() */
+#include <errno.h>		/* program_invocation_short_name,
+				   errno, ENOMEM, EINTR, ENOENT,
+				   error_t, EINVAL */
+#include <string.h>		/* strerror(), strdup(), memcmp() */
+#include <error.h>		/* error() */
+#include <stdlib.h>		/* free(), getenv(), malloc(),
+				   reallocarray(), realloc(),
+				   EXIT_FAILURE, EXIT_SUCCESS */
+#include <unistd.h>		/* TEMP_FAILURE_RETRY(), setuid(),
+				   geteuid(), setsid(), chdir(),
+				   dup2(), STDERR_FILENO,
+				   STDOUT_FILENO, fork(), _exit(),
+				   execv(), ssize_t, readlink(),
+				   close(), read(), access(), X_OK */
+#include <signal.h>		/* kill(), SIGTERM, struct sigaction,
+				   sigemptyset(), SIGINT, SIGHUP,
+				   sigaddset(), SIG_IGN */
+#include <sys/wait.h>		/* waitpid(), WIFEXITED(),
+				   WEXITSTATUS(), WIFSIGNALED(),
+				   WTERMSIG() */
+#include <iso646.h>		/* not, and, or */
+#include <sysexits.h>		/* EX_OSERR, EX_USAGE,
+				   EX_UNAVAILABLE */
+#include <stdint.h>		/* SIZE_MAX */
+#include <dirent.h>		/* struct dirent, scandir(),
+				   alphasort() */
+#include <inttypes.h>		/* uintmax_t, strtoumax(), SCNuMAX,
+				   PRIuMAX */
+#include <sys/stat.h>		/* struct stat, lstat(), S_ISLNK() */
 #include <fcntl.h>		/* open(), O_RDONLY */
-#include <iso646.h>		/* and, or, not*/
-#include <sys/types.h>		/* size_t, ssize_t, pid_t, struct
-				   dirent, waitpid() */
-#include <sys/wait.h>		/* waitpid() */
-#include <stddef.h>		/* NULL */
-#include <string.h>		/* strchr(), memcmp() */
-#include <stdio.h>		/* asprintf(), perror(), fopen(),
-				   fscanf(), vasprintf(), fprintf(),
-				   vfprintf() */
-#include <unistd.h>		/* close(), readlink(), read(),
-				   fork(), setsid(), chdir(), dup2(),
-				   STDERR_FILENO, execv(), access() */
-#include <stdlib.h>		/* free(), EXIT_FAILURE, realloc(),
-				   EXIT_SUCCESS, malloc(), _exit(),
-				   getenv(), reallocarray() */
-#include <dirent.h>		/* scandir(), alphasort() */
-#include <inttypes.h>		/* intmax_t, strtoumax(), SCNuMAX */
-#include <sys/stat.h>		/* struct stat, lstat() */
-#include <sysexits.h>		/* EX_OSERR, EX_UNAVAILABLE */
-#include <error.h>		/* error() */
-#include <errno.h>		/* TEMP_FAILURE_RETRY */
 #include <argz.h>		/* argz_count(), argz_extract() */
-#include <stdarg.h>		/* va_list, va_start(), ... */
-#include <argp.h>
 
 sig_atomic_t interrupted_by_signal = 0;
 const char *argp_program_version = "plymouth " VERSION;

=== modified file 'plugins.d/splashy.c'
--- plugins.d/splashy.c	2018-02-08 10:23:55 +0000
+++ plugins.d/splashy.c	2021-02-03 00:12:25 +0000
@@ -23,40 +23,45 @@
  * Contact the authors at <mandos@recompile.se>.
  */
 
-#define _GNU_SOURCE		/* TEMP_FAILURE_RETRY(), asprintf() */
-#include <signal.h>		/* sig_atomic_t, struct sigaction,
-				   sigemptyset(), sigaddset(), SIGINT,
-				   SIGHUP, SIGTERM, sigaction,
-				   SIG_IGN, kill(), SIGKILL */
-#include <stddef.h>		/* NULL */
-#include <stdlib.h>		/* getenv() */
-#include <stdio.h>		/* asprintf(), vasprintf(), vprintf(),
-				   fprintf() */
-#include <stdlib.h>		/* EXIT_FAILURE, free(),
-				   EXIT_SUCCESS */
-#include <sys/types.h>		/* pid_t, DIR, struct dirent,
-				   ssize_t */
-#include <dirent.h>		/* opendir(), readdir(), closedir() */
-#include <inttypes.h>		/* intmax_t, strtoimax() */
-#include <sys/stat.h>		/* struct stat, lstat(), S_ISLNK */
-#include <iso646.h>		/* not, or, and */
-#include <unistd.h>		/* readlink(), fork(), execl(),
-				   sleep(), dup2() STDERR_FILENO,
-				   STDOUT_FILENO, _exit(),
-				   pause() */
-#include <string.h>		/* memcmp(), strerror() */
-#include <errno.h>		/* errno, EACCES, ENOTDIR, ELOOP,
+#define _GNU_SOURCE		/* vasprintf(),
+				   program_invocation_short_name,
+				   asprintf(), TEMP_FAILURE_RETRY() */
+#include <sys/types.h>		/* sig_atomic_t, pid_t, setuid(),
+				   geteuid(), setsid() */
+#include <stdarg.h>		/* va_list, va_start(), vfprintf() */
+#include <stdio.h>		/* vasprintf(), fprintf(), stderr,
+				   vfprintf(), asprintf() */
+#include <errno.h>		/* program_invocation_short_name,
+				   errno, EACCES, ENOTDIR, ELOOP,
 				   ENOENT, ENAMETOOLONG, EMFILE,
 				   ENFILE, ENOMEM, ENOEXEC, EINVAL,
 				   E2BIG, EFAULT, EIO, ETXTBSY,
 				   EISDIR, ELIBBAD, EPERM, EINTR,
 				   ECHILD */
+#include <string.h>		/* strerror(), memcmp() */
 #include <error.h>		/* error() */
+#include <stdlib.h>		/* free(), EXIT_FAILURE, getenv(),
+				   EXIT_SUCCESS, abort() */
+#include <stddef.h>		/* NULL */
+#include <dirent.h>		/* DIR, opendir(), struct dirent,
+				   readdir(), closedir() */
+#include <sysexits.h>		/* EX_OSERR, EX_OSFILE,
+				   EX_UNAVAILABLE */
+#include <inttypes.h>		/* intmax_t, strtoimax() */
+#include <iso646.h>		/* or, not, and */
+#include <unistd.h>		/* ssize_t, readlink(), fork(),
+				   execl(), _exit(),
+				   TEMP_FAILURE_RETRY(), sleep(),
+				   setuid(), geteuid(), setsid(),
+				   chdir(), dup2(), STDERR_FILENO,
+				   STDOUT_FILENO, pause() */
+#include <sys/stat.h>		/* struct stat, lstat(), S_ISLNK() */
+#include <signal.h>		/* struct sigaction, sigemptyset(),
+				   sigaddset(), SIGINT, SIGHUP,
+				   SIGTERM, SIG_IGN, kill(), SIGKILL,
+				   SIG_DFL, raise() */
 #include <sys/wait.h>		/* waitpid(), WIFEXITED(),
 				   WEXITSTATUS() */
-#include <sysexits.h>		/* EX_OSERR, EX_OSFILE,
-				   EX_UNAVAILABLE */
-#include <stdarg.h>		/* va_list, va_start(), ... */
 
 sig_atomic_t interrupted_by_signal = 0;
 int signal_received;

=== modified file 'plugins.d/usplash.c'
--- plugins.d/usplash.c	2018-02-08 10:23:55 +0000
+++ plugins.d/usplash.c	2021-02-03 00:12:25 +0000
@@ -23,36 +23,42 @@
  * Contact the authors at <mandos@recompile.se>.
  */
 
-#define _GNU_SOURCE		/* asprintf(), TEMP_FAILURE_RETRY() */
-#include <signal.h>		/* sig_atomic_t, struct sigaction,
-				   sigemptyset(), sigaddset(), SIGINT,
-				   SIGHUP, SIGTERM, sigaction(),
-				   SIG_IGN, kill(), SIGKILL */
+#define _GNU_SOURCE		/* vasprintf(),
+				   program_invocation_short_name,
+				   asprintf(), TEMP_FAILURE_RETRY() */
+#include <sys/types.h>		/* sig_atomic_t, pid_t, setuid(),
+				   geteuid(), setsid() */
+#include <stdarg.h>		/* va_list, va_start(), vfprintf() */
+#include <stdio.h>		/* vasprintf(), fprintf(), stderr,
+				   vfprintf(), asprintf() */
+#include <errno.h>		/* program_invocation_short_name,
+				   errno, ENOENT, EINTR */
+#include <string.h>		/* strerror(), strlen(), memcmp() */
+#include <error.h>		/* error() */
+#include <stdlib.h>		/* free(), getenv(), realloc(),
+				   EXIT_FAILURE, EXIT_SUCCESS,
+				   malloc(), abort() */
 #include <stdbool.h>		/* bool, false, true */
 #include <fcntl.h>		/* open(), O_WRONLY, O_RDONLY */
-#include <iso646.h>		/* and, or, not*/
-#include <errno.h>		/* errno, EINTR */
-#include <error.h>
-#include <sys/types.h>		/* size_t, ssize_t, pid_t, DIR, struct
-				   dirent */
-#include <stddef.h>		/* NULL */
-#include <string.h>		/* strlen(), memcmp(), strerror() */
-#include <stdio.h>		/* asprintf(), vasprintf(), vprintf(),
-				   fprintf() */
-#include <unistd.h>		/* close(), write(), readlink(),
-				   read(), STDOUT_FILENO, sleep(),
-				   fork(), setuid(), geteuid(),
-				   setsid(), chdir(), dup2(),
-				   STDERR_FILENO, execv() */
-#include <stdlib.h>		/* free(), EXIT_FAILURE, realloc(),
-				   EXIT_SUCCESS, malloc(), _exit(),
-				   getenv() */
-#include <dirent.h>		/* opendir(), readdir(), closedir() */
+#include <stddef.h>		/* size_t, NULL */
+#include <unistd.h>		/* close(), ssize_t, write(),
+				   readlink(), read(), STDOUT_FILENO,
+				   sleep(), fork(), setuid(),
+				   geteuid(), setsid(), chdir(),
+				   _exit(), dup2(), STDERR_FILENO,
+				   execv(), TEMP_FAILURE_RETRY(),
+				   pause() */
+#include <dirent.h>		/* DIR, opendir(), struct dirent,
+				   readdir(), closedir() */
 #include <inttypes.h>		/* intmax_t, strtoimax() */
-#include <sys/stat.h>		/* struct stat, lstat(), S_ISLNK */
+#include <iso646.h>		/* or, not, and */
+#include <sys/stat.h>		/* struct stat, lstat(), S_ISLNK() */
 #include <sysexits.h>		/* EX_OSERR, EX_UNAVAILABLE */
+#include <signal.h>		/* struct sigaction, sigemptyset(),
+				   sigaddset(), SIGINT, SIGHUP,
+				   SIGTERM, SIG_IGN, kill(), SIGKILL,
+				   SIG_DFL, raise() */
 #include <argz.h>		/* argz_count(), argz_extract() */
-#include <stdarg.h>		/* va_list, va_start(), ... */
 
 sig_atomic_t interrupted_by_signal = 0;
 int signal_received;