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

Because typval_defs.h is enough for most of them.

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"

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

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"

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"

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"

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"

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"

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"

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;
 

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"
 

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;

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

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"

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"

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"

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"

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"

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"

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"

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

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"

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"
 

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"

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"

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"
 

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"

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"

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"

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

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"

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"

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