From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 5 Jun 2018 17:08:31 +0000 (+0200)
Subject: Prep v238: Uncomment now needed headers and unmask now needed functions in src/basic... 
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4bb25b978ca1a43ea28db5b18de2b2fb02d58268;p=elogind.git

Prep v238: Uncomment now needed headers and unmask now needed functions in src/basic (1/6)
---

diff --git a/src/basic/build.h b/src/basic/build.h
index cbc638c8c..88c45e1bc 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -152,9 +152,6 @@
 #else
 #define _PCRE2_FEATURE_ "-PCRE2"
 #endif
-#else
-#define _IDN_FEATURE_ "-IDN"
-#endif
 #endif // 0
 
 #define _CGROUP_HIEARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 302fc95dd..6364a930a 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1469,7 +1469,6 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
         return 0;
 }
 
-#if 0 /// UNNEEDED by elogind
 int cg_path_decode_unit(const char *cgroup, char **unit) {
         char *c, *s;
         size_t n;
@@ -1572,6 +1571,7 @@ int cg_pid_get_unit(pid_t pid, char **unit) {
         return cg_path_get_unit(cgroup, unit);
 }
 
+#if 0 /// UNNEEDED by elogind
 /**
  * Skip session-*.scope, but require it to be there.
  */
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 148d298de..b6f427bda 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -33,10 +33,10 @@
 #include "set.h"
 
 #if 0 /// elogind has them set through config.h
-#define SYSTEMD_CGROUP_CONTROLLER_LEGACY "name=elogind"
+#define SYSTEMD_CGROUP_CONTROLLER_LEGACY "name=systemd"
 #define SYSTEMD_CGROUP_CONTROLLER_HYBRID "name=unified"
+#define SYSTEMD_CGROUP_CONTROLLER "_systemd"
 #endif // 0
-#define SYSTEMD_CGROUP_CONTROLLER "_elogind"
 
 /* An enum of well known cgroup controllers */
 typedef enum CGroupController {
@@ -213,8 +213,8 @@ int cg_get_root_path(char **path);
 
 int cg_path_get_session(const char *path, char **session);
 int cg_path_get_owner_uid(const char *path, uid_t *uid);
-#if 0 /// UNNEEDED by elogind
 int cg_path_get_unit(const char *path, char **unit);
+#if 0 /// UNNEEDED by elogind
 int cg_path_get_user_unit(const char *path, char **unit);
 int cg_path_get_machine_name(const char *path, char **machine);
 #endif // 0
@@ -226,17 +226,15 @@ int cg_pid_get_path_shifted(pid_t pid, const char *cached_root, char **cgroup);
 
 int cg_pid_get_session(pid_t pid, char **session);
 int cg_pid_get_owner_uid(pid_t pid, uid_t *uid);
-#if 0 /// UNNEEDED by elogind
 int cg_pid_get_unit(pid_t pid, char **unit);
+#if 0 /// UNNEEDED by elogind
 int cg_pid_get_user_unit(pid_t pid, char **unit);
 int cg_pid_get_machine_name(pid_t pid, char **machine);
 #endif // 0
 int cg_pid_get_slice(pid_t pid, char **slice);
 int cg_pid_get_user_slice(pid_t pid, char **slice);
 
-#if 0 /// UNNEEDED by elogind
 int cg_path_decode_unit(const char *cgroup, char **unit);
-#endif // 0
 
 char *cg_escape(const char *p);
 char *cg_unescape(const char *p) _pure_;
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 34f821d57..dd93023b5 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -752,6 +752,7 @@ char **replace_env_argv(char **argv, char **env) {
         ret[k] = NULL;
         return ret;
 }
+#endif // 0
 
 int getenv_bool(const char *p) {
         const char *e;
@@ -763,6 +764,7 @@ int getenv_bool(const char *p) {
         return parse_boolean(e);
 }
 
+#if 0 /// UNNEEDED by elogind
 int getenv_bool_secure(const char *p) {
         const char *e;
 
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index ca548e133..056878f9a 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -61,8 +61,10 @@ int strv_env_replace(char ***l, char *p); /* In place ... */
 
 char *strv_env_get_n(char **l, const char *name, size_t k, unsigned flags) _pure_;
 char *strv_env_get(char **x, const char *n) _pure_;
+#endif // 0
 
 int getenv_bool(const char *p);
+#if 0 /// UNNEEDED by elogind
 int getenv_bool_secure(const char *p);
 
 int serialize_environment(FILE *f, char **environment);
diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index 256eec086..b72dce3cf 100644
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-//#include <errno.h>
+#include <errno.h>
 #include <string.h>
 
 #include "errno-list.h"
diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h
index 0f8716160..38beaf96d 100644
--- a/src/basic/errno-list.h
+++ b/src/basic/errno-list.h
@@ -20,7 +20,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-//#include <stdbool.h>
+#include <stdbool.h>
 /*
  * MAX_ERRNO is defined as 4095 in linux/err.h
  * We use the same value here.
@@ -29,8 +29,6 @@
 
 const char *errno_to_name(int id);
 int errno_from_name(const char *name);
-#if 0 /// UNNEEDED by elogind
-#endif // 0
 static inline bool errno_is_valid(int n) {
         return n > 0 && n <= ERRNO_MAX;
 }
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index c67d4243a..1196b4df9 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -362,6 +362,7 @@ bool fdname_is_valid(const char *s) {
 
         return p - s < 256;
 }
+#endif // 0
 
 int fd_get_path(int fd, char **ret) {
         char procfs_path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)];
@@ -376,7 +377,6 @@ int fd_get_path(int fd, char **ret) {
 
         return r;
 }
-#endif // 0
 
 int move_fd(int from, int to, int cloexec) {
         int r;
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 56fae8a47..838dd5937 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -82,9 +82,9 @@ int same_fd(int a, int b);
 void cmsg_close_all(struct msghdr *mh);
 
 bool fdname_is_valid(const char *s);
+#endif // 0
 
 int fd_get_path(int fd, char **ret);
-#endif // 0
 
 int move_fd(int from, int to, int cloexec);
 
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 0737e403e..c089cc555 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "time-util.h"
-//#include "util.h"
+#include "util.h"
 
 int unlink_noerrno(const char *path);
 
@@ -76,9 +76,11 @@ int get_files_in_directory(const char *path, char ***list);
 int tmp_dir(const char **ret);
 #if 0 /// UNNEEDED by elogind
 int var_tmp_dir(const char **ret);
+#endif // 0
 
 int unlink_or_warn(const char *filename);
 
+#if 0 /// UNNEEDED by elogind
 #define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1)
 
 #define FOREACH_INOTIFY_EVENT(e, buffer, sz) \
diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c
index 763c1f61d..947bcfd58 100644
--- a/src/basic/hash-funcs.c
+++ b/src/basic/hash-funcs.c
@@ -19,10 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-//#include <string.h>
+#include <string.h>
 
 #include "hash-funcs.h"
-//#include "path-util.h"
+#include "path-util.h"
 
 void string_hash_func(const void *p, struct siphash *state) {
         siphash24_compress(p, strlen(p) + 1, state);
diff --git a/src/basic/log.c b/src/basic/log.c
index 84c92d1c7..1ec3faea8 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -54,7 +54,7 @@
 #include "syslog-util.h"
 #include "terminal-util.h"
 #include "time-util.h"
-//#include "utf8.h"
+#include "utf8.h"
 #include "util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index 59ba85b85..3fa642578 100644
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -20,15 +20,15 @@
 ***/
 
 #include <stdio.h>
-//#include <sys/stat.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "label.h"
-//#include "macro.h"
+#include "macro.h"
 #include "mkdir.h"
-//#include "selinux-util.h"
-//#include "smack-util.h"
+#include "selinux-util.h"
+#include "smack-util.h"
 
 int mkdir_label(const char *path, mode_t mode) {
         int r;
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 4c9b5adff..db90194ff 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -891,6 +891,7 @@ int mount_propagation_flags_from_string(const char *name, unsigned long *ret) {
         return 0;
 }
 
+#if 0 /// UNNEEDED by elogind
 int mount_option_mangle(
                 const char *options,
                 unsigned long mount_flags,
@@ -960,3 +961,4 @@ int mount_option_mangle(
 
         return 0;
 }
+#endif // 0
diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 5088dad93..c213e5788 100644
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -74,8 +74,10 @@ int umount_verbose(const char *where);
 const char *mount_propagation_flags_to_string(unsigned long flags);
 int mount_propagation_flags_from_string(const char *name, unsigned long *ret);
 
+#if 0 /// UNNEEDED by elogind
 int mount_option_mangle(
                 const char *options,
                 unsigned long mount_flags,
                 unsigned long *ret_mount_flags,
                 char **ret_remaining_options);
+#endif // 0
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index c8bca5a30..4c2625389 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -28,7 +28,7 @@
 #include "alloc-util.h"
 #include "errno-list.h"
 //#include "extract-word.h"
-//#include "locale-util.h"
+#include "locale-util.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "process-util.h"
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 1ebfb0c72..d3961bfd2 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -26,7 +26,7 @@
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
-//#include <stdio_ext.h>
+#include <stdio_ext.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
@@ -51,7 +51,7 @@
 #include "macro.h"
 #include "missing.h"
 #include "process-util.h"
-//#include "raw-clone.h"
+#include "raw-clone.h"
 #include "signal-util.h"
 //#include "stat-util.h"
 #include "string-table.h"
@@ -280,7 +280,6 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
         return 0;
 }
 
-#if 0 /// UNNEEDED by elogind
 int rename_process(const char name[]) {
         static size_t mm_size = 0;
         static char *mm = NULL;
@@ -397,7 +396,6 @@ use_saved_argv:
 
         return !truncated;
 }
-#endif // 0
 
 int is_kernel_thread(pid_t pid) {
         _cleanup_free_ char *line = NULL;
@@ -836,6 +834,7 @@ void sigkill_waitp(pid_t *pid) {
 
         sigkill_wait(*pid);
 }
+#endif // 0
 
 void sigterm_wait(pid_t pid) {
         assert(pid > 1);
@@ -856,7 +855,6 @@ int kill_and_sigcont(pid_t pid, int sig) {
 
         return r;
 }
-#endif // 0
 
 int getenv_for_pid(pid_t pid, const char *field, char **ret) {
         _cleanup_fclose_ FILE *f = NULL;
diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 82b1de03c..50074feb2 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -21,7 +21,7 @@
 ***/
 
 #include <alloca.h>
-//#include <errno.h>
+#include <errno.h>
 #include <sched.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -34,7 +34,7 @@
 #include "format-util.h"
 //#include "ioprio.h"
 #include "macro.h"
-//#include "time-util.h"
+#include "time-util.h"
 
 #define procfs_file_alloca(pid, field)                                  \
         ({                                                              \
@@ -79,12 +79,12 @@ int wait_for_terminate_with_timeout(pid_t pid, usec_t timeout);
 
 void sigkill_wait(pid_t pid);
 void sigkill_waitp(pid_t *pid);
+#endif // 0
 void sigterm_wait(pid_t pid);
 
 int kill_and_sigcont(pid_t pid, int sig);
 
 int rename_process(const char name[]);
-#endif // 0
 int is_kernel_thread(pid_t pid);
 
 int getenv_for_pid(pid_t pid, const char *field, char **_value);
@@ -122,8 +122,10 @@ int ioprio_class_from_string(const char *s);
 
 const char *sigchld_code_to_string(int i) _const_;
 int sigchld_code_from_string(const char *s) _pure_;
+#endif // 0
 
 int sched_policy_to_string_alloc(int i, char **s);
+#if 0 /// UNNEEDED by elogind
 int sched_policy_from_string(const char *s);
 #endif // 0
 
@@ -143,11 +145,13 @@ int pid_compare_func(const void *a, const void *b);
 static inline bool nice_is_valid(int n) {
         return n >= PRIO_MIN && n < PRIO_MAX;
 }
+#endif // 0
 
 static inline bool sched_policy_is_valid(int i) {
         return IN_SET(i, SCHED_OTHER, SCHED_BATCH, SCHED_IDLE, SCHED_FIFO, SCHED_RR);
 }
 
+#if 0 /// UNNEEDED by elogind
 static inline bool sched_priority_is_valid(int i) {
         return i >= 0 && i <= sched_get_priority_max(SCHED_RR);
 }
diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
index 7b1dfdf6e..f821d64d5 100644
--- a/src/basic/procfs-util.c
+++ b/src/basic/procfs-util.c
@@ -1,16 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-//#include <errno.h>
-
-//#include "alloc-util.h"
-//#include "def.h"
-//#include "fd-util.h"
-//#include "fileio.h"
-//#include "parse-util.h"
-//#include "process-util.h"
-//#include "procfs-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
+#include <errno.h>
+
+#include "alloc-util.h"
+#include "def.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "parse-util.h"
+#include "process-util.h"
+#include "procfs-util.h"
+#include "stdio-util.h"
+#include "string-util.h"
 
 int procfs_tasks_get_limit(uint64_t *ret) {
         _cleanup_free_ char *value = NULL;
@@ -57,6 +57,7 @@ int procfs_tasks_get_limit(uint64_t *ret) {
         return 0;
 }
 
+#if 0 /// UNNEEDED by elogind
 int procfs_tasks_set_limit(uint64_t limit) {
         char buffer[DECIMAL_STR_MAX(uint64_t)+1];
         _cleanup_free_ char *value = NULL;
@@ -265,3 +266,4 @@ int procfs_memory_get_current(uint64_t *ret) {
         *ret = (mem_total - mem_free) * 1024U;
         return 0;
 }
+#endif // 0
diff --git a/src/basic/procfs-util.h b/src/basic/procfs-util.h
index 757e79c0d..0d1c7d231 100644
--- a/src/basic/procfs-util.h
+++ b/src/basic/procfs-util.h
@@ -1,14 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-//#include <inttypes.h>
+#include <inttypes.h>
 
-//#include "time-util.h"
+#include "time-util.h"
 
 int procfs_tasks_get_limit(uint64_t *ret);
+#if 0 /// UNNEEDED by elogind
 int procfs_tasks_set_limit(uint64_t limit);
 int procfs_tasks_get_current(uint64_t *ret);
 
 int procfs_cpu_get_usage(nsec_t *ret);
 
 int procfs_memory_get_current(uint64_t *ret);
+#endif // 0
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index 127c4522b..13b033ff8 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 //#include <stdint.h>
 #include <stdlib.h>
-//#include <string.h>
+#include <string.h>
 #include <sys/time.h>
 
 #if HAVE_SYS_AUXV_H
diff --git a/src/basic/rm-rf.h b/src/basic/rm-rf.h
index 27d8cc1e5..6e63d3fea 100644
--- a/src/basic/rm-rf.h
+++ b/src/basic/rm-rf.h
@@ -22,7 +22,7 @@
 
 #include <sys/stat.h>
 
-//#include "util.h"
+#include "util.h"
 
 typedef enum RemoveFlags {
         REMOVE_ONLY_DIRECTORIES = 1 << 0,
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 7e68a672e..0564a6812 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -41,7 +41,7 @@
 #include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
-//#include "process-util.h"
+#include "process-util.h"
 #include "socket-util.h"
 #include "string-table.h"
 #include "string-util.h"
@@ -555,8 +555,8 @@ bool socket_address_matches_fd(const SocketAddress *a, int fd) {
 
         return socket_address_equal(a, &b);
 }
+#endif // 0
 
-int sockaddr_port(const struct sockaddr *_sa, unsigned *port) {
 int sockaddr_port(const struct sockaddr *_sa, unsigned *ret_port) {
         union sockaddr_union *sa = (union sockaddr_union*) _sa;
 
@@ -567,17 +567,14 @@ int sockaddr_port(const struct sockaddr *_sa, unsigned *ret_port) {
         switch (sa->sa.sa_family) {
 
         case AF_INET:
-                *port = be16toh(sa->in.sin_port);
                 *ret_port = be16toh(sa->in.sin_port);
                 return 0;
 
         case AF_INET6:
-                *port = be16toh(sa->in6.sin6_port);
                 *ret_port = be16toh(sa->in6.sin6_port);
                 return 0;
 
         case AF_VSOCK:
-                *port = sa->vm.svm_port;
                 *ret_port = sa->vm.svm_port;
                 return 0;
 
@@ -586,6 +583,7 @@ int sockaddr_port(const struct sockaddr *_sa, unsigned *ret_port) {
         }
 }
 
+#if 0 /// UNNEEDED by elogind
 int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret) {
         union sockaddr_union *sa = (union sockaddr_union*) _sa;
         char *p;
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index 94acc6f2c..75218755b 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -46,11 +46,11 @@ union sockaddr_union {
         struct sockaddr_in in;
         struct sockaddr_in6 in6;
         struct sockaddr_un un;
-#if 0 /// UNNEEDED by elogind, only 'sa', 'in', 'in6' and 'un' are used in all of elogind.
+#if 0 /// UNNEEDED by elogind.
         struct sockaddr_nl nl;
         struct sockaddr_ll ll;
-        struct sockaddr_vm vm;
 #endif // 0
+        struct sockaddr_vm vm;
 
         /* Ensure there is enough space to store Infiniband addresses */
         uint8_t ll_buffer[offsetof(struct sockaddr_ll, sll_addr) + CONST_MAX(ETH_ALEN, INFINIBAND_ALEN)];
@@ -121,9 +121,11 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_
 const char* socket_address_get_path(const SocketAddress *a);
 
 bool socket_ipv6_is_supported(void);
+#endif // 0
 
 int sockaddr_port(const struct sockaddr *_sa, unsigned *port);
 
+#if 0 /// UNNEEDED by elogind
 int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret);
 int getpeername_pretty(int fd, bool include_port, char **ret);
 int getsockname_pretty(int fd, char **ret);
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index ccebe805d..d1d88ab93 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1245,6 +1245,7 @@ bool colors_enabled(void) {
         return cached_colors_enabled;
 }
 
+#if 0 /// UNNEEDED by elogind
 bool dev_console_colors_enabled(void) {
         _cleanup_free_ char *s = NULL;
         int b;
@@ -1265,6 +1266,7 @@ bool dev_console_colors_enabled(void) {
 
         return !streq_ptr(s, "dumb");
 }
+#endif // 0
 
 bool underline_enabled(void) {
 
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index 667424c0a..5aa0fc32f 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -142,7 +142,9 @@ bool on_tty(void);
 bool terminal_is_dumb(void);
 bool colors_enabled(void);
 bool underline_enabled(void);
+#if 0 /// UNNEEDED by elogind
 bool dev_console_colors_enabled(void);
+#endif // 0
 
 #define DEFINE_ANSI_FUNC(name, NAME)                            \
         static inline const char *ansi_##name(void) {           \
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 90d17a0d8..d42d59bd1 100644
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -28,7 +28,7 @@
 //#include "glob-util.h"
 #include "hexdecoct.h"
 #include "path-util.h"
-//#include "special.h"
+#include "special.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
diff --git a/src/basic/util.c b/src/basic/util.c
index 5133d9b1e..e096e3194 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -52,7 +52,7 @@
 #include "parse-util.h"
 //#include "path-util.h"
 #include "process-util.h"
-//#include "procfs-util.h"
+#include "procfs-util.h"
 #include "set.h"
 #include "signal-util.h"
 #include "stat-util.h"
@@ -174,11 +174,11 @@ bool in_initrd(void) {
         return saved_in_initrd;
 }
 
+#if 0 /// UNNEEDED by elogind
 void in_initrd_force(bool value) {
         saved_in_initrd = value;
 }
 
-#if 0 /// UNNEEDED by elogind
 /* hey glibc, APIs with callbacks without a user pointer are so useless */
 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
                  int (*compar) (const void *, const void *, void *), void *arg) {
@@ -201,6 +201,7 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
         }
         return NULL;
 }
+#endif // 0
 
 int on_ac_power(void) {
         bool found_offline = false, found_online = false;
@@ -267,7 +268,6 @@ int on_ac_power(void) {
         return found_online || !found_offline;
 }
 
-#endif // 0
 int container_get_leader(const char *machine, pid_t *pid) {
         _cleanup_free_ char *s = NULL, *class = NULL;
         const char *p;
@@ -480,7 +480,6 @@ uint64_t physical_memory_scale(uint64_t v, uint64_t max) {
 
 uint64_t system_tasks_max(void) {
 
-#else
         uint64_t a = TASKS_MAX, b = TASKS_MAX;
         _cleanup_free_ char *root = NULL;
 
@@ -525,8 +524,6 @@ uint64_t system_tasks_max_scale(uint64_t v, uint64_t max) {
         return m / max;
 }
 
-#if 0 /// UNNEEDED by elogind
-#endif // 0
 int version(void) {
         puts(PACKAGE_STRING "\n"
              SYSTEMD_FEATURES);
@@ -534,7 +531,6 @@ int version(void) {
 }
 
 #if 0 /// UNNEEDED by elogind
-#endif // 0
 /* This is a direct translation of str_verscmp from boot.c */
 static bool is_digit(int c) {
         return c >= '0' && c <= '9';
@@ -608,3 +604,4 @@ void disable_coredumps(void) {
         if (r < 0)
                 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
 }
+#endif // 0
diff --git a/src/basic/util.h b/src/basic/util.h
index 2c2651e48..c24fd6c63 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -91,9 +91,9 @@ int prot_from_flags(int flags) _const_;
 #endif // 0
 
 bool in_initrd(void);
+#if 0 /// UNNEEDED by elogind
 void in_initrd_force(bool value);
 
-#if 0 /// UNNEEDED by elogind
 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
                  int (*compar) (const void *, const void *, void *),
                  void *arg);
@@ -121,9 +121,7 @@ static inline void memcpy_safe(void *dst, const void *src, size_t n) {
         memcpy(dst, src, n);
 }
 
-#if 0 /// UNNEEDED by elogind
 int on_ac_power(void);
-#endif // 0
 
 #define memzero(x,l) (memset((x), 0, (l)))
 #define zero(x) (memzero(&(x), sizeof(x)))
@@ -196,12 +194,10 @@ uint64_t physical_memory_scale(uint64_t v, uint64_t max);
 uint64_t system_tasks_max(void);
 uint64_t system_tasks_max_scale(uint64_t v, uint64_t max);
 
-#if 0 /// UNNEEDED by elogind
-#endif // 0
 int version(void);
 
 #if 0 /// UNNEEDED by elogind
-#endif // 0
 int str_verscmp(const char *s1, const char *s2);
 
 void disable_coredumps(void);
+#endif // 0
diff --git a/src/basic/verbs.c b/src/basic/verbs.c
index 0c87121c1..caaa70aa5 100644
--- a/src/basic/verbs.c
+++ b/src/basic/verbs.c
@@ -24,10 +24,10 @@
 #include <stddef.h>
 //#include <string.h>
 
-//#include "env-util.h"
+#include "env-util.h"
 #include "log.h"
 #include "macro.h"
-//#include "process-util.h"
+#include "process-util.h"
 #include "string-util.h"
 #include "verbs.h"
 #include "virt.h"