misc: cleanup includes

travisshivers · Aug 10, 2020 · f010838 · f010838
1 parent 10a4166
commit f010838
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 15 deletions.
diff --git a/capable.c b/capable.c
@@ -5,8 +5,6 @@
  */
 
 #include <err.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <string.h>
 #include <syscall.h>
 #include <unistd.h>

diff --git a/enter.c b/enter.c
@@ -9,20 +9,16 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
-#include <inttypes.h>
 #include <limits.h>
 #include <sched.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
-#include <sys/syscall.h>
 #include <sys/wait.h>
+#include <syscall.h>
 
 #include "capable.h"
 #include "enter.h"

diff --git a/init.c b/init.c
@@ -8,10 +8,8 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
-#include <sys/ioctl.h>
 #include <sys/prctl.h>
 #include <sys/ptrace.h>
-#include <sys/wait.h>
 #include <unistd.h>
 
 #include "sig.h"

diff --git a/mount.c b/mount.c
@@ -7,8 +7,6 @@
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mount.h>

diff --git a/mount.h b/mount.h
@@ -7,6 +7,8 @@
 #ifndef MOUNT_H
 # define MOUNT_H
 
+# include <stddef.h>
+
 struct mount_entry {
 	char *source;
 	char *target;

diff --git a/outer.c b/outer.c
@@ -8,14 +8,14 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
 
 #include "capable.h"

diff --git a/timens.c b/timens.c
@@ -6,7 +6,6 @@
 
 #include <err.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <time.h>
 #include "timens.h"

diff --git a/timens.h b/timens.h
@@ -7,6 +7,9 @@
 #ifndef TIME_H_
 # define TIME_H_
 
+# include <stddef.h>
+# include <time.h>
+
 enum {
 	MAX_CLOCK = 11, // CLOCK_TAI
 

diff --git a/userns.h b/userns.h
@@ -8,7 +8,9 @@
 # define USERNS_H_
 
 # include <stdbool.h>
+# include <stddef.h>
 # include <stdint.h>
+# include <sys/types.h>
 
 enum {
 	MAX_USER_MAPPINGS = 340, /* as of linux 4.15, c.f. user_namespaces(7) */