Prep v239: Uncomment header inclusions that are new or needed now.

12 files changed, 20 insertions, 17 deletions

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 5801d5409..6960a0bce 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -8,7 +8,7 @@
 #include <string.h>
 
 #include "conf-files.h"
-//#include "def.h"
+#include "def.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "hashmap.h"
@@ -16,7 +16,7 @@
 #include "macro.h"
 #include "missing.h"
 #include "path-util.h"
-//#include "set.h"
+#include "set.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
@@ -333,6 +333,7 @@ int conf_files_list_with_replacement(
         return 0;
 }
 
+#if 0 /// UNNEEDED by elogind
 int conf_files_cat(const char *root, const char *name) {
         _cleanup_strv_free_ char **dirs = NULL, **files = NULL;
         _cleanup_free_ char *path = NULL;
@@ -365,3 +366,4 @@ int conf_files_cat(const char *root, const char *name) {
         /* show */
         return cat_files(path, files, CAT_FLAGS_MAIN_FILE_OPTIONAL);
 }
+#endif // 0
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index 9da03ed22..16fcc5736 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -21,4 +21,6 @@ int conf_files_list_with_replacement(
                 const char *replacement,
                 char ***files,
                 char **replace_file);
+#if 0 /// UNNEEDED by elogind
 int conf_files_cat(const char *root, const char *name);
+#endif // 0
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 1b1e512b8..aaefc3a51 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -3,7 +3,7 @@
 //#include <dirent.h>
 //#include <errno.h>
 //#include <fcntl.h>
-//#include <stddef.h>
+#include <stddef.h>
 //#include <stdio.h>
 //#include <stdlib.h>
 //#include <string.h>
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 9ea102c0f..1efd83b7f 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -7,8 +7,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-//#include "alloc-util.h"
-//#include "copy.h"
+#include "alloc-util.h"
+#include "copy.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/basic/format-table.c b/src/basic/format-table.c
index c967642df..6c079bf8d 100644
--- a/src/basic/format-table.c
+++ b/src/basic/format-table.c
@@ -13,7 +13,7 @@
 //#include "terminal-util.h"
 //#include "time-util.h"
 //#include "utf8.h"
-//#include "util.h"
+#include "util.h"
 
 #define DEFAULT_WEIGHT 100
 
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 29d31831e..9e9c172f9 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -11,13 +11,12 @@
 #include "mkdir.h"
 #include "path-util.h"
 #include "stat-util.h"
-//#include "stdio-util.h"
+#include "stdio-util.h"
 #include "user-util.h"
 
 /// Additional includes needed by elogind
 #include "missing.h"
 
-int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, bool follow_symlink, mkdir_func_t _mkdir) {
 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
         struct stat st;
         int r;
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index f33e12a74..3935d8a3e 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -6,14 +6,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <sys/socket.h>
+#include <sys/socket.h>
 
 #include "alloc-util.h"
 #include "errno-list.h"
 //#include "extract-word.h"
 #include "locale-util.h"
 #include "macro.h"
-//#include "missing.h"
+#include "missing.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "string-util.h"
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 7064cc453..77d76958c 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
-//#include <sys/mount.h>
+#include <sys/mount.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index cb69abca6..1b0de8bd0 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -8,7 +8,7 @@
 #include <sys/statfs.h>
 #include <unistd.h>
 
-//#include "alloc-util.h"
+#include "alloc-util.h"
 //#include "btrfs-util.h"
 #include "cgroup-util.h"
 #include "dirent-util.h"
diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index 2b63eee83..8c82d008c 100644
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -6,21 +6,21 @@
 ***/
 
 #include <errno.h>
-//#include <fcntl.h>
+#include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
-//#include "fd-util.h"
+#include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
 #include "macro.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "smack-util.h"
-//#include "stdio-util.h"
+#include "stdio-util.h"
 #include "string-table.h"
 #include "xattr-util.h"
 
diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h
index 2a9773f32..2424d479e 100644
--- a/src/basic/smack-util.h
+++ b/src/basic/smack-util.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-//#include "label.h"
+#include "label.h"
 #include "macro.h"
 
 #define SMACK_FLOOR_LABEL "_"
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 7abbfe0c4..0f43b3744 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -17,7 +17,7 @@
 //#include "terminal-util.h"
 #include "utf8.h"
 #include "util.h"
-//#include "fileio.h"
+#include "fileio.h"
 
 int strcmp_ptr(const char *a, const char *b) {