From 152d6d68ae96b084fc24efd855413622abc8b869 Mon Sep 17 00:00:00 2001
From: Robert Swiecki <robert@swiecki.net>
Date: Wed, 18 Oct 2017 14:46:17 +0200
Subject: [PATCH] simplify includes, remove unneeded, add needed

---
 Makefile  | 26 +++++++++++++-------------
 caps.c    |  1 +
 cgroup.c  |  4 ----
 cmdline.c |  3 +--
 config.h  |  5 ++++-
 contain.c |  4 ++--
 cpu.c     |  2 ++
 mount.c   |  5 +++++
 net.c     |  4 ++--
 nsjail.c  |  3 +--
 pid.c     |  2 +-
 sandbox.c |  2 +-
 subproc.c |  7 +++----
 subproc.h |  7 +++----
 user.c    |  3 +++
 util.c    |  3 +++
 util.h    |  2 +-
 17 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/Makefile b/Makefile
index 1d13e23..387683d 100644
--- a/Makefile
+++ b/Makefile
@@ -96,23 +96,23 @@ indent:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-nsjail.o: nsjail.h caps.h cmdline.h log.h net.h subproc.h common.h util.h
-caps.o: caps.h nsjail.h log.h util.h common.h
-cmdline.o: cmdline.h nsjail.h caps.h config.h common.h log.h mount.h user.h
+nsjail.o: nsjail.h cmdline.h common.h log.h net.h subproc.h util.h
+caps.o: caps.h nsjail.h common.h log.h util.h
+cmdline.o: cmdline.h nsjail.h caps.h common.h config.h log.h mount.h user.h
 cmdline.o: util.h
 contain.o: contain.h nsjail.h caps.h cgroup.h cpu.h log.h mount.h net.h pid.h
-contain.o: user.h util.h common.h uts.h
+contain.o: user.h uts.h
 log.o: log.h nsjail.h
-cgroup.o: cgroup.h nsjail.h log.h util.h common.h
-mount.o: mount.h nsjail.h log.h subproc.h common.h util.h
-net.o: net.h nsjail.h log.h subproc.h common.h
-pid.o: pid.h nsjail.h log.h subproc.h common.h
-sandbox.o: sandbox.h nsjail.h common.h kafel/include/kafel.h log.h
-subproc.o: subproc.h common.h nsjail.h cgroup.h contain.h log.h net.h
+cgroup.o: cgroup.h nsjail.h log.h util.h
+mount.o: mount.h nsjail.h common.h log.h subproc.h util.h
+net.o: net.h nsjail.h log.h subproc.h
+pid.o: pid.h nsjail.h log.h subproc.h
+sandbox.o: sandbox.h nsjail.h kafel/include/kafel.h log.h
+subproc.o: subproc.h nsjail.h cgroup.h common.h contain.h log.h net.h
 subproc.o: sandbox.h user.h util.h
-user.o: user.h nsjail.h log.h subproc.h common.h util.h
-util.o: util.h common.h log.h nsjail.h
+user.o: user.h nsjail.h common.h log.h subproc.h util.h
+util.o: util.h nsjail.h common.h log.h
 uts.o: uts.h nsjail.h log.h
-cpu.o: cpu.h nsjail.h log.h util.h common.h
+cpu.o: cpu.h nsjail.h log.h util.h
 config.o: common.h caps.h nsjail.h cmdline.h config.h log.h mount.h user.h
 config.o: util.h
diff --git a/caps.c b/caps.c
index 7f59524..f785f6e 100644
--- a/caps.c
+++ b/caps.c
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "common.h"
 #include "log.h"
 #include "util.h"
 
diff --git a/cgroup.c b/cgroup.c
index 7e502bb..07577e6 100644
--- a/cgroup.c
+++ b/cgroup.c
@@ -27,11 +27,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/mount.h>
 #include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "log.h"
diff --git a/cmdline.c b/cmdline.c
index 683b48b..aedbdab 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -36,12 +36,11 @@
 #include <strings.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
-#include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "caps.h"
+#include "common.h"
 #include "config.h"
 #include "log.h"
 #include "mount.h"
diff --git a/config.h b/config.h
index e88f62e..9ddeda6 100644
--- a/config.h
+++ b/config.h
@@ -26,7 +26,10 @@
 extern "C" {
 #endif
 
-#include "common.h"
+#include <stdbool.h>
+
+#include "nsjail.h"
+
 bool configParse(struct nsjconf_t* nsjconf, const char* file);
 
 #ifdef __cplusplus
diff --git a/contain.c b/contain.c
index 686e512..bf4c5e8 100644
--- a/contain.c
+++ b/contain.c
@@ -24,6 +24,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -32,8 +33,8 @@
 #include <string.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
+#include <sys/queue.h>
 #include <sys/resource.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "caps.h"
@@ -44,7 +45,6 @@
 #include "net.h"
 #include "pid.h"
 #include "user.h"
-#include "util.h"
 #include "uts.h"
 
 static bool containUserNs(struct nsjconf_t* nsjconf) { return userInitNsFromChild(nsjconf); }
diff --git a/cpu.c b/cpu.c
index f313e10..e9a2f7f 100644
--- a/cpu.c
+++ b/cpu.c
@@ -21,7 +21,9 @@
 
 #include "cpu.h"
 
+#include <inttypes.h>
 #include <sched.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/mount.c b/mount.c
index 98c3cd5..c3b74a3 100644
--- a/mount.c
+++ b/mount.c
@@ -23,20 +23,25 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <linux/sched.h>
 #include <sched.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mount.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <syscall.h>
 #include <unistd.h>
 
+#include "common.h"
 #include "log.h"
 #include "subproc.h"
 #include "util.h"
diff --git a/net.c b/net.c
index 771b671..9cec1de 100644
--- a/net.c
+++ b/net.c
@@ -25,16 +25,16 @@
 #include <errno.h>
 #include <net/if.h>
 #include <net/route.h>
+#include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet/tcp.h>
-#include <sched.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <sys/ioctl.h>
-#include <sys/resource.h>
+#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/nsjail.c b/nsjail.c
index 7e5008b..a72d4f9 100644
--- a/nsjail.c
+++ b/nsjail.c
@@ -21,7 +21,6 @@
 
 #include "nsjail.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -30,8 +29,8 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "caps.h"
 #include "cmdline.h"
+#include "common.h"
 #include "log.h"
 #include "net.h"
 #include "subproc.h"
diff --git a/pid.c b/pid.c
index 9b015a4..abca61c 100644
--- a/pid.c
+++ b/pid.c
@@ -24,8 +24,8 @@
 #include <linux/sched.h>
 #include <sched.h>
 #include <signal.h>
+#include <stddef.h>
 #include <sys/prctl.h>
-#include <sys/syscall.h>
 #include <unistd.h>
 
 #include "log.h"
diff --git a/sandbox.c b/sandbox.c
index 823b45f..ca27437 100644
--- a/sandbox.c
+++ b/sandbox.c
@@ -23,9 +23,9 @@
 
 #include <linux/filter.h>
 #include <linux/seccomp.h>
+#include <stddef.h>
 #include <sys/prctl.h>
 
-#include "common.h"
 #include "kafel.h"
 #include "log.h"
 
diff --git a/subproc.c b/subproc.c
index 3067641..2684a8e 100644
--- a/subproc.c
+++ b/subproc.c
@@ -21,22 +21,21 @@
 
 #include "subproc.h"
 
-#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <linux/sched.h>
-#include <netinet/in.h>
 #include <sched.h>
 #include <setjmp.h>
 #include <signal.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/prctl.h>
 #include <sys/queue.h>
-#include <sys/syscall.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <time.h>
diff --git a/subproc.h b/subproc.h
index 5cb4ff2..a0cc385 100644
--- a/subproc.h
+++ b/subproc.h
@@ -22,13 +22,12 @@
 #ifndef NS_PROC_H
 #define NS_PROC_H
 
-#include "common.h"
+#include <inttypes.h>
+#include <stdbool.h>
+#include <unistd.h>
 
 #include "nsjail.h"
 
-#include <inttypes.h>
-#include <unistd.h>
-
 void subprocRunChild(struct nsjconf_t* nsjconf, int fd_in, int fd_out, int fd_err);
 int subprocCount(struct nsjconf_t* nsjconf);
 void subprocDisplay(struct nsjconf_t* nsjconf);
diff --git a/user.c b/user.c
index 5075c92..68dac55 100644
--- a/user.c
+++ b/user.c
@@ -29,14 +29,17 @@
 #include <pwd.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/prctl.h>
+#include <sys/queue.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "common.h"
 #include "log.h"
 #include "subproc.h"
 #include "util.h"
diff --git a/util.c b/util.c
index da3b518..5571d9e 100644
--- a/util.c
+++ b/util.c
@@ -28,6 +28,8 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -38,6 +40,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "common.h"
 #include "log.h"
 
 void* utilMalloc(size_t sz)
diff --git a/util.h b/util.h
index 4d50959..2c23ddc 100644
--- a/util.h
+++ b/util.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "common.h"
+#include "nsjail.h"
 
 void* utilMalloc(size_t sz);
 void* utilCalloc(size_t sz);