Merge #921 'Remove includes vim.h'

78 files changed, 236 insertions, 70 deletions

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 034ced184a..913491c6ca 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -1,5 +1,6 @@
 // Much of this code was adapted from 'if_py_both.h' from the original
 // vim source
+#include <errno.h>
 #include <stdint.h>
 #include <stdlib.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 024f0c2405..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>
@@ -5,6 +6,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..03b9257d79 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -1,9 +1,11 @@
+#include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #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 +14,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 44f3d2ea63..a34d2d03da 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -24,9 +24,13 @@
  * The current implementation remembers all file names ever used.
  */
 
+#include <stdbool.h>
+#include <errno.h>
 #include <string.h>
+#include <inttypes.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..3e1e7c1870 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -2,11 +2,14 @@
 ///
 /// Code related to character sets.
 
+#include <assert.h>
 #include <string.h>
 #include <wctype.h>
 #include <wchar.h>  // for towupper() and towlower()
+#include <inttypes.h>
 
 #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..64a3b73f15 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -1,4 +1,5 @@
 #include <stdbool.h>
+#include <inttypes.h>
 
 #include "nvim/cursor.h"
 #include "nvim/charset.h"
@@ -9,6 +10,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 1cea6e759e..20b40a7864 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -2,7 +2,12 @@
 ///
 /// Code for diff'ing two, three or four buffers.
 
+#include <errno.h>
+#include <inttypes.h>
+#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..784a97de73 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -2,7 +2,10 @@
 ///
 /// code for digraphs
 
+#include <inttypes.h>
+
 #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 a70982150c..8cfaddde86 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -10,9 +10,14 @@
  * edit.c: functions for Insert mode
  */
 
+#include <assert.h>
+#include <errno.h>
 #include <string.h>
+#include <inttypes.h>
+#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 05553088d9..973088a806 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -10,10 +10,19 @@
  * eval.c: Expression evaluation.
  */
 
+#include <errno.h>
+#include <inttypes.h>
+#include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <math.h>
+
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #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..fe0e14adb6 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -10,10 +10,13 @@
  * ex_cmds.c: some functions for command line commands
  */
 
+#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <inttypes.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 7a34aba6b9..e3024f6fb0 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -10,9 +10,16 @@
  * ex_cmds2.c: some more functions for command line commands
  */
 
+#include <errno.h>
+#include <inttypes.h>
+#include <stdbool.h>
 #include <string.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #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 aa6e68dd4b..a82623691e 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -11,8 +11,12 @@
  */
 
 #include <string.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <inttypes.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 5122e61c82..3e1672c2e7 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -9,8 +9,12 @@
 /*
  * ex_eval.c: functions for Ex command line for the +eval feature.
  */
+#include <stdbool.h>
+
+#include <inttypes.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..3447731134 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -10,10 +10,13 @@
  * ex_getln.c: Functions for entering and editing an Ex command line.
  */
 
+#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <inttypes.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 6694630337..845a99acad 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -44,9 +44,13 @@
  *	functions.
  */
 
+#include <errno.h>
 #include <string.h>
+#include <stdbool.h>
+#include <inttypes.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 b87b606f98..f4d4005fa8 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -10,9 +10,13 @@
  * fileio.c: read from and write to a file
  */
 
+#include <errno.h>
+#include <stdbool.h>
 #include <string.h>
+#include <inttypes.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..f65bbc0875 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -12,8 +12,10 @@
  */
 
 #include <string.h>
+#include <inttypes.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/garray.c b/src/nvim/garray.c
index 2cef08ef5f..033ea9baac 100644
--- a/src/nvim/garray.c
+++ b/src/nvim/garray.c
@@ -3,6 +3,7 @@
 /// Functions for handling growing arrays.
 
 #include <string.h>
+#include <inttypes.h>
 
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index b169899cea..e8ce624e25 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -15,9 +15,12 @@
  * mappings and abbreviations
  */
 
+#include <stdbool.h>
 #include <string.h>
+#include <inttypes.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/globals.h b/src/nvim/globals.h
index ceb0953d14..06d39494db 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -8,8 +8,6 @@
 #ifndef NVIM_GLOBALS_H
 #define NVIM_GLOBALS_H
 
-#include <stdbool.h>
-
 #include "nvim/ex_eval.h"
 #include "nvim/mbyte.h"
 #include "nvim/menu.h"
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 8db4c264b2..e67cb67c69 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -10,9 +10,15 @@
  * hardcopy.c: printing to paper
  */
 
+#include <errno.h>
 #include <string.h>
+#include <inttypes.h>
 
 #include "nvim/vim.h"
+#include "nvim/ascii.h"
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 #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..5b0dc508fa 100644
--- a/src/nvim/hashtab.c
+++ b/src/nvim/hashtab.c
@@ -18,10 +18,13 @@
 /// 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>
 
 #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 94fbc15ede..9ce0eb7fa0 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -7,8 +7,14 @@
  *
  * See README.txt for an overview of the Vim source code.
  */
+#include <stdbool.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <inttypes.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..cd53194816 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -1,3 +1,6 @@
+#include <inttypes.h>
+
+#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..6e12194b63 100644
--- a/src/nvim/indent_c.c
+++ b/