7 files changed, 11 insertions, 6 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 16e299a7e..64220ac08 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -889,7 +889,6 @@ int cg_set_task_access(
 
         return 0;
 }
-#endif // 0
 
 int cg_set_xattr(const char *controller, const char *path, const char *name, const void *value, size_t size, int flags) {
         _cleanup_free_ char *fs = NULL;
@@ -927,6 +926,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
 
         return (int) n;
 }
+#endif // 0
 
 int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         _cleanup_fclose_ FILE *f = NULL;
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 327a525bf..27ab8d693 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -189,10 +189,10 @@ int cg_get_keyed_attribute(const char *controller, const char *path, const char
 #if 0 /// UNNEEDED by elogind
 int cg_set_group_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid);
 int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid);
-#endif // 0
 
 int cg_set_xattr(const char *controller, const char *path, const char *name, const void *value, size_t size, int flags);
 int cg_get_xattr(const char *controller, const char *path, const char *name, void *value, size_t size);
+#endif // 0
 
 int cg_install_release_agent(const char *controller, const char *agent);
 int cg_uninstall_release_agent(const char *controller);
@@ -253,9 +253,9 @@ int cg_kernel_controllers(Set *controllers);
 bool cg_ns_supported(void);
 #endif // 0
 
-#if 0 /// UNNEEDED by elogind
 int cg_all_unified(void);
 int cg_unified(const char *controller);
+#if 0 /// UNNEEDED by elogind
 void cg_unified_flush(void);
 
 bool cg_is_unified_wanted(void);
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index bfdf48322..b1cad55e7 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -567,6 +567,7 @@ int parse_percent(const char *p) {
         return v;
 }
 
+#if 0 /// UNNEEDED by elogind
 int parse_nice(const char *p, int *ret) {
         int n, r;
 
@@ -580,3 +581,4 @@ int parse_nice(const char *p, int *ret) {
         *ret = n;
         return 0;
 }
+#endif // 0
diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index 2bcbadecf..23b193743 100644
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -111,4 +111,6 @@ int parse_fractional_part_u(const char **s, size_t digits, unsigned *res);
 int parse_percent_unbounded(const char *p);
 int parse_percent(const char *p);
 
+#if 0 /// UNNEEDED by elogind
 int parse_nice(const char *p, int *ret);
+#endif // 0
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 3422340b6..8cb013e6c 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -34,7 +34,6 @@
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "fs-util.h"
-#include "glob-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
@@ -835,7 +834,6 @@ bool is_deviceallow_pattern(const char *path) {
                startswith(path, "block-") ||
                startswith(path, "char-");
 }
-#endif // 0
 
 int systemd_installation_has_version(const char *root, unsigned minimal_version) {
         const char *pattern;
@@ -902,3 +900,4 @@ int systemd_installation_has_version(const char *root, unsigned minimal_version)
 
         return false;
 }
+#endif // 0
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index cdb194d2a..605485665 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -140,7 +140,7 @@ bool hidden_or_backup_file(const char *filename) _pure_;
 
 #if 0 /// UNNEEDED by elogind
 bool is_device_path(const char *path);
-#endif // 0
 bool is_deviceallow_pattern(const char *path);
 
 int systemd_installation_has_version(const char *root, unsigned minimal_version);
+#endif // 0
diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 6a41db184..c05d05d78 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -114,6 +114,8 @@ void valgrind_summary_hack(void);
 
 int pid_compare_func(const void *a, const void *b);
 
+#if 0 /// UNNEEDED by elogind
 static inline bool nice_is_valid(int n) {
         return n >= PRIO_MIN && n < PRIO_MAX;
 }
+#endif // 0