diff --git a/inc/config.h b/inc/config.h
index 66b5c36..a5930b2 100644
--- a/inc/config.h
+++ b/inc/config.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Scoopta
+ *  Copyright (C) 2019-2020 Scoopta
  *  This file is part of Wofi
  *  Wofi is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,13 +18,9 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <map.h>
-
-#include <stdio.h>
 #include <stdint.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
+
+#include <map.h>
 
 void config_put(struct map* map, char* line);
 
diff --git a/inc/property_box.h b/inc/property_box.h
index 1b44afe..f2e993a 100644
--- a/inc/property_box.h
+++ b/inc/property_box.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Scoopta
+ *  Copyright (C) 2019-2020 Scoopta
  *  This file is part of Wofi
  *  Wofi is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
 
 #ifndef PROPERTY_BOX_H
 #define PROPERTY_BOX_H
-#include <map.h>
 
 #include <gtk/gtk.h>
 
+
 #define WOFI_TYPE_PROPERTY_BOX wofi_property_box_get_type()
 G_DECLARE_FINAL_TYPE(WofiPropertyBox, wofi_property_box, WOFI, PROPERTY_BOX, GtkBox);
 
diff --git a/inc/utils.h b/inc/utils.h
index 9d9894f..f644a4a 100644
--- a/inc/utils.h
+++ b/inc/utils.h
@@ -18,17 +18,9 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include <math.h>
 #include <time.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <libgen.h>
 
-#include <sys/stat.h>
-#include <sys/time.h>
+#include <sys/types.h>
 
 time_t utils_get_time_millis(void);
 
diff --git a/inc/wofi.h b/inc/wofi.h
index 978d50e..3955c4c 100644
--- a/inc/wofi.h
+++ b/inc/wofi.h
@@ -18,28 +18,9 @@
 #ifndef WAIFU_H
 #define WAIFU_H
 
-#include <wofi_api.h>
+#include <stdbool.h>
 
-#include <utils.h>
-#include <config.h>
-#include <property_box.h>
-
-#include <ctype.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <stddef.h>
-#include <string.h>
-#include <libgen.h>
-#include <unistd.h>
-
-#include <sys/stat.h>
-
-#include <gtk/gtk.h>
-#include <pango/pango.h>
-#include <gdk/gdkwayland.h>
-
-#include <xdg-output-unstable-v1-client-protocol.h>
-#include <wlr-layer-shell-unstable-v1-client-protocol.h>
+#include <map.h>
 
 void wofi_init(struct map* config);
 
diff --git a/inc/wofi_api.h b/inc/wofi_api.h
index 2ed8acd..372d2a5 100644
--- a/inc/wofi_api.h
+++ b/inc/wofi_api.h
@@ -18,9 +18,7 @@
 #ifndef WOFI_API_H
 #define WOFI_API_H
 
-#include <map.h>
-
-#include <stdint.h>
+#include <stddef.h>
 #include <stdbool.h>
 
 #include <wayland-client.h>
diff --git a/modes/dmenu.c b/modes/dmenu.c
index 93d724b..377df4f 100644
--- a/modes/dmenu.c
+++ b/modes/dmenu.c
@@ -15,7 +15,15 @@
     along with Wofi.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <wofi.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <config.h>
+#include <wofi_api.h>
+
+#include <pango/pango.h>
 
 static const char* arg_names[] = {"parse_action", "separator", "print_line_num"};
 
diff --git a/modes/drun.c b/modes/drun.c
index bc65362..d11aff7 100644
--- a/modes/drun.c
+++ b/modes/drun.c
@@ -15,8 +15,17 @@
     along with Wofi.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <wofi.h>
+#include <stdio.h>
+#include <libgen.h>
 
+#include <sys/stat.h>
+
+#include <map.h>
+#include <utils.h>
+#include <config.h>
+#include <wofi_api.h>
+
+#include <gtk/gtk.h>
 #include <gio/gdesktopappinfo.h>
 
 static const char* arg_names[] = {"print_command"};
diff --git a/modes/run.c b/modes/run.c
index 3ffe809..e3acea2 100644
--- a/modes/run.c
+++ b/modes/run.c
@@ -15,7 +15,20 @@
     along with Wofi.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <wofi.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+#include <utils.h>
+#include <config.h>
+#include <wofi_api.h>
+
+#include <glib.h>
 
 static const char* arg_names[] = {"always_parse_args", "show_all"};
 
diff --git a/src/config.c b/src/config.c
index bc5f576..101df8e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Scoopta
+ *  Copyright (C) 2019-2020 Scoopta
  *  This file is part of Wofi
  *  Wofi is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,13 @@
 
 #include <config.h>
 
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <map.h>
+
 void config_put(struct map* map, char* line) {
 	size_t line_size = strlen(line);
 	char* new_line = calloc(1, line_size + 1);
diff --git a/src/main.c b/src/main.c
index 5cb9bf2..67ef23a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,17 +15,23 @@
     along with Wofi.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <map.h>
-#include <wofi.h>
-#include <utils.h>
-#include <config.h>
-
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <getopt.h>
 #include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <map.h>
+#include <wofi.h>
+#include <utils.h>
+#include <config.h>
+
+#include <wayland-client.h>
+
+#include <gtk/gtk.h>
 
 static const char* nyan_colors[] = {"#FF0000", "#FFA500", "#FFFF00", "#00FF00", "#0000FF", "#FF00FF"};
 static size_t nyan_color_l = sizeof(nyan_colors) / sizeof(char*);
diff --git a/src/property_box.c b/src/property_box.c
index b49dbe1..fea709b 100644
--- a/src/property_box.c
+++ b/src/property_box.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Scoopta
+ *  Copyright (C) 2019-2020 Scoopta
  *  This file is part of Wofi
  *  Wofi is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 
 #include <property_box.h>
 
+#include <map.h>
+
 struct _WofiPropertyBox {
 	GtkBox super;
 };
diff --git a/src/utils.c b/src/utils.c
index 0faa717..c34bfe0 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -17,6 +17,17 @@
 
 #include <utils.h>
 
+#include <math.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <libgen.h>
+
+#include <sys/stat.h>
+#include <sys/time.h>
+
 time_t utils_get_time_millis(void) {
 	struct timeval time;
 	gettimeofday(&time, NULL);
diff --git a/src/wofi.c b/src/wofi.c
index 61b90fc..2643902 100644
--- a/src/wofi.c
+++ b/src/wofi.c
@@ -16,6 +16,28 @@
  */
 
 #include <wofi.h>
+#include <wofi_api.h>
+
+#include <ctype.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <string.h>
+#include <libgen.h>
+#include <unistd.h>
+#include <stdint.h>
+
+#include <sys/stat.h>
+
+#include <utils.h>
+#include <config.h>
+#include <property_box.h>
+
+#include <xdg-output-unstable-v1-client-protocol.h>
+#include <wlr-layer-shell-unstable-v1-client-protocol.h>
+
+#include <gtk/gtk.h>
+#include <pango/pango.h>
+#include <gdk/gdkwayland.h>
 
 static const char* terminals[] = {"kitty", "termite", "gnome-terminal", "weston-terminal"};