diff --git a/src/buffer.c b/src/buffer.c
index b93e8d0..aa0a0bb 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,4 +1,6 @@
+#include "common.h"
 #include "buffer.h"
+
 #include <stdio.h>
 
 Buffer createBuffer(FILE* file) {
diff --git a/src/compress.c b/src/compress.c
index adf46e3..a5873b0 100644
--- a/src/compress.c
+++ b/src/compress.c
@@ -1,8 +1,10 @@
-#include "compress.h"
 #include "common.h"
+#include "compress.h"
 #include "buffer.h"
+#include "huftree.h"
 #include "display.h"
-#include "assert.h"
+
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/display.c b/src/display.c
index caf9fb8..6524cb4 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1,6 +1,7 @@
-#include "display.h"
 #include "common.h"
+#include "display.h"
 #include "huftree.h"
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/huftree.c b/src/huftree.c
index da6d789..de0430c 100644
--- a/src/huftree.c
+++ b/src/huftree.c
@@ -1,6 +1,7 @@
-#include "huftree.h"
 #include "common.h"
+#include "huftree.h"
 #include "buffer.h"
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/main.c b/src/main.c
index 2703cc2..992ec91 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,8 @@
 #include "common.h"
+#include "display.h"
 #include "compress.h"
+
+#include <stdlib.h>
 #include <argp.h>
 #include <libintl.h>
 #include <locale.h>