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

7 files changed, 12 insertions, 24 deletions

diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c
index a320a0d78..23cd60226 100644
--- a/src/test/test-bus-util.c
+++ b/src/test/test-bus-util.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-//#include "bus-util.h"
-//#include "log.h"
+#include "bus-util.h"
+#include "log.h"
 
 static void test_name_async(unsigned n_messages) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index a9b78450b..2ec2dfc26 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -8,10 +8,10 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-//#include "fileio.h"
+#include "fileio.h"
 #include "fs-util.h"
 #include "macro.h"
-//#include "mkdir.h"
+#include "mkdir.h"
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "string-util.h"
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index a8df45941..3cce425e6 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -3,17 +3,13 @@
 #include "conf-parser.h"
 #include "fd-util.h"
 #include "fileio.h"
-//#include "fs-util.h"
+#include "fs-util.h"
 #include "log.h"
 #include "macro.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
 
-/// Additional includes needed by elogind
-#include "fd-util.h"
-#include "fileio.h"
-
 static void test_config_parse_path_one(const char *rvalue, const char *expected) {
         _cleanup_free_ char *path = NULL;
 
diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index 5e0c7577f..92692bd48 100644
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -5,10 +5,10 @@
 #include "alloc-util.h"
 #include "def.h"
 #include "string-util.h"
-//#include "strv.h"
+#include "strv.h"
 #include "terminal-util.h"
 #include "util.h"
-//#include "utf8.h"
+#include "utf8.h"
 
 static void test_ellipsize_mem_one(const char *s, size_t old_length, size_t new_length) {
         _cleanup_free_ char *n = NULL;
diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c
index 73688952f..19e1ed477 100644
--- a/src/test/test-parse-util.c
+++ b/src/test/test-parse-util.c
@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <locale.h>
 #include <math.h>
-//#include <sys/socket.h>
+#include <sys/socket.h>
 
 #include "alloc-util.h"
 #include "errno-list.h"
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index d78d368c0..9387d5804 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -6,17 +6,9 @@
 //#include "log.h"
 #include "macro.h"
 #include "signal-util.h"
+#include "stdio-util.h"
+#include "string-util.h"
 /// Additional includes needed by elogind
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
 #include "process-util.h"
 
 #define info(sig) log_info(#sig " = " STRINGIFY(sig) " = %d", sig)
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index 47032729e..a9e322f0c 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
-//#include "locale-util.h"
+#include "locale-util.h"
 #include "macro.h"
 #include "string-util.h"
 #include "strv.h"
-//#include "utf8.h"
+#include "utf8.h"
 
 static void test_string_erase(void) {
         char *x;