move ascii.h include out of vim.h

65 files changed, 64 insertions, 3 deletions

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 024f0c2405..b10e70f7b4 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -5,6 +5,7 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/handle.h"
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/buffer.h"
 #include "nvim/window.h"
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 0a5dfdf337..044e59befa 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -4,6 +4,7 @@
 #include <string.h>
 
 #include "nvim/api/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/buffer.h"
@@ -12,7 +13,6 @@
 #include "nvim/buffer.h"
 #include "nvim/window.h"
 #include "nvim/types.h"
-#include "nvim/ascii.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/screen.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/arabic.c b/src/nvim/arabic.c
index 4e2993dcb5..47f6f8d399 100644
--- a/src/nvim/arabic.c
+++ b/src/nvim/arabic.c
@@ -11,6 +11,7 @@
 /// Stand-Alone - unicode form-B isolated char denoted with  a_s_* (NOT USED)
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/arabic.h"
 
 // Arabic ISO-10646-1 character set definition
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 5a8bc92d87..955676672a 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "nvim/api/private/handle.h"
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index 549c926763..e51eb3796b 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -7,6 +7,7 @@
 #include <wchar.h>  // for towupper() and towlower()
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/charset.h"
 #include "nvim/farsi.h"
 #include "nvim/func_attr.h"
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index 18e95f0741..10a31c42bf 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -9,6 +9,7 @@
 #include "nvim/move.h"
 #include "nvim/screen.h"
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "cursor.c.generated.h"
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index a36f04ce8f..9992fbdfcf 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -1,4 +1,5 @@
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/cursor_shape.h"
 #include "nvim/misc2.h"
 #include "nvim/ex_getln.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index f861c8ca1c..2e751aafaf 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/diff.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index ffa2501235..204f64d311 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -3,6 +3,7 @@
 /// code for digraphs
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/digraph.h"
 #include "nvim/charset.h"
 #include "nvim/ex_cmds2.h"
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 11b0c2bc8f..ed00b49970 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/edit.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 0ce0cfb014..da14a97e04 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -16,6 +16,7 @@
 #include <math.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/eval.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 70ac80faf8..3eddebdf51 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/version_defs.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index c1f12071d8..cada3c5818 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/version_defs.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index ba4da812bd..7bdacc5915 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index ed17d2e3d4..933b17d917 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/ex_eval.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 90430b3f6b..b8c8fa2f4a 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/arabic.h"
 #include "nvim/ex_getln.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/farsi.c b/src/nvim/farsi.c
index bc25d0535a..13a284e926 100644
--- a/src/nvim/farsi.c
+++ b/src/nvim/farsi.c
@@ -18,6 +18,7 @@
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 
 
 #define SRC_EDT 0
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 8c9a7d6b5f..84ca1c2fed 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -48,6 +48,7 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/file_search.h"
 #include "nvim/charset.h"
 #include "nvim/fileio.h"
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index aa2079ddc1..13bbfec994 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/fileio.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 44c67ee8ca..5993a7e3ee 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/fold.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 41b8f56250..5ce603baf4 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/getchar.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 8db4c264b2..bc81a4b428 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/version_defs.h"
 #include "nvim/hardcopy.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c
index 85cd59f59f..35599cccaf 100644
--- a/src/nvim/hashtab.c
+++ b/src/nvim/hashtab.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/hashtab.h"
 #include "nvim/message.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index aef104abf9..a553c2fd3b 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -10,6 +10,7 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/if_cscope.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index 91fc1588cc..1de98a8c8e 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -1,3 +1,4 @@
+#include "nvim/ascii.h"
 #include "nvim/indent.h"
 #include "nvim/eval.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c
index 605cb5457c..a72b62c8de 100644
--- a/src/nvim/indent_c.c
+++ b/src/nvim/indent_c.c
@@ -1,4 +1,5 @@
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/misc1.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index 8b4015b97c..49d8781d61 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -4,6 +4,7 @@
  */
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/keymap.h"
 #include "nvim/charset.h"
 #include "nvim/edit.h"
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 8855d14073..f24c0dab4d 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/main.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 43cc3218af..96c7615674 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/mark.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 96ea9b3fe1..5b93ecf13f 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -80,6 +80,7 @@
 # include <wchar.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/mbyte.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c
index c681d0d43c..59c8424c9b 100644
--- a/src/nvim/memfile.c
+++ b/src/nvim/memfile.c
@@ -34,6 +34,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/memfile.h"
 #include "nvim/fileio.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 1878d78454..99a440cd9e 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/memline.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index ab5c1569dc..225e48e633 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/menu.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
diff --git a/src/nvim/message.c b/src/nvim/message.c
index c6fe6ac72b..fd62e670b0 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -17,6 +17,7 @@
 #include <math.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/message.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 16ace76e0a..ad24acb108 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/version_defs.h"
 #include "nvim/misc1.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c
index 680dff394f..632f740a1f 100644
--- a/src/nvim/misc2.c
+++ b/src/nvim/misc2.c
@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/misc2.h"
 #include "nvim/file_search.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/move.c b/src/nvim/move.c
index 991b09794f..cb146b6e2a 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -17,6 +17,7 @@
  */
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/move.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 25b56c4d84..ba25ff013e 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/normal.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 8fcad1ba0a..1d90220ab6 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -15,6 +15,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/ops.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 205d6e412f..22ed0e39ab 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -37,6 +37,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/option.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.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/fs.c b/src/nvim/os/fs.c
index 677fae801b..da89b41902 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -2,6 +2,7 @@
 #include <stdbool.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..04687cbe9a 100644
--- a/src/nvim/os/rstream.c
+++ b/src/nvim/os/rstream.c
@@ -9,6 +9,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_unix.c b/src/nvim/os_unix.c
index 6c4a5cbb3b..c8a778a03f 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -30,6 +30,7 @@
 
 #include "nvim/api/private/handle.h"
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/os_unix.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/path.c b/src/nvim/path.c
index f18c217574..17440ec68f 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/path.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 4ff1132ab9..6bd8a5a77b 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -3,6 +3,7 @@
 /// Popup menu (PUM)
 //
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/popupmnu.h"
 #include "nvim/charset.h"
 #include "nvim/ex_cmds.h"
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 87329a7e02..0062292b4d 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/quickfix.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 1c165051b4..585cdb901e 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -47,6 +47,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/regexp.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index dd82b23cbd..1b88d3e1d4 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -6,6 +6,7 @@
 
 #include <stdbool.h>
 
+#include "nvim/ascii.h"
 #include "nvim/misc2.h"
 #include "nvim/garray.h"
 
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index afef26fdf0..565fbae80b 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -90,6 +90,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/arabic.h"
 #include "nvim/screen.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 9b975bfd54..d4508457d4 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -11,6 +11,7 @@
 
 #include <string.h>
 
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/search.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 9a60bb591d..789c509b17 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -288,6 +288,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/spell.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index b6ba54857d..9dcddc8805 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -2,6 +2,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/strings.h"
 #include "nvim/misc2.h"
 #include "nvim/file_search.h"
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 76edccfefa..14dc7d2c9c 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/syntax.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 8d229caf1b..6bfd1ded90 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/tag.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/term.c b/src/nvim/term.c
index 9c655f112a..6c173f83ce 100644
--- a/src/nvim/term.c
+++ b/src/nvim/term.c
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/term.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 5969f2dc7c..a34ab90513 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -83,6 +83,7 @@
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/undo.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b76deb94d5..c9a1c09d5b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -11,6 +11,7 @@
 /// interesting.
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/version.h"
 #include "nvim/charset.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index ada9e04134..3a848f4f26 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -92,7 +92,6 @@ typedef uint16_t u8char_T;
 typedef uint32_t u8char_T;
 # endif
 
-#include "nvim/ascii.h"
 #include "nvim/keymap.h"
 #include "nvim/term_defs.h"
 #include "nvim/macros.h"
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 994d576469..861123696d 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -8,6 +8,7 @@
 
 #include "nvim/api/private/handle.h"
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
 #include "nvim/window.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"