simplify includes, remove unneeded, add needed

diff --git a/Makefile b/Makefile
index 1d13e23549135055badcd275a9d115ad1b2b69cb..387683d5aaad06ba81e3ab127babfc339e4a2424 100644 (file)
--- 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 7f595241ee451b6ca68bf4eee58675a8c9bb2d00..f785f6e91c41b5e368dd604c89207e8329941273 100644 (file)
--- 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 7e502bb1d0563ec2f70579c8f26b9c1192dc1542..07577e69705a9e92a704c5ff5910014c0f1b5a36 100644 (file)
--- 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 683b48b5ff9c083e93420d189d155840a0344512..aedbdabd5852867334d90316ea401cd6a06a8fa7 100644 (file)
--- 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 e88f62e41e3678267e91a2bdc8808b7fb28a0ef8..9ddeda6fcd6ce401f34d1b09476772f0c8da8fe0 100644 (file)
--- 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 686e5123811d1b8208309f74cfee5d787aee443b..bf4c5e84bbf442e6392086249e4a582f6512643f 100644 (file)
--- 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 f313e100c3fe18400b2fe905f5bffd88e7400b94..e9a2f7ffa430b752989df555825c082d9da4b3d8 100644 (file)
--- 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 98c3cd580ff4f4e07a19d134212a82afe0cdacfd..c3b74a3b91bbfa2657ee58befd74d2d1b2817aca 100644 (file)
--- 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 771b671bad23c11593c398cc83c87a8e17ec2a58..9cec1de2f10b13411ebd99371bb125923af63e69 100644 (file)
--- 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 7e5008b6fa7c5612b9fe17f831ecce2031ec54ee..a72d4f9053a431b25723c09974aa7f91a656764a 100644 (file)
--- 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 9b015a4cae15ffca2c3d4dc9c2fe13435d81ec63..abca61cff2dd0a153c062507fe8f96ac4e5b2e73 100644 (file)
--- 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 823b45f64d8acde03e16b7916d71b93ef405e680..ca2743756b29ac2d7b1aa7f8ae0f754db23b59f3 100644 (file)
--- 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 3067641ba8e93a3b91b00f3bfdfe8760430da654..2684a8ea78ae02bf220a0abaef1b7c8f0c72c5af 100644 (file)
--- 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 5cb4ff23dfb1f37e8ebdce153c923c52f3adeefa..a0cc38549279fc4358d81986844dbc2ba2e92b7c 100644 (file)
--- a/subproc.h
+++ b/subproc.h
@@ -22,13 +22,12 @@
 #ifndef NS_PROC_H
 #define NS_PROC_H
 
-#include "common.h"
-
-#include "nsjail.h"
-
 #include <inttypes.h>
+#include <stdbool.h>
 #include <unistd.h>
 
+#include "nsjail.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 5075c920e6fc1c8ca9f307efcd0e25ea7d13f2d7..68dac55188accbe900e4dd01c21c7ed98a536f47 100644 (file)
--- 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 da3b518d2294f536ce290235796a892e57f23e75..5571d9e1caa2d4a1f05761b35772f78820a08acf 100644 (file)
--- 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 4d509598545c0a516735d46554bf613dd82c8f44..2c23ddc025a3bc7bf19ba78652b000aede66c940 100644 (file)
--- 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);