refactor: remove typval.h from most header files (#23601)

Because typval_defs.h is enough for most of them.

32 files changed, 20 insertions, 35 deletions

diff --git a/src/nvim/api/private/converter.h b/src/nvim/api/private/converter.h
index 80ee640295..28ae71983b 100644
--- a/src/nvim/api/private/converter.h
+++ b/src/nvim/api/private/converter.h
@@ -2,7 +2,7 @@
 #define NVIM_API_PRIVATE_CONVERTER_H
 
 #include "nvim/api/private/defs.h"
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/private/converter.h.generated.h"
diff --git a/src/nvim/arglist.h b/src/nvim/arglist.h
index b2e0f411d4..cd34ca10c4 100644
--- a/src/nvim/arglist.h
+++ b/src/nvim/arglist.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_ARGLIST_H
 #define NVIM_ARGLIST_H
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index ce8ee21882..f8b26d9d16 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -17,7 +17,7 @@ typedef struct {
 
 #include "klib/kvec.h"
 #include "nvim/api/private/defs.h"
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/garray.h"
 #include "nvim/grid_defs.h"
 #include "nvim/hashtab.h"
diff --git a/src/nvim/channel.h b/src/nvim/channel.h
index ca6c75b411..7400465af0 100644
--- a/src/nvim/channel.h
+++ b/src/nvim/channel.h
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/event/libuv_process.h"
 #include "nvim/event/multiqueue.h"
diff --git a/src/nvim/charset.h b/src/nvim/charset.h
index f98ed94b87..258e95bec0 100644
--- a/src/nvim/charset.h
+++ b/src/nvim/charset.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/option_defs.h"
 #include "nvim/pos.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/cmdexpand.h b/src/nvim/cmdexpand.h
index 810e289f7c..32c23c5d66 100644
--- a/src/nvim/cmdexpand.h
+++ b/src/nvim/cmdexpand.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_CMDEXPAND_H
 #define NVIM_CMDEXPAND_H
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/ex_getln.h"
 #include "nvim/garray.h"
 #include "nvim/types.h"
diff --git a/src/nvim/cmdhist.h b/src/nvim/cmdhist.h
index f86a2f855c..a0f2ab6934 100644
--- a/src/nvim/cmdhist.h
+++ b/src/nvim/cmdhist.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_CMDHIST_H
 #define NVIM_CMDHIST_H
 
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/eval/decode.h b/src/nvim/eval/decode.h
index f1be5a1f69..7455130221 100644
--- a/src/nvim/eval/decode.h
+++ b/src/nvim/eval/decode.h
@@ -4,8 +4,8 @@
 #include <msgpack.h>
 #include <stddef.h>
 
-#include "nvim/eval/typval.h"
-#include "nvim/globals.h"
+#include "nvim/eval/typval_defs.h"
+#include "nvim/types.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/decode.h.generated.h"
diff --git a/src/nvim/eval/executor.h b/src/nvim/eval/executor.h
index 42abf77f4a..e8bf147245 100644
--- a/src/nvim/eval/executor.h
+++ b/src/nvim/eval/executor.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_EVAL_EXECUTOR_H
 #define NVIM_EVAL_EXECUTOR_H
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 
 extern char *e_list_index_out_of_range_nr;
 
diff --git a/src/nvim/eval/funcs.h b/src/nvim/eval/funcs.h
index 1ae031a952..65a95196de 100644
--- a/src/nvim/eval/funcs.h
+++ b/src/nvim/eval/funcs.h
@@ -6,7 +6,6 @@
 
 #include "nvim/api/private/dispatch.h"
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/types.h"
 
diff --git a/src/nvim/eval/gc.h b/src/nvim/eval/gc.h
index 3185750c3b..66e959ced5 100644
--- a/src/nvim/eval/gc.h
+++ b/src/nvim/eval/gc.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_EVAL_GC_H
 #define NVIM_EVAL_GC_H
 
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 
 extern dict_T *gc_first_dict;
diff --git a/src/nvim/eval/typval_encode.h b/src/nvim/eval/typval_encode.h
index 2f19144da3..171b0417d0 100644
--- a/src/nvim/eval/typval_encode.h
+++ b/src/nvim/eval/typval_encode.h
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include "klib/kvec.h"
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/func_attr.h"
 
 /// Type of the stack entry
diff --git a/src/nvim/eval/userfunc.h b/src/nvim/eval/userfunc.h
index 4a98afb00e..562c549b4b 100644
--- a/src/nvim/eval/userfunc.h
+++ b/src/nvim/eval/userfunc.h
@@ -5,7 +5,6 @@
 #include <stddef.h>
 
 #include "nvim/eval.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/garray.h"
diff --git a/src/nvim/event/process.h b/src/nvim/event/process.h
index e0057faffb..39fed08c77 100644
--- a/src/nvim/event/process.h
+++ b/src/nvim/event/process.h
@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/multiqueue.h"
diff --git a/src/nvim/ex_cmds.h b/src/nvim/ex_cmds.h
index 39bff3e35d..148065e096 100644
--- a/src/nvim/ex_cmds.h
+++ b/src/nvim/ex_cmds.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 2acedb5ec3..568d4d38ba 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/normal.h"
 #include "nvim/pos.h"
 #include "nvim/regexp_defs.h"
diff --git a/src/nvim/ex_getln.h b/src/nvim/ex_getln.h
index 61ac4b69c5..b21fb0506d 100644
--- a/src/nvim/ex_getln.h
+++ b/src/nvim/ex_getln.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 #include "klib/kvec.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/types.h"
diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h
index a4566d754b..5eb2689233 100644
--- a/src/nvim/fileio.h
+++ b/src/nvim/fileio.h
@@ -2,7 +2,6 @@
 #define NVIM_FILEIO_H
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/garray.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/help.c b/src/nvim/help.c
index 633e9df244..d412f3a098 100644
--- a/src/nvim/help.c
+++ b/src/nvim/help.c
@@ -22,6 +22,7 @@
 #include "nvim/globals.h"
 #include "nvim/help.h"
 #include "nvim/macros.h"
+#include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/lua/converter.h b/src/nvim/lua/converter.h
index ddc0acfbfa..241dd65cc7 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/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/func_attr.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/lua/executor.h b/src/nvim/lua/executor.h
index c6747833e5..7e16c0f45c 100644
--- a/src/nvim/lua/executor.h
+++ b/src/nvim/lua/executor.h
@@ -8,7 +8,7 @@
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/assert.h"
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/func_attr.h"
 #include "nvim/lua/converter.h"
diff --git a/src/nvim/mark_defs.h b/src/nvim/mark_defs.h
index f9df0028db..cfe19eac6f 100644
--- a/src/nvim/mark_defs.h
+++ b/src/nvim/mark_defs.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_MARK_DEFS_H
 #define NVIM_MARK_DEFS_H
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/os/time.h"
 #include "nvim/pos.h"
 
diff --git a/src/nvim/mbyte.h b/src/nvim/mbyte.h
index 780f33e05b..724a16014d 100644
--- a/src/nvim/mbyte.h
+++ b/src/nvim/mbyte.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/func_attr.h"
 #include "nvim/mbyte_defs.h"
 #include "nvim/os/os_defs.h"
diff --git a/src/nvim/ops.h b/src/nvim/ops.h
index 4c5c6bafce..81e006be27 100644
--- a/src/nvim/ops.h
+++ b/src/nvim/ops.h
@@ -6,7 +6,6 @@
 
 #include "lauxlib.h"
 #include "nvim/ascii.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/extmark.h"
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index dc652054e8..ed9acde2b1 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_OPTION_DEFS_H
 #define NVIM_OPTION_DEFS_H
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/macros.h"
 #include "nvim/types.h"
 
diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c
index 2e850f8c22..a8330acd54 100644
--- a/src/nvim/os/pty_process_win.c
+++ b/src/nvim/os/pty_process_win.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 
 #include "nvim/ascii.h"
+#include "nvim/eval/typval.h"
 #include "nvim/mbyte.h"  // for utf8_to_utf16, utf16_to_utf8
 #include "nvim/memory.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/runtime.h b/src/nvim/runtime.h
index 9a810298f8..188ff7b36c 100644
--- a/src/nvim/runtime.h
+++ b/src/nvim/runtime.h
@@ -5,7 +5,6 @@
 
 #include "klib/kvec.h"
 #include "nvim/autocmd.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/ex_eval_defs.h"
diff --git a/src/nvim/search.h b/src/nvim/search.h
index 2f140ba840..eeff9f8744 100644
--- a/src/nvim/search.h
+++ b/src/nvim/search.h
@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/normal.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/strings.h b/src/nvim/strings.h
index 6ad9daf5bf..f4ccf9b30c 100644
--- a/src/nvim/strings.h
+++ b/src/nvim/strings.h
@@ -6,7 +6,7 @@
 #include <string.h>
 
 #include "klib/kvec.h"
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/types.h"
 
 /// Append string to string and return pointer to the next byte
diff --git a/src/nvim/testing.h b/src/nvim/testing.h
index 69596d725c..69ceeb16b5 100644
--- a/src/nvim/testing.h
+++ b/src/nvim/testing.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_TESTING_H
 #define NVIM_TESTING_H
 
-#include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "testing.h.generated.h"
diff --git a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h
index 6fe6a784a0..245f4c500c 100644
--- a/src/nvim/viml/parser/expressions.h
+++ b/src/nvim/viml/parser/expressions.h
@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "nvim/eval/typval.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/types.h"
 #include "nvim/viml/parser/parser.h"
diff --git a/src/nvim/window.h b/src/nvim/window.h
index 4ab2bea60a..9201800d53 100644
--- a/src/nvim/window.h
+++ b/src/nvim/window.h
@@ -4,13 +4,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "nvim/buffer.h"
 #include "nvim/buffer_defs.h"
 #include "nvim/macros.h"
-#include "nvim/mark.h"
-#include "nvim/os/os.h"
-#include "nvim/os/os_defs.h"
-#include "nvim/vim.h"
+#include "nvim/option_defs.h"
 
 // Values for file_name_in_line()
 #define FNAME_MESS      1       // give error message