diff --git a/cmdline.c b/cmdline.c
index 15cac7f..cee7539 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -41,7 +41,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "log.h"
 #include "util.h"
 
diff --git a/contain.c b/contain.c
index 28cb998..ca19dc0 100644
--- a/contain.c
+++ b/contain.c
@@ -18,6 +18,7 @@
    limitations under the License.
 
 */
+
 #include "contain.h"
 
 #include <dirent.h>
diff --git a/log.h b/log.h
index 9cea4d2..04181b3 100644
--- a/log.h
+++ b/log.h
@@ -18,6 +18,7 @@
    limitations under the License.
 
 */
+
 #ifndef _LOG_H
 #define _LOG_H
 
diff --git a/net.c b/net.c
index 95022cc..88e4633 100644
--- a/net.c
+++ b/net.c
@@ -18,6 +18,7 @@
    limitations under the License.
 
 */
+
 #include "net.h"
 
 #include <arpa/inet.h>
diff --git a/net.h b/net.h
index edb5404..30c95c1 100644
--- a/net.h
+++ b/net.h
@@ -18,6 +18,7 @@
    limitations under the License.
 
 */
+
 #ifndef _NET_H
 #define _NET_H
 
diff --git a/nsjail.c b/nsjail.c
index 5df2a0e..c346d63 100644
--- a/nsjail.c
+++ b/nsjail.c
@@ -18,6 +18,7 @@
    limitations under the License.
 
 */
+
 #include "nsjail.h"
 
 #include <errno.h>
@@ -30,7 +31,6 @@
 #include <unistd.h>
 
 #include "cmdline.h"
-#include "common.h"
 #include "log.h"
 #include "net.h"
 #include "subproc.h"
diff --git a/nsjail.h b/nsjail.h
index c8dcd33..a5d3145 100644
--- a/nsjail.h
+++ b/nsjail.h
@@ -23,4 +23,6 @@
 #ifndef _NSJAIL_H
 #define _NSJAIL_H
 
+#include "common.h"
+
 #endif				/* _NSJAIL_H */
diff --git a/subproc.h b/subproc.h
index fb1301c..27866bf 100644
--- a/subproc.h
+++ b/subproc.h
@@ -18,6 +18,7 @@
    limitations under the License.
 
 */
+
 #ifndef _PROC_H
 #define _PROC_H
 
diff --git a/util.h b/util.h
index e1edde7..7e9d88a 100644
--- a/util.h
+++ b/util.h
@@ -18,12 +18,15 @@
    limitations under the License.
 
 */
+
 #ifndef _UTIL_H
 #define _UTIL_H
 
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include "common.h"
+
 void *utilMalloc(size_t sz);
 ssize_t utilWriteToFd(int fd, const void *buf, size_t len);
 ssize_t utilReadFromFd(int fd, void *buf, size_t len);