refactor: rename types.h to types_defs.h

src/nvim/api/buffer.c

@@ -34,7 +34,7 @@
 #include "nvim/move.h"
 #include "nvim/ops.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
 

src/nvim/api/command.c

@@ -29,7 +29,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/usercmd.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"

src/nvim/api/extmark.h

@@ -7,7 +7,7 @@
 #include "nvim/decoration_defs.h"  // IWYU pragma: keep
 #include "nvim/macros.h"
 #include "nvim/map.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 EXTERN Map(String, int) namespace_ids INIT( = MAP_INIT);
 EXTERN handle_T next_namespace_id INIT( = 1);

src/nvim/api/private/converter.c

@@ -14,7 +14,7 @@
 #include "nvim/func_attr.h"
 #include "nvim/lua/executor.h"
 #include "nvim/memory.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 /// Helper structure for vim_to_object

src/nvim/api/private/defs.h

@@ -6,7 +6,7 @@
 
 #include "klib/kvec.h"
 #include "nvim/func_attr.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define ARRAY_DICT_INIT KV_INITIAL_VALUE
 #define STRING_INIT { .data = NULL, .size = 0 }

src/nvim/api/private/dispatch.h

@@ -5,7 +5,7 @@
 
 #include "nvim/api/private/defs.h"
 #include "nvim/memory.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 typedef Object (*ApiDispatchWrapper)(uint64_t channel_id, Array args, Arena *arena, Error *error);
 

src/nvim/api/private/helpers.c

@@ -32,7 +32,7 @@
 #include "nvim/message.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/version.h"
 

src/nvim/api/ui.c

@@ -29,7 +29,7 @@
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/option.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/api/vim.c

@@ -65,7 +65,7 @@
 #include "nvim/statusline.h"
 #include "nvim/strings.h"
 #include "nvim/terminal.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"

src/nvim/api/window.c

@@ -24,7 +24,7 @@
 #include "nvim/move.h"
 #include "nvim/plines.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/window.h"
 
 /// Gets the current buffer in a window

src/nvim/arglist.c

@@ -35,7 +35,7 @@
 #include "nvim/path.h"
 #include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/undo.h"
 #include "nvim/version.h"
 #include "nvim/vim.h"

src/nvim/arglist.h

@@ -4,7 +4,7 @@
 #include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "arglist.h.generated.h"

src/nvim/autocmd.c

@@ -49,7 +49,7 @@
 #include "nvim/search.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/ui_compositor.h"
 #include "nvim/vim.h"

src/nvim/autocmd.h

@@ -12,7 +12,7 @@
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 #include "nvim/macros.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // Set by the apply_autocmds_group function if the given event is equal to
 // EVENT_FILETYPE. Used by the readfile function in order to determine if

src/nvim/autocmd_defs.h

@@ -10,7 +10,7 @@
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/regexp_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // event_T definition
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/buffer.c

@@ -95,7 +95,7 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/usercmd.h"

src/nvim/buffer_updates.c

@@ -20,7 +20,7 @@
 #include "nvim/memory.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "buffer_updates.c.generated.h"  // IWYU pragma: export

src/nvim/bufwrite.c

@@ -43,7 +43,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/sha256.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/channel.h

@@ -17,7 +17,7 @@
 #include "nvim/msgpack_rpc/channel_defs.h"
 #include "nvim/os/pty_process.h"
 #include "nvim/terminal.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define CHAN_STDIO 1
 #define CHAN_STDERR 2

src/nvim/cmdexpand.c

@@ -62,7 +62,7 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/usercmd.h"
 #include "nvim/vim.h"

src/nvim/cmdexpand.h

@@ -4,7 +4,7 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_getln.h"
 #include "nvim/garray_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // Values for nextwild() and ExpandOne().  See ExpandOne() for meaning.
 

src/nvim/cmdexpand_defs.h

@@ -4,7 +4,7 @@
 #include <stddef.h>
 
 #include "nvim/eval/typval_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 typedef enum {
   XP_PREFIX_NONE,  ///< prefix not used

src/nvim/cmdhist.c

@@ -24,7 +24,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/regexp.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/cmdhist.h

@@ -4,7 +4,7 @@
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: export
 #include "nvim/os/time.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// Present history tables
 typedef enum {

src/nvim/decoration.h

@@ -11,7 +11,7 @@
 #include "nvim/macros.h"
 #include "nvim/marktree.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // actual Decor* data is in decoration_defs.h
 

src/nvim/decoration_provider.h

@@ -6,7 +6,7 @@
 #include "klib/kvec.h"
 #include "nvim/buffer_defs.h"
 #include "nvim/macros.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define DP_MAX_ERROR 3
 

src/nvim/diff.c

@@ -53,7 +53,7 @@
 #include "nvim/path.h"
 #include "nvim/pos_defs.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/digraph.c

@@ -33,7 +33,7 @@
 #include "nvim/os/input.h"
 #include "nvim/runtime.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 typedef int result_T;

src/nvim/digraph.h

@@ -4,7 +4,7 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 #include "nvim/garray_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "digraph.h.generated.h"

src/nvim/drawline.c

@@ -44,7 +44,7 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/drawline.h

@@ -8,7 +8,7 @@
 #include "nvim/fold.h"
 #include "nvim/macros.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // Maximum columns for terminal highlight attributes
 #define TERM_ATTRS_MAX 1024

src/nvim/drawscreen.c

@@ -106,7 +106,7 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/ui_compositor.h"
 #include "nvim/version.h"

src/nvim/edit.c

@@ -59,7 +59,7 @@
 #include "nvim/terminal.h"
 #include "nvim/textformat.h"
 #include "nvim/textobject.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/eval.c

@@ -76,7 +76,7 @@
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/tag.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/ui_compositor.h"
 #include "nvim/usercmd.h"

src/nvim/eval/buffer.c

@@ -23,7 +23,7 @@
 #include "nvim/path.h"
 #include "nvim/pos_defs.h"
 #include "nvim/sign.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
 

src/nvim/eval/buffer.h

@@ -2,7 +2,7 @@
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/buffer.h.generated.h"

src/nvim/eval/decode.c

@@ -21,7 +21,7 @@
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 /// Helper structure for container_struct

src/nvim/eval/decode.h

@@ -4,7 +4,7 @@
 #include <stddef.h>  // IWYU pragma: keep
 
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/decode.h.generated.h"

src/nvim/eval/encode.c

@@ -28,7 +28,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"  // For _()
 
 const char *const encode_bool_var_names[] = {

src/nvim/eval/executor.c

@@ -11,7 +11,7 @@
 #include "nvim/globals.h"
 #include "nvim/message.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/eval/funcs.h

@@ -7,7 +7,7 @@
 #include "nvim/buffer_defs.h"
 #include "nvim/cmdexpand_defs.h"
 #include "nvim/eval/typval_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// Prototype of C function that implements Vimscript function
 typedef void (*VimLFunc)(typval_T *args, typval_T *rvar, EvalFuncData data);

src/nvim/eval/typval.c

@@ -33,7 +33,7 @@
 #include "nvim/os/input.h"
 #include "nvim/pos_defs.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 /// struct storing information about current sort

src/nvim/eval/typval.h

@@ -15,7 +15,7 @@
 #include "nvim/macros.h"
 #include "nvim/mbyte_defs.h"
 #include "nvim/message.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // In a hashtab item "hi_key" points to "di_key" in a dictitem.
 // This avoids adding a pointer to the hashtab item.

src/nvim/eval/typval_defs.h

@@ -7,7 +7,7 @@
 #include "nvim/hashtab.h"
 #include "nvim/lib/queue.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// Type used for Vimscript VAR_NUMBER values
 typedef int64_t varnumber_T;

src/nvim/eval/userfunc.c

@@ -45,7 +45,7 @@
 #include "nvim/runtime.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/eval/userfunc.h

@@ -10,7 +10,7 @@
 #include "nvim/garray_defs.h"
 #include "nvim/hashtab.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 struct funccal_entry;
 

src/nvim/eval/vars.c

@@ -40,7 +40,7 @@
 #include "nvim/os/os.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
 

src/nvim/eval/vars.h

@@ -6,7 +6,7 @@
 #include "nvim/garray_defs.h"  // IWYU pragma: keep
 #include "nvim/hashtab.h"
 #include "nvim/option_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/vars.h.generated.h"

src/nvim/eval/window.c

@@ -23,7 +23,7 @@
 #include "nvim/message.h"
 #include "nvim/move.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
 #include "nvim/winfloat.h"

src/nvim/ex_cmds.c

@@ -81,7 +81,7 @@
 #include "nvim/spell.h"
 #include "nvim/strings.h"
 #include "nvim/terminal.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/ex_docmd.c

@@ -80,7 +80,7 @@
 #include "nvim/statusline.h"
 #include "nvim/strings.h"
 #include "nvim/tag.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/usercmd.h"

src/nvim/ex_getln.c

@@ -68,7 +68,7 @@
 #include "nvim/search.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/usercmd.h"

src/nvim/ex_getln.h

@@ -7,7 +7,7 @@
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/option_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 struct cmdline_info;
 

src/nvim/extmark.h

@@ -11,7 +11,7 @@
 #include "nvim/macros.h"
 #include "nvim/marktree.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 EXTERN int extmark_splice_pending INIT( = 0);
 

src/nvim/extmark_defs.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "klib/kvec.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 typedef struct undo_object ExtmarkUndoObject;
 typedef kvec_t(ExtmarkUndoObject) extmark_undo_vec_t;

src/nvim/file_search.h

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 #include "nvim/globals.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // Flags for find_file_*() functions.
 #define FINDFILE_FILE   0       // only files

src/nvim/fileio.c

@@ -61,7 +61,7 @@
 #include "nvim/sha256.h"
 #include "nvim/shada.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/fold.c

@@ -47,7 +47,7 @@
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
 

src/nvim/fold.h

@@ -7,7 +7,7 @@
 #include "nvim/garray_defs.h"  // IWYU pragma: keep
 #include "nvim/macros.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 EXTERN int disable_fold_update INIT( = 0);
 

src/nvim/garray.h

@@ -6,7 +6,7 @@
 #include "nvim/garray_defs.h"  // IWYU pragma: export
 #include "nvim/log.h"
 #include "nvim/memory.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define GA_EMPTY(ga_ptr) ((ga_ptr)->ga_len <= 0)
 

src/nvim/getchar.c

@@ -54,7 +54,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/getchar.h

@@ -6,7 +6,7 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/getchar_defs.h"  // IWYU pragma: export
 #include "nvim/os/fileio.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// Argument for flush_buffers().
 typedef enum {

src/nvim/globals.h

@@ -16,7 +16,7 @@
 #include "nvim/os/os_defs.h"
 #include "nvim/runtime.h"
 #include "nvim/syntax_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define IOSIZE         (1024 + 1)          // file I/O and sprintf buffer size
 

src/nvim/grid.c

@@ -27,7 +27,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option_vars.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/grid_defs.h

@@ -5,7 +5,7 @@
 #include <stdint.h>
 
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // Includes final NUL. MAX_MCO is no longer used, but at least 4*(MAX_MCO+1)+1=29
 // ensures we can fit all composed chars which did fit before.

src/nvim/hashtab.h

@@ -2,7 +2,7 @@
 
 #include <stddef.h>
 
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// Magic number used for hashitem "hi_key" value indicating a deleted item
 ///

src/nvim/help.c

@@ -39,7 +39,7 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
 

src/nvim/highlight.c

@@ -25,7 +25,7 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/popupmenu.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/highlight_defs.h

@@ -3,7 +3,7 @@
 #include <inttypes.h>
 
 #include "nvim/macros.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 typedef int32_t RgbValue;
 

src/nvim/highlight_group.c

@@ -40,7 +40,7 @@
 #include "nvim/os/time.h"
 #include "nvim/runtime.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/highlight_group.h

@@ -5,7 +5,7 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
 #include "nvim/highlight_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define MAX_HL_ID 20000   // maximum value for a highlight ID.
 

src/nvim/indent.c

@@ -38,7 +38,7 @@
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/textformat.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"
 

src/nvim/indent.h

@@ -3,7 +3,7 @@
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 typedef int (*IndentGetter)(void);
 

src/nvim/insexpand.c

@@ -57,7 +57,7 @@
 #include "nvim/strings.h"
 #include "nvim/tag.h"
 #include "nvim/textformat.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/insexpand.h

@@ -3,7 +3,7 @@
 #include "nvim/macros.h"
 #include "nvim/option_defs.h"  // IWYU pragma: keep
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/lua/converter.c

@@ -25,7 +25,7 @@
 #include "nvim/lua/executor.h"
 #include "nvim/macros.h"
 #include "nvim/message.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 /// Determine, which keys lua table contains

src/nvim/lua/executor.h

@@ -14,7 +14,7 @@
 #include "nvim/lua/converter.h"
 #include "nvim/macros.h"
 #include "nvim/map.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/usercmd.h"
 
 // Generated by msgpack-gen.lua

src/nvim/lua/stdlib.c

@@ -36,7 +36,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/lua/treesitter.c

@@ -26,7 +26,7 @@
 #include "nvim/memory.h"
 #include "nvim/pos_defs.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #define TS_META_PARSER "treesitter_parser"
 #define TS_META_TREE "treesitter_tree"

src/nvim/main.c

@@ -94,7 +94,7 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/ui_client.h"
 #include "nvim/ui_compositor.h"

src/nvim/map.h

@@ -7,7 +7,7 @@
 #include "nvim/api/private/defs.h"
 #include "nvim/assert.h"
 #include "nvim/highlight_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #if defined(__NetBSD__)
 # undef uint64_t

src/nvim/mapping.c

@@ -46,7 +46,7 @@
 #include "nvim/runtime.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/mapping.h

@@ -12,7 +12,7 @@
 #include "nvim/mapping_defs.h"  // IWYU pragma: export
 #include "nvim/option_defs.h"  // IWYU pragma: keep
 #include "nvim/regexp_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// Used for the first argument of do_map()
 enum {

src/nvim/mapping_defs.h

@@ -3,7 +3,7 @@
 #include <stdbool.h>
 
 #include "nvim/eval/typval_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// Structure used for mappings and abbreviations.
 typedef struct mapblock mapblock_T;

src/nvim/marktree.h

@@ -11,7 +11,7 @@
 #include "nvim/garray_defs.h"
 #include "nvim/map.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 // only for debug functions:
 #include "nvim/api/private/defs.h"
 

src/nvim/match.c

@@ -32,7 +32,7 @@
 #include "nvim/profile.h"
 #include "nvim/regexp.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/match.h

@@ -3,7 +3,7 @@
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "match.h.generated.h"

src/nvim/mbyte.c

@@ -64,7 +64,7 @@
 #include "nvim/os/os.h"
 #include "nvim/pos_defs.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 typedef struct {

src/nvim/mbyte.h

@@ -10,7 +10,7 @@
 #include "nvim/grid_defs.h"
 #include "nvim/mbyte_defs.h"  // IWYU pragma: export
 #include "nvim/os/os_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // Return byte length of character that starts with byte "b".
 // Returns 1 for a single-byte character.

src/nvim/memfile_defs.h

@@ -6,7 +6,7 @@
 
 #include "nvim/map.h"
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 /// A block number.
 ///

src/nvim/memline.h

@@ -3,7 +3,7 @@
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/memline_defs.h"  // IWYU pragma: export
 #include "nvim/pos_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "memline.h.generated.h"

src/nvim/menu.c

@@ -33,7 +33,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 

src/nvim/menu.h

@@ -5,7 +5,7 @@
 #include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 #include "nvim/menu_defs.h"  // IWYU pragma: export
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "menu.h.generated.h"

src/nvim/message.h

@@ -9,7 +9,7 @@
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/grid_defs.h"
 #include "nvim/macros.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 // Types of dialogs passed to do_dialog().
 #define VIM_GENERIC     0

src/nvim/mouse.c

@@ -39,7 +39,7 @@
 #include "nvim/state.h"
 #include "nvim/statusline.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/ui_compositor.h"
 #include "nvim/vim.h"

src/nvim/move.c

@@ -43,7 +43,7 @@
 #include "nvim/search.h"
 #include "nvim/sign_defs.h"
 #include "nvim/strings.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
 #include "nvim/winfloat.h"

src/nvim/move.h

@@ -4,7 +4,7 @@
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/vim.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/msgpack_rpc/channel.c

@@ -33,7 +33,7 @@
 #include "nvim/msgpack_rpc/unpacker.h"
 #include "nvim/os/input.h"
 #include "nvim/rbuffer.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui.h"
 #include "nvim/ui_client.h"
 

src/nvim/msgpack_rpc/helpers.c

@@ -13,7 +13,7 @@
 #include "nvim/func_attr.h"
 #include "nvim/memory.h"
 #include "nvim/msgpack_rpc/helpers.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "msgpack_rpc/helpers.c.generated.h"

src/nvim/msgpack_rpc/unpacker.h

@@ -12,7 +12,7 @@
 #include "nvim/grid_defs.h"
 #include "nvim/memory_defs.h"
 #include "nvim/msgpack_rpc/channel_defs.h"
-#include "nvim/types.h"
+#include "nvim/types_defs.h"
 #include "nvim/ui_client.h"
 
 struct Unpacker {