From 38f28186ec91799d4280ee4f6bfafd1a8c8a9801 Mon Sep 17 00:00:00 2001
From: Orestis Floros <orestisflo@gmail.com>
Date: Sun, 19 Apr 2020 11:22:59 +0200
Subject: [PATCH] Remove some includes from all.h

Also removes duplicates from other headers

All used std* imports are included once in all.h for easy use

- getopt: Only used in main.c and inject_randr1.5.c
- glob: Not used in i3, only in i3bar & libi3
- inttypes: Only used in util.c
- locale: A bit specific for all.h
- math: Slow according to #4022
- unistd: I feel it's good to explicitly include per file that needs it
- yajl: Specific to yajl_utils.h and ipc.h

Related to #4022

Timing before:

```
Analyzing build trace from ...
**** Time summary:
Compilation (81 times):
  Parsing (frontend):           51.3 s
  Codegen & opts (backend):      7.7 s

**** Files that took longest to parse (compiler frontend):
  1254 ms: build/src/i3-commands.o
   972 ms: build/src/i3-resize.o
   945 ms: build/src/i3-con.o
   921 ms: build/src/i3-scratchpad.o
   907 ms: build/src/i3-main.o
   904 ms: build/src/i3-handlers.o
   904 ms: build/src/i3-config_directives.o
   893 ms: build/src/i3-restore_layout.o
   875 ms: build/src/i3-x.o
   854 ms: build/src/i3-ipc.o

**** Files that took longest to codegen (compiler backend):
   863 ms: build/src/i3-commands.o
   471 ms: build/i3bar/src/i3bar-xcb.o
   377 ms: build/src/i3-con.o
   360 ms: build/src/i3-ipc.o
   306 ms: build/src/i3-x.o
   290 ms: build/src/i3-main.o
   238 ms: build/src/i3-config_parser.o
   237 ms: build/src/i3-handlers.o
   220 ms: build/i3-config-wizard/i3_config_wizard-main.o
   214 ms: build/src/i3-bindings.o

**** Functions that took longest to compile:
   209 ms: main (../../i3/src/main.c)
    95 ms: manage_window (../../i3/src/manage.c)
    57 ms: reconfig_windows (../../i3/i3bar/src/xcb.c)
    55 ms: x_draw_decoration (../../i3/src/x.c)
    49 ms: x_push_node (../../i3/src/x.c)
    48 ms: handle_client_message (../../i3/src/handlers.c)
    48 ms: dump_node (../../i3/src/ipc.c)
    47 ms: GENERATED_call (../../i3/src/config_parser.c)
    45 ms: config_string_cb (../../i3/i3bar/src/config.c)
    44 ms: GENERATED_call (../../i3/src/commands_parser.c)
    42 ms: floating_check_size (../../i3/src/floating.c)
    40 ms: con_swap (../../i3/src/con.c)
    40 ms: parse_config (../../i3/src/config_parser.c)
    39 ms: main (../../i3/i3-nagbar/main.c)
    39 ms: cmd_rename_workspace (../../i3/src/commands.c)
    38 ms: window_update_normal_hints (../../i3/src/window.c)
    38 ms: cmd_swap (../../i3/src/commands.c)
    37 ms: dump_bar_config (../../i3/src/ipc.c)
    36 ms: translate_keysyms (../../i3/src/bindings.c)
    35 ms: tree_close_internal (../../i3/src/tree.c)
    34 ms: match_matches_window (../../i3/src/match.c)
    34 ms: floating_enable (../../i3/src/floating.c)
    34 ms: json_string (../../i3/src/load_layout.c)
    33 ms: x_push_changes (../../i3/src/x.c)
    33 ms: main (../../i3/i3-config-wizard/main.c)
    31 ms: free_configuration (../../i3/src/config.c)
    30 ms: parse_file (../../i3/src/config_parser.c)
    28 ms: load_font (../../i3/libi3/font.c)
    28 ms: handle_configure_request (../../i3/src/handlers.c)
    28 ms: parse_command (../../i3/src/commands_parser.c)

**** Function sets that took longest to compile / optimize:

*** Expensive headers:
29287 ms: ../../i3/include/libi3.h (included 78 times, avg 375 ms), included via:
  i3-resize.o all.h data.h  (576 ms)
  a-g_utf8_make_valid.o  (491 ms)
  a-dpi.o  (491 ms)
  a-get_colorpixel.o  (483 ms)
  a-is_debug_build.o  (478 ms)
  a-strndup.o  (478 ms)
  ...

29221 ms: ../../i3/include/all.h (included 39 times, avg 749 ms), included via:
  i3-resize.o  (946 ms)
  i3-scratchpad.o  (895 ms)
  i3-restore_layout.o  (865 ms)
  i3-handlers.o  (839 ms)
  i3-drag.o  (830 ms)
  i3-config_directives.o  (793 ms)
  ...

5195 ms: /usr/include/xcb/xcb.h (included 79 times, avg 65 ms), included via:
  i3-handlers.o all.h  (113 ms)
  i3-restore_layout.o all.h  (108 ms)
  a-g_utf8_make_valid.o libi3.h  (108 ms)
  i3bar-xcb.o common.h  (105 ms)
  i3-scratchpad.o all.h  (95 ms)
  a-get_colorpixel.o libi3.h  (89 ms)
  ...

4100 ms: /usr/include/math.h (included 41 times, avg 100 ms), included via:
  i3-scratchpad.o all.h  (180 ms)
  i3-fake_outputs.o all.h  (138 ms)
  i3-regex.o all.h  (130 ms)
  i3-restore_layout.o all.h  (128 ms)
  i3-xcb.o all.h  (121 ms)
  i3-move.o all.h  (119 ms)
  ...

4046 ms: ../../i3/i3bar/include/common.h (included 9 times, avg 449 ms), included via:
  i3bar-main.o  (503 ms)
  i3bar-xcb.o  (501 ms)
  i3bar-workspaces.o  (472 ms)
  i3bar-parse_json_header.o  (446 ms)
  i3bar-child.o  (438 ms)
  i3bar-ipc.o  (434 ms)
  ...

2713 ms: ../../i3/include/i3.h (included 41 times, avg 66 ms), included via:
  i3-xcursor.o  (450 ms)
  i3-config_directives.o all.h ipc.h configuration.h  (87 ms)
  i3-config.o all.h ipc.h configuration.h  (71 ms)
  i3-manage.o all.h ipc.h configuration.h  (70 ms)
  i3-window.o all.h ipc.h configuration.h  (68 ms)
  i3-x.o all.h ipc.h configuration.h  (61 ms)
  ...

1492 ms: /usr/include/xcb/xkb.h (included 42 times, avg 35 ms), included via:
  i3-config_directives.o all.h ipc.h configuration.h i3.h  (50 ms)
  i3-config.o all.h ipc.h configuration.h i3.h  (45 ms)
  i3-window.o all.h ipc.h configuration.h i3.h  (43 ms)
  i3-x.o all.h ipc.h configuration.h i3.h  (42 ms)
  i3-manage.o all.h ipc.h configuration.h i3.h  (41 ms)
  i3-config_parser.o all.h ipc.h configuration.h i3.h  (38 ms)
  ...

1432 ms: /usr/include/stdlib.h (included 79 times, avg 18 ms), included via:
  i3-scratchpad.o all.h  (48 ms)
  i3-restore_layout.o all.h  (36 ms)
  i3-regex.o all.h  (32 ms)
  i3-key_press.o all.h  (28 ms)
  i3-commands.o all.h  (28 ms)
  i3-bindings.o all.h  (24 ms)
  ...

1349 ms: /usr/include/pthread.h (included 79 times, avg 17 ms), included via:
  i3bar-xcb.o common.h xcb.h  (33 ms)
  a-ucs2_conversion.o libi3.h xcb.h  (32 ms)
  i3-match.o all.h xcb.h  (27 ms)
  i3-scratchpad.o all.h xcb.h  (25 ms)
  a-g_utf8_make_valid.o libi3.h xcb.h  (25 ms)
  i3_config_wizard-main.o xcb.h  (24 ms)
  ...

1151 ms: /usr/include/X11/Xlib.h (included 45 times, avg 25 ms), included via:
  i3-output.o all.h data.h sn-launcher.h sn-common.h  (50 ms)
  i3-config_parser.o all.h data.h sn-launcher.h sn-common.h  (43 ms)
  i3-x.o all.h data.h sn-launcher.h sn-common.h  (34 ms)
  i3-config_directives.o all.h data.h sn-launcher.h sn-common.h  (32 ms)
  i3_config_wizard-main.o sn-launchee.h sn-common.h  (30 ms)
  i3-drag.o all.h data.h sn-launcher.h sn-common.h  (29 ms)
  ...
```

Timing after:

```
Analyzing build trace from ...
**** Time summary:
Compilation (81 times):
  Parsing (frontend):           47.6 s
  Codegen & opts (backend):      7.6 s

**** Files that took longest to parse (compiler frontend):
  1154 ms: build/src/i3-commands.o
   929 ms: build/src/i3-display_version.o
   852 ms: build/src/i3-bindings.o
   847 ms: build/src/i3-con.o
   806 ms: build/src/i3-ipc.o
   801 ms: build/src/i3-floating.o
   792 ms: build/src/i3-main.o
   792 ms: build/src/i3-drag.o
   792 ms: build/src/i3-window.o
   776 ms: build/src/i3-config_directives.o

**** Files that took longest to codegen (compiler backend):
   885 ms: build/src/i3-commands.o
   422 ms: build/i3bar/src/i3bar-xcb.o
   382 ms: build/src/i3-con.o
   348 ms: build/src/i3-x.o
   288 ms: build/src/i3-ipc.o
   268 ms: build/src/i3-handlers.o
   254 ms: build/src/i3-main.o
   251 ms: build/src/i3-floating.o
   249 ms: build/src/i3-config_parser.o
   194 ms: build/src/i3-randr.o

**** Functions that took longest to compile:
   186 ms: main (../../i3/src/main.c)
    95 ms: manage_window (../../i3/src/manage.c)
    65 ms: floating_check_size (../../i3/src/floating.c)
    63 ms: x_draw_decoration (../../i3/src/x.c)
    58 ms: handle_client_message (../../i3/src/handlers.c)
    55 ms: x_push_node (../../i3/src/x.c)
    54 ms: match_matches_window (../../i3/src/match.c)
    51 ms: parse_config (../../i3/src/config_parser.c)
    49 ms: dump_node (../../i3/src/ipc.c)
    47 ms: reconfig_windows (../../i3/i3bar/src/xcb.c)
    47 ms: config_string_cb (../../i3/i3bar/src/config.c)
    45 ms: GENERATED_call (../../i3/src/config_parser.c)
    45 ms: GENERATED_call (../../i3/src/commands_parser.c)
    43 ms: floating_enable (../../i3/src/floating.c)
    42 ms: handle_configure_request (../../i3/src/handlers.c)
    40 ms: con_swap (../../i3/src/con.c)
    36 ms: main (../../i3/i3-input/main.c)
    36 ms: main (../../i3/i3-msg/main.c)
    36 ms: main (../../i3/i3-nagbar/main.c)
    36 ms: cmd_move_con_to_workspace_number (../../i3/src/commands.c)
    35 ms: json_string (../../i3/src/load_layout.c)
    35 ms: tree_restore (../../i3/src/tree.c)
    35 ms: cmd_swap (../../i3/src/commands.c)
    34 ms: x_push_changes (../../i3/src/x.c)
    32 ms: main (../../i3/i3-config-wizard/main.c)
    32 ms: ewmh_setup_hints (../../i3/src/ewmh.c)
    31 ms: match_parse_property (../../i3/src/match.c)
    30 ms: cmd_mark (../../i3/src/commands.c)
    30 ms: translate_keysyms (../../i3/src/bindings.c)
    30 ms: window_update_normal_hints (../../i3/src/window.c)

**** Function sets that took longest to compile / optimize:

*** Expensive headers:
29596 ms: ../../i3/include/libi3.h (included 78 times, avg 379 ms), included via:
  a-get_config_path.o  (539 ms)
  i3_dump_log-main.o  (522 ms)
  i3_config_wizard-main.o  (501 ms)
  a-fake_configure_notify.o  (500 ms)
  a-root_atom_contents.o  (488 ms)
  i3-display_version.o all.h  (466 ms)
  ...

26054 ms: ../../i3/include/all.h (included 41 times, avg 635 ms), included via:
  i3-display_version.o  (901 ms)
  i3-drag.o  (775 ms)
  i3-ewmh.o  (703 ms)
  i3-startup.o  (693 ms)
  i3-commands.o  (687 ms)
  i3-xcb.o  (680 ms)
  ...

5345 ms: /usr/include/xcb/xcb.h (included 79 times, avg 67 ms), included via:
  i3-display_version.o all.h  (173 ms)
  i3_input-keysym2ucs.o keysym2ucs.h  (106 ms)
  i3-ewmh.o all.h  (106 ms)
  a-fake_configure_notify.o libi3.h  (103 ms)
  a-get_config_path.o libi3.h  (95 ms)
  i3bar-parse_json_header.o common.h  (93 ms)
  ...

4127 ms: ../../i3/i3bar/include/common.h (included 9 times, avg 458 ms), included via:
  i3bar-child.o  (524 ms)
  i3bar-mode.o  (486 ms)
  i3bar-outputs.o  (464 ms)
  i3bar-parse_json_header.o  (463 ms)
  i3bar-config.o  (457 ms)
  i3bar-ipc.o  (448 ms)
  ...

1542 ms: /usr/include/xcb/xkb.h (included 42 times, avg 36 ms), included via:
  i3-con.o all.h ipc.h configuration.h i3.h  (60 ms)
  i3-render.o all.h ipc.h configuration.h i3.h  (56 ms)
  i3-bindings.o all.h ipc.h configuration.h i3.h  (56 ms)
  i3-sighandler.o all.h ipc.h configuration.h i3.h  (48 ms)
  i3-xcb.o all.h ipc.h configuration.h i3.h  (47 ms)
  i3-resize.o all.h ipc.h configuration.h i3.h  (39 ms)
  ...

1456 ms: /usr/include/stdlib.h (included 79 times, avg 18 ms), included via:
  i3-drag.o all.h  (60 ms)
  i3-display_version.o all.h  (55 ms)
  i3-fake_outputs.o all.h  (39 ms)
  i3-config_directives.o all.h  (33 ms)
  i3-xcursor.o all.h  (30 ms)
  i3bar-mode.o common.h libi3.h pango.h pango-attributes.h pango-font.h pango-coverage.h glib-object.h gbinding.h glib.h gasyncqueue.h gthread.h gutils.h  (29 ms)
  ...

1136 ms: /usr/include/X11/Xlib.h (included 44 times, avg 25 ms), included via:
  i3-con.o all.h data.h sn-launcher.h sn-common.h  (35 ms)
  i3-resize.o all.h data.h sn-launcher.h sn-common.h  (34 ms)
  i3-util.o all.h data.h sn-launcher.h sn-common.h  (33 ms)
  i3-assignments.o all.h data.h sn-launcher.h sn-common.h  (33 ms)
  i3-sighandler.o all.h data.h sn-launcher.h sn-common.h  (31 ms)
  i3-xcb.o all.h data.h sn-launcher.h sn-common.h  (31 ms)
  ...

808 ms: /usr/include/stdio.h (included 79 times, avg 10 ms), included via:
  i3-drag.o all.h  (19 ms)
  i3-fake_outputs.o all.h  (18 ms)
  a-font.o libi3.h  (16 ms)
  i3bar-child.o common.h libi3.h  (15 ms)
  a-safewrappers.o libi3.h  (15 ms)
  a-ipc_send_message.o libi3.h  (13 ms)
  ...

770 ms: /usr/include/xcb/randr.h (included 42 times, avg 18 ms), included via:
  i3-click.o all.h data.h  (29 ms)
  i3-commands.o all.h data.h  (27 ms)
  i3-assignments.o all.h data.h  (25 ms)
  i3-xcb.o all.h data.h  (21 ms)
  i3-resize.o all.h data.h  (21 ms)
  i3-sighandler.o all.h data.h  (20 ms)
  ...

688 ms: /usr/include/math.h (included 6 times, avg 114 ms), included via:
  a-dpi.o  (145 ms)
  i3-render.o  (127 ms)
  i3-floating.o  (106 ms)
  a-root_atom_contents.o  (106 ms)
  i3-window.o  (102 ms)
  i3-bindings.o  (99 ms)
  ...
```
---
 i3-config-wizard/main.c     |  1 -
 i3-nagbar/main.c            |  1 +
 include/all.h               | 24 ++++++++----------------
 include/configuration.h     |  3 ---
 include/data.h              |  3 ---
 include/ipc.h               |  1 -
 include/log.h               |  3 ---
 include/shmlog.h            |  1 -
 include/xinerama.h          |  2 --
 src/bindings.c              |  2 ++
 src/display_version.c       |  1 +
 src/floating.c              |  2 ++
 src/ipc.c                   |  2 ++
 src/load_layout.c           |  2 ++
 src/log.c                   |  5 +----
 src/main.c                  |  3 +++
 src/render.c                |  2 ++
 src/sighandler.c            |  1 +
 src/startup.c               |  1 +
 src/util.c                  |  9 ++++++---
 src/window.c                |  2 ++
 src/x.c                     |  2 ++
 src/xcursor.c               |  3 +--
 testcases/inject_randr1.5.c |  2 ++
 24 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
index e857f1b4..9e07d1f7 100644
--- a/i3-config-wizard/main.c
+++ b/i3-config-wizard/main.c
@@ -9,7 +9,6 @@
  *
  */
 #include <config.h>
-#include "libi3.h"
 
 #include "libi3.h"
 
diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c
index be29aa0f..51e5475c 100644
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@@ -9,6 +9,7 @@
  *
  */
 #include <config.h>
+
 #include "libi3.h"
 
 #include <err.h>
diff --git a/include/all.h b/include/all.h
index aa2b5b25..55111944 100644
--- a/include/all.h
+++ b/include/all.h
@@ -15,31 +15,24 @@
 #include <config.h>
 
 #include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdarg.h>
 #include <stdbool.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <locale.h>
-#include <getopt.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <glob.h>
-#include <errno.h>
-#include <err.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <math.h>
-#include <limits.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
-#include <xcb/xcb_keysyms.h>
 #include <xcb/xcb_icccm.h>
+#include <xcb/xcb_keysyms.h>
 
-#include <yajl/yajl_gen.h>
-#include <yajl/yajl_version.h>
-
+#include "libi3.h"
 #include "data.h"
 #include "util.h"
 #include "ipc.h"
@@ -72,7 +65,6 @@
 #include "ewmh.h"
 #include "assignments.h"
 #include "regex.h"
-#include "libi3.h"
 #include "startup.h"
 #include "scratchpad.h"
 #include "commands.h"
diff --git a/include/configuration.h b/include/configuration.h
index d7c2ab8b..eae36057 100644
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -12,9 +12,6 @@
  */
 #pragma once
 
-#include "libi3.h"
-
-#include <stdbool.h>
 #include "queue.h"
 #include "i3.h"
 
diff --git a/include/data.h b/include/data.h
index e686d2c7..494dbe0a 100644
--- a/include/data.h
+++ b/include/data.h
@@ -9,13 +9,10 @@
  */
 #pragma once
 
-#include "libi3.h"
-
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn-launcher.h>
 
 #include <xcb/randr.h>
-#include <stdbool.h>
 #include <pcre.h>
 #include <sys/time.h>
 
diff --git a/include/ipc.h b/include/ipc.h
index 8ea9fd2e..bc5929ec 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -12,7 +12,6 @@
 #include <config.h>
 
 #include <ev.h>
-#include <stdbool.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_parse.h>
 
diff --git a/include/log.h b/include/log.h
index 5c530231..d3c3e3f3 100644
--- a/include/log.h
+++ b/include/log.h
@@ -11,9 +11,6 @@
 
 #include <config.h>
 
-#include <stdarg.h>
-#include <stdbool.h>
-
 /* We will include libi3.h which define its own version of LOG, ELOG.
  * We want *our* version, so we undef the libi3 one. */
 #if defined(LOG)
diff --git a/include/shmlog.h b/include/shmlog.h
index dc8081f1..7b7e133a 100644
--- a/include/shmlog.h
+++ b/include/shmlog.h
@@ -12,7 +12,6 @@
 
 #include <config.h>
 
-#include <stdint.h>
 #if !defined(__OpenBSD__)
 #include <pthread.h>
 #endif
diff --git a/include/xinerama.h b/include/xinerama.h
index f01ee568..52a5db33 100644
--- a/include/xinerama.h
+++ b/include/xinerama.h
@@ -13,8 +13,6 @@
 
 #include <config.h>
 
-#include "data.h"
-
 /**
  * We have just established a connection to the X server and need the initial
  * Xinerama information to setup workspaces for each screen.
diff --git a/src/bindings.c b/src/bindings.c
index 74d70c5c..e29f2c2d 100644
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -8,6 +8,8 @@
  */
 #include "all.h"
 
+#include <math.h>
+
 #include <xkbcommon/xkbcommon-x11.h>
 #include <xkbcommon/xkbcommon.h>
 
diff --git a/src/display_version.c b/src/display_version.c
index 0185d1ed..32250c15 100644
--- a/src/display_version.c
+++ b/src/display_version.c
@@ -12,6 +12,7 @@
 
 #include <fcntl.h>
 #include <time.h>
+#include <unistd.h>
 
 static bool human_readable_key, loaded_config_file_name_key;
 static char *human_readable_version, *loaded_config_file_name;
diff --git a/src/floating.c b/src/floating.c
index 4fed43e4..5e60aa82 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -9,6 +9,8 @@
  */
 #include "all.h"
 
+#include <math.h>
+
 #ifndef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 #endif
diff --git a/src/ipc.c b/src/ipc.c
index 7e62b102..e616a53e 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -14,9 +14,11 @@
 #include <ev.h>
 #include <fcntl.h>
 #include <libgen.h>
+#include <locale.h>
 #include <stdint.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_parse.h>
diff --git a/src/load_layout.c b/src/load_layout.c
index ccf965da..c0be3f26 100644
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -10,6 +10,8 @@
  */
 #include "all.h"
 
+#include <locale.h>
+
 #include <yajl/yajl_parse.h>
 
 /* TODO: refactor the whole parsing thing */
diff --git a/src/log.c b/src/log.c
index 73093da1..326f82b8 100644
--- a/src/log.c
+++ b/src/log.c
@@ -9,11 +9,8 @@
  */
 #include <config.h>
 
-#include "i3.h"
-#include "libi3.h"
-#include "log.h"
+#include "all.h"
 #include "shmlog.h"
-#include "util.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/main.c b/src/main.c
index 95781d0c..4f4c3fd6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,7 +12,9 @@
 
 #include <ev.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <libgen.h>
+#include <locale.h>
 #include <signal.h>
 #include <sys/mman.h>
 #include <sys/resource.h>
@@ -21,6 +23,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #ifdef I3_ASAN_ENABLED
 #include <sanitizer/lsan_interface.h>
diff --git a/src/render.c b/src/render.c
index 40704f52..bf96e4df 100644
--- a/src/render.c
+++ b/src/render.c
@@ -10,6 +10,8 @@
  */
 #include "all.h"
 
+#include <math.h>
+
 /* Forward declarations */
 static int *precalculate_sizes(Con *con, render_params *p);
 static void render_root(Con *con, Con *fullscreen);
diff --git a/src/sighandler.c b/src/sighandler.c
index a55c505b..c1e6094f 100644
--- a/src/sighandler.c
+++ b/src/sighandler.c
@@ -9,6 +9,7 @@
 
 #include <signal.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 typedef struct dialog_t {
     xcb_window_t id;
diff --git a/src/startup.c b/src/startup.c
index 759b373c..9b0576e8 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -16,6 +16,7 @@
 #include <paths.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn-launcher.h>
diff --git a/src/util.c b/src/util.c
index 734018d4..6d8d2ee7 100644
--- a/src/util.c
+++ b/src/util.c
@@ -10,13 +10,16 @@
  */
 #include "all.h"
 
+#include <ctype.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <libgen.h>
+#include <locale.h>
 #include <sys/wait.h>
+#include <unistd.h>
 #if defined(__OpenBSD__)
 #include <sys/cdefs.h>
 #endif
-#include <ctype.h>
-#include <fcntl.h>
-#include <libgen.h>
 
 int min(int a, int b) {
     return (a < b ? a : b);
diff --git a/src/window.c b/src/window.c
index d84f8869..bee3fa66 100644
--- a/src/window.c
+++ b/src/window.c
@@ -9,6 +9,8 @@
  */
 #include "all.h"
 
+#include <math.h>
+
 /*
  * Frees an i3Window and all its members.
  *
diff --git a/src/x.c b/src/x.c
index 712cf89c..e89f5213 100644
--- a/src/x.c
+++ b/src/x.c
@@ -10,6 +10,8 @@
  */
 #include "all.h"
 
+#include <unistd.h>
+
 #ifndef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 #endif
diff --git a/src/xcursor.c b/src/xcursor.c
index 9b4996ea..cb98399f 100644
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -9,8 +9,7 @@
  */
 #include <config.h>
 
-#include "i3.h"
-#include "xcb.h"
+#include "all.h"
 
 #include <assert.h>
 #include <err.h>
diff --git a/testcases/inject_randr1.5.c b/testcases/inject_randr1.5.c
index 0b751228..9c0b73d4 100644
--- a/testcases/inject_randr1.5.c
+++ b/testcases/inject_randr1.5.c
@@ -16,6 +16,7 @@
 
 #include <ev.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <libgen.h>
 #include <sys/mman.h>
 #include <sys/resource.h>
@@ -25,6 +26,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 static void uds_connection_cb(EV_P_ ev_io *w, int revents);
 static void read_client_setup_request_cb(EV_P_ ev_io *w, int revents);