13 files changed, 18 insertions, 1 deletions
diff --git a/src/nvim/os/channel.c b/src/nvim/os/channel.c
index 9bba247a7b..14293d71e5 100644
--- a/src/nvim/os/channel.c
+++ b/src/nvim/os/channel.c
@@ -1,4 +1,6 @@
+#include <stdbool.h>
 #include <string.h>
+#include <inttypes.h>
 
 #include <uv.h>
 #include <msgpack.h>
diff --git a/src/nvim/os/dl.c b/src/nvim/os/dl.c
index 980998eb40..e7a957a3aa 100644
--- a/src/nvim/os/dl.c
+++ b/src/nvim/os/dl.c
@@ -1,5 +1,6 @@
 /// Functions for using external native libraries
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <uv.h>
 
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index b87d561fa6..3e66a019b3 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -2,6 +2,7 @@
 
 #include <uv.h>
 
+#include "nvim/ascii.h"
 #include "nvim/os/os.h"
 #include "nvim/misc2.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/os/event.c b/src/nvim/os/event.c
index a8bd6ca886..a9e97c9190 100644
--- a/src/nvim/os/event.c
+++ b/src/nvim/os/event.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 65b88c06f4..5ccefd8ac5 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -1,6 +1,10 @@
 // fs.c -- filesystem access
+#include <stdbool.h>
+
+#include <assert.h>
 
 #include "nvim/os/os.h"
+#include "nvim/ascii.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 0f6d2df12f..504aeafbc1 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -8,6 +8,7 @@
 #include "nvim/os/event.h"
 #include "nvim/os/rstream_defs.h"
 #include "nvim/os/rstream.h"
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/ui.h"
 #include "nvim/fileio.h"
diff --git a/src/nvim/os/rstream.c b/src/nvim/os/rstream.c
index 81714f7bae..5286599586 100644
--- a/src/nvim/os/rstream.c
+++ b/src/nvim/os/rstream.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -9,6 +10,7 @@
 #include "nvim/os/rstream.h"
 #include "nvim/os/event_defs.h"
 #include "nvim/os/event.h"
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/memory.h"
 #include "nvim/log.h"
diff --git a/src/nvim/os/server.c b/src/nvim/os/server.c
index 4bbe81ad01..6e77c6b334 100644
--- a/src/nvim/os/server.c
+++ b/src/nvim/os/server.c
@@ -8,6 +8,7 @@
 #include "nvim/os/channel.h"
 #include "nvim/os/server.h"
 #include "nvim/os/os.h"
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index ed842ba8b2..68cd2ad527 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -4,12 +4,12 @@
 
 #include <uv.h>
 
+#include "nvim/ascii.h"
 #include "nvim/os/shell.h"
 #include "nvim/os/signal.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"
 #include "nvim/message.h"
-#include "nvim/ascii.h"
 #include "nvim/memory.h"
 #include "nvim/term.h"
 #include "nvim/misc2.h"
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index cfdc8821a4..c7b4f86d6f 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -3,6 +3,7 @@
 #include <uv.h>
 
 #include "nvim/types.h"
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/globals.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/os/users.c b/src/nvim/os/users.c
index b6c013fa59..99479b0bae 100644
--- a/src/nvim/os/users.c
+++ b/src/nvim/os/users.c
@@ -2,6 +2,7 @@
 
 #include <uv.h>
 
+#include "nvim/ascii.h"
 #include "nvim/os/os.h"
 #include "nvim/garray.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/os/uv_helpers.c b/src/nvim/os/uv_helpers.c
index a3c9dd5fbf..89687bdac7 100644
--- a/src/nvim/os/uv_helpers.c
+++ b/src/nvim/os/uv_helpers.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <uv.h>
 
 #include "nvim/os/uv_helpers.h"
diff --git a/src/nvim/os/wstream.c b/src/nvim/os/wstream.c
index 13b8e8d9dc..3c4b5b6171 100644
--- a/src/nvim/os/wstream.c
+++ b/src/nvim/os/wstream.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>