more include-what-you-use and get rid of unused files

Author: Chris Morin

Makefile.am

@@ -107,6 +107,7 @@ libutils_la_SOURCES = \
 	src/alloc-util.c \
 	src/alloc-util.h \
 	src/architecture.h \
+	src/attributes.h \
 	src/build.h \
 	src/cgroup-util.c \
 	src/cgroup-util.h \
@@ -152,8 +153,6 @@ libutils_la_SOURCES = \
 	src/set.h \
 	src/siphash24.c \
 	src/siphash24.h \
-	src/socket-util.c \
-	src/socket-util.h \
 	src/stdio-util.h \
 	src/string-table.c \
 	src/string-table.h \
@@ -168,8 +167,6 @@ libutils_la_SOURCES = \
 	src/time-util.c \
 	src/time-util.h \
 	src/unaligned.h \
-	src/user-util.c \
-	src/user-util.h \
 	src/utf8.c \
 	src/utf8.h \
 	src/util.c \

src/alloc-util.c

@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include "alloc-util.h"
-#include "log.h"
 #include "macro.h"
 
 void* memdup(const void *p, size_t l) {

src/alloc-util.h

@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "macro.h"
+#include "attributes.h"
 
 #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
 

src/bootchart.c

@@ -31,6 +31,7 @@
 
  ***/
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -41,6 +42,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/resource.h>
+#include <sys/uio.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -54,14 +56,15 @@
 #include "fileio.h"
 #include "io-util.h"
 #include "list.h"
+#include "log.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "store.h"
 #include "string-util.h"
 #include "strxcpyx.h"
 #include "svg.h"
-#include "util.h"
+#include "time-util.h"
 
 static int exiting = 0;
 

src/bootchart.h

@@ -22,7 +22,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <limits.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 #include "list.h"
 

src/cgroup-util.c

@@ -19,10 +19,12 @@
 
 #include <errno.h>
 #include <limits.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/statfs.h>
 #include <sys/types.h>
 
+#include "attributes.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "fd-util.h"

src/dirent-util.c

@@ -18,7 +18,7 @@
 ***/
 
 #include "dirent-util.h"
-#include "path-util.h"
+#include "macro.h"
 #include "string-util.h"
 
 bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {

src/dirent-util.h

@@ -23,8 +23,7 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "macro.h"
-#include "path-util.h"
+#include "attributes.h"
 
 bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pure_;
 

src/fd-util.h

@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <stdio.h>
 
+#include "attributes.h"
 #include "macro.h"
 
 /* Make sure we can distinguish fd 0 and NULL */

src/fileio.h

@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "macro.h"
+#include "attributes.h"
 
 typedef enum {
         WRITE_STRING_FILE_CREATE = 1,