refactor: remove some unused includes (#19740)

Mostly avoids including eval.h, ex_cmds2.h and ex_docmd.h in other
headers.

34 files changed, 34 insertions, 24 deletions

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 2842f3a43b..2622f4bb81 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -27,7 +27,6 @@
 #include "nvim/eval.h"
 #include "nvim/eval/typval.h"
 #include "nvim/eval/userfunc.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
@@ -54,6 +53,7 @@
 #include "nvim/os/input.h"
 #include "nvim/os/process.h"
 #include "nvim/popupmnu.h"
+#include "nvim/runtime.h"
 #include "nvim/screen.h"
 #include "nvim/state.h"
 #include "nvim/types.h"
diff --git a/src/nvim/api/vimscript.c b/src/nvim/api/vimscript.c
index 478e146781..3b25e3aa38 100644
--- a/src/nvim/api/vimscript.c
+++ b/src/nvim/api/vimscript.c
@@ -14,8 +14,9 @@
 #include "nvim/eval.h"
 #include "nvim/eval/typval.h"
 #include "nvim/eval/userfunc.h"
-#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
 #include "nvim/ops.h"
+#include "nvim/runtime.h"
 #include "nvim/strings.h"
 #include "nvim/vim.h"
 #include "nvim/viml/parser/expressions.h"
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index b452eb227e..70dda8eaec 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -1,7 +1,8 @@
 #ifndef NVIM_BUFFER_H
 #define NVIM_BUFFER_H
 
-#include "nvim/eval.h"
+#include "nvim/eval/typval.h"
+#include "nvim/ex_cmds_defs.h"
 #include "nvim/func_attr.h"
 #include "nvim/macros.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 733b3d3d5d..c4e5f25719 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -13,7 +13,6 @@
 #include "nvim/charset.h"
 #include "nvim/digraph.h"
 #include "nvim/eval/typval.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_getln.h"
 #include "nvim/garray.h"
@@ -24,6 +23,7 @@
 #include "nvim/message.h"
 #include "nvim/normal.h"
 #include "nvim/os/input.h"
+#include "nvim/runtime.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 64a4a92ab7..d377840c77 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -30,6 +30,7 @@
 #include "nvim/eval/userfunc.h"
 #include "nvim/eval/vars.h"
 #include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
 #include "nvim/ex_getln.h"
 #include "nvim/ex_session.h"
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 0ee44d59a9..3a69e40acb 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -12,7 +12,6 @@
 #include "nvim/eval/funcs.h"
 #include "nvim/eval/userfunc.h"
 #include "nvim/eval/vars.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
 #include "nvim/ex_getln.h"
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index baf8ce598b..d164d5d0b3 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -20,9 +20,11 @@
 #include "nvim/buffer.h"
 #include "nvim/change.h"
 #include "nvim/charset.h"
+#include "nvim/eval.h"
 #include "nvim/eval/vars.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
 #include "nvim/ex_getln.h"
 #include "nvim/fileio.h"
@@ -40,6 +42,7 @@
 #include "nvim/path.h"
 #include "nvim/quickfix.h"
 #include "nvim/regexp.h"
+#include "nvim/runtime.h"
 #include "nvim/strings.h"
 #include "nvim/undo.h"
 #include "nvim/version.h"
diff --git a/src/nvim/ex_cmds2.h b/src/nvim/ex_cmds2.h
index 95433fde90..e454a30028 100644
--- a/src/nvim/ex_cmds2.h
+++ b/src/nvim/ex_cmds2.h
@@ -3,8 +3,7 @@
 
 #include <stdbool.h>
 
-#include "nvim/ex_docmd.h"
-#include "nvim/runtime.h"
+#include "nvim/ex_cmds_defs.h"
 
 //
 // flags for check_changed()
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index 4e50a51a8a..9e029aa68a 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -16,12 +16,12 @@
 #include "nvim/debugger.h"
 #include "nvim/eval.h"
 #include "nvim/eval/userfunc.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/regexp.h"
+#include "nvim/runtime.h"
 #include "nvim/strings.h"
 #include "nvim/vim.h"
 
diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c
index 1d670afa6d..9ffe0e1f7f 100644
--- a/src/nvim/ex_session.c
+++ b/src/nvim/ex_session.c
@@ -18,7 +18,6 @@
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
 #include "nvim/eval.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_getln.h"
 #include "nvim/ex_session.h"
@@ -34,6 +33,7 @@
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
+#include "nvim/runtime.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
 
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 24bc7358e7..bc76e3225e 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -19,6 +19,7 @@
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
 #include "nvim/edit.h"
+#include "nvim/eval.h"
 #include "nvim/eval/typval.h"
 #include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds.h"
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 2b2889d4d6..bc2c440bb1 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -16,6 +16,7 @@
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
+#include "nvim/eval.h"
 #include "nvim/event/loop.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_getln.h"
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 14fb1111d9..0be45ec9ae 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -17,7 +17,6 @@
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/fileio.h"
 #include "nvim/garray.h"
@@ -31,6 +30,7 @@
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
+#include "nvim/runtime.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c
index 5afbaaf121..42db85b3eb 100644
--- a/src/nvim/highlight_group.c
+++ b/src/nvim/highlight_group.c
@@ -9,7 +9,9 @@
 #include "nvim/autocmd.h"
 #include "nvim/charset.h"
 #include "nvim/cursor_shape.h"
+#include "nvim/eval.h"
 #include "nvim/eval/vars.h"
+#include "nvim/ex_docmd.h"
 #include "nvim/fold.h"
 #include "nvim/highlight.h"
 #include "nvim/highlight_group.h"
diff --git a/src/nvim/highlight_group.h b/src/nvim/highlight_group.h
index 1474588889..bf6bad1a86 100644
--- a/src/nvim/highlight_group.h
+++ b/src/nvim/highlight_group.h
@@ -1,7 +1,8 @@
 #ifndef NVIM_HIGHLIGHT_GROUP_H
 #define NVIM_HIGHLIGHT_GROUP_H
 
-#include "nvim/eval.h"
+#include "nvim/api/private/helpers.h"
+#include "nvim/highlight_defs.h"
 #include "nvim/types.h"
 
 #define MAX_HL_ID 20000   // maximum value for a highlight ID.
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index 1a4bd2ec47..d8b7d7824e 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -20,6 +20,7 @@
 #include "nvim/ascii.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
+#include "nvim/eval.h"
 #include "nvim/event/stream.h"
 #include "nvim/ex_eval.h"
 #include "nvim/fileio.h"
diff --git a/src/nvim/lua/converter.h b/src/nvim/lua/converter.h
index 1c9e60e4b2..f6a85900ba 100644
--- a/src/nvim/lua/converter.h
+++ b/src/nvim/lua/converter.h
@@ -6,7 +6,7 @@
 #include <stdint.h>
 
 #include "nvim/api/private/defs.h"
-#include "nvim/eval.h"
+#include "nvim/eval/typval.h"
 #include "nvim/func_attr.h"
 
 typedef struct {
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index c7b654482c..2ce564c011 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -15,12 +15,12 @@
 #include "nvim/buffer_defs.h"
 #include "nvim/change.h"
 #include "nvim/cursor.h"
+#include "nvim/eval.h"
 #include "nvim/eval/funcs.h"
 #include "nvim/eval/typval.h"
 #include "nvim/eval/userfunc.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/time.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_getln.h"
 #include "nvim/extmark.h"
 #include "nvim/func_attr.h"
diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c
index f9592919ea..5a82ae30b5 100644
--- a/src/nvim/lua/stdlib.c
+++ b/src/nvim/lua/stdlib.c
@@ -16,10 +16,10 @@
 #include "nvim/buffer_defs.h"
 #include "nvim/change.h"
 #include "nvim/cursor.h"
+#include "nvim/eval.h"
 #include "nvim/eval/userfunc.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/time.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_eval.h"
 #include "nvim/ex_getln.h"
 #include "nvim/extmark.h"
diff --git a/src/nvim/match.c b/src/nvim/match.c
index 291f7ab696..f085d7cdb4 100644
--- a/src/nvim/match.c
+++ b/src/nvim/match.c
@@ -7,7 +7,9 @@
 
 #include "nvim/buffer_defs.h"
 #include "nvim/charset.h"
+#include "nvim/eval.h"
 #include "nvim/eval/funcs.h"
+#include "nvim/ex_docmd.h"
 #include "nvim/fold.h"
 #include "nvim/highlight_group.h"
 #include "nvim/match.h"
@@ -16,6 +18,7 @@
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"
 #include "nvim/screen.h"
+#include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "match.c.generated.h"
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 0c54a8a02c..b293841bb0 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -23,6 +23,7 @@
 #include "nvim/diff.h"
 #include "nvim/digraph.h"
 #include "nvim/edit.h"
+#include "nvim/eval.h"
 #include "nvim/eval/userfunc.h"
 #include "nvim/event/loop.h"
 #include "nvim/ex_cmds.h"
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index da3f68edc7..8745ef8b37 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -10,7 +10,6 @@
 #include "nvim/ascii.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/rstream.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/fileio.h"
 #include "nvim/getchar.h"
 #include "nvim/keycodes.h"
diff --git a/src/nvim/profile.c b/src/nvim/profile.c
index a77680c9f2..b05ba0d8f8 100644
--- a/src/nvim/profile.c
+++ b/src/nvim/profile.c
@@ -10,7 +10,6 @@
 #include "nvim/debugger.h"
 #include "nvim/eval.h"
 #include "nvim/eval/userfunc.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/fileio.h"
 #include "nvim/func_attr.h"
 #include "nvim/globals.h"  // for the global `time_fd` (startuptime)
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 460ffe3bb1..4d0bf03d8b 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -20,7 +20,6 @@
 #include "nvim/charset.h"
 #include "nvim/eval.h"
 #include "nvim/eval/userfunc.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/garray.h"
 #include "nvim/mark.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c
index 6c3f07abb1..89848b43bd 100644
--- a/src/nvim/runtime.c
+++ b/src/nvim/runtime.c
@@ -14,6 +14,7 @@
 #include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
 #include "nvim/ex_getln.h"
 #include "nvim/lua/executor.h"
diff --git a/src/nvim/runtime.h b/src/nvim/runtime.h
index d715dcdf30..fb12029693 100644
--- a/src/nvim/runtime.h
+++ b/src/nvim/runtime.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "nvim/ex_docmd.h"
+#include "nvim/ex_cmds_defs.h"
 
 typedef struct scriptitem_S {
   char_u *sn_name;
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 0805a11d9f..bbbe985dcd 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -81,7 +81,6 @@
 #include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/ex_cmds.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_getln.h"
 #include "nvim/extmark.h"
 #include "nvim/fileio.h"
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 71e818f16a..94ec26e709 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -21,7 +21,7 @@
 #include "nvim/eval.h"
 #include "nvim/eval/funcs.h"
 #include "nvim/ex_cmds.h"
-#include "nvim/ex_cmds2.h"
+#include "nvim/ex_docmd.h"
 #include "nvim/ex_getln.h"
 #include "nvim/fileio.h"
 #include "nvim/fold.h"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 09a73f31bb..17e677c6b7 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -87,7 +87,6 @@
 #include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/ex_cmds.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/fileio.h"
 #include "nvim/func_attr.h"
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 6a10c701c5..16bf5c223d 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -19,7 +19,6 @@
 #include "nvim/cursor_shape.h"
 #include "nvim/eval.h"
 #include "nvim/eval/vars.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/fileio.h"
 #include "nvim/fold.h"
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 93610e6bed..aa68cbf0b0 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -17,7 +17,6 @@
 #include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/ex_cmds.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_getln.h"
 #include "nvim/file_search.h"
@@ -40,6 +39,7 @@
 #include "nvim/path.h"
 #include "nvim/quickfix.h"
 #include "nvim/regexp.h"
+#include "nvim/runtime.h"
 #include "nvim/screen.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index ad3f44c2e9..8a612294d0 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -48,6 +48,7 @@
 #include "nvim/change.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
+#include "nvim/eval.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/time.h"
 #include "nvim/ex_cmds.h"
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 4fcfee1192..2cbdeb318b 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -14,7 +14,6 @@
 #include "nvim/cursor_shape.h"
 #include "nvim/diff.h"
 #include "nvim/event/loop.h"
-#include "nvim/ex_cmds2.h"
 #include "nvim/ex_getln.h"
 #include "nvim/fold.h"
 #include "nvim/garray.h"
diff --git a/src/nvim/usercmd.c b/src/nvim/usercmd.c
index ed54315ffe..bf5faf7bc9 100644
--- a/src/nvim/usercmd.c
+++ b/src/nvim/usercmd.c
@@ -12,6 +12,7 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/ascii.h"
 #include "nvim/charset.h"
+#include "nvim/eval.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/garray.h"
 #include "nvim/lua/executor.h"