util-lib: move more file I/O related calls into fileio.[ch]

src/test/test-async.c

@@ -20,8 +20,9 @@
 #include <unistd.h>
 
 #include "async.h"
-#include "util.h"
+#include "fileio.h"
 #include "macro.h"
+#include "util.h"
 
 static bool test_async = false;
 

src/test/test-fdset.c

@@ -22,6 +22,7 @@
 
 #include "fd-util.h"
 #include "fdset.h"
+#include "fileio.h"
 #include "macro.h"
 #include "util.h"
 

src/test/test-terminal-util.c

@@ -21,11 +21,12 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-#include "terminal-util.h"
-#include "macro.h"
-#include "util.h"
-#include "log.h"
 #include "fd-util.h"
+#include "fileio.h"
+#include "log.h"
+#include "macro.h"
+#include "terminal-util.h"
+#include "util.h"
 
 static void test_default_term_for_tty(void) {
         puts(default_term_for_tty("/dev/tty23"));

src/test/test-tmpfiles.c

@@ -25,6 +25,7 @@
 #include <unistd.h>
 
 #include "fd-util.h"
+#include "fileio.h"
 #include "formats-util.h"
 #include "string-util.h"
 #include "util.h"