18 files changed, 19 insertions, 2 deletions
diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua
index d37a85abe8..7f80d48114 100644
--- a/scripts/msgpack-gen.lua
+++ b/scripts/msgpack-gen.lua
@@ -88,6 +88,7 @@ output = io.open(outputf, 'wb')
 output:write([[
 #include <stdbool.h>
 #include <stdint.h>
+#include <assert.h>
 #include <msgpack.h>
 
 #include "nvim/os/msgpack_rpc.h"
diff --git a/src/nvim/api/private/handle.c b/src/nvim/api/private/handle.c
index 035162c5f6..4c0b01ddd7 100644
--- a/src/nvim/api/private/handle.c
+++ b/src/nvim/api/private/handle.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdint.h>
 
 #include "nvim/vim.h"
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index b10e70f7b4..839a06c29f 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 044e59befa..03b9257d79 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index 5306acd228..3e1e7c1870 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -2,6 +2,7 @@
 ///
 /// Code related to character sets.
 
+#include <assert.h>
 #include <string.h>
 #include <wctype.h>
 #include <wchar.h>  // for towupper() and towlower()
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 2a1bd7ed56..b9665fd4c6 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -10,9 +10,10 @@
  * edit.c: functions for Insert mode
  */
 
+#include <assert.h>
+#include <string.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include <string.h>
 
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c
index 4eb1b6275f..5b0dc508fa 100644
--- a/src/nvim/hashtab.c
+++ b/src/nvim/hashtab.c
@@ -18,6 +18,7 @@
 /// of the entries is empty to keep the lookup efficient (at the cost of extra
 /// memory).
 
+#include <assert.h>
 #include <stdbool.h>
 #include <string.h>
 #include <inttypes.h>
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index 6e93441caf..48b123ed59 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -9,6 +9,7 @@
  */
 #include <stdbool.h>
 
+#include <assert.h>
 #include <inttypes.h>
 
 #include "nvim/vim.h"
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index a077e60d07..158f1f9b48 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -10,6 +10,7 @@
  * mark.c: functions for setting marks and jumping to them
  */
 
+#include <assert.h>
 #include <inttypes.h>
 #include <string.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 da89b41902..5ccefd8ac5 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -1,6 +1,8 @@
 // fs.c -- filesystem access
 #include <stdbool.h>
 
+#include <assert.h>
+
 #include "nvim/os/os.h"
 #include "nvim/ascii.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/os/rstream.c b/src/nvim/os/rstream.c
index 04687cbe9a..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>
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>
 
diff --git a/src/nvim/path.c b/src/nvim/path.c
index ab51facd62..77728a304e 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index ac549fe4ae..5beb348af1 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -10,6 +10,7 @@
  * syntax.c: code for syntax highlighting
  */
 
+#include <assert.h>
 #include <inttypes.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index a99cf6275b..0959f87288 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -94,7 +94,6 @@ typedef uint32_t u8char_T;
 
 #include <errno.h>
 
-#include <assert.h>
 
 #include <stdarg.h>
 
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 8da12fa382..df4a3f2614 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6,6 +6,7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
+#include <assert.h>
 #include <inttypes.h>
 
 #include "nvim/api/private/handle.h"