build(IWYU): fix includes for undo_defs.h

Makefile

@@ -291,7 +291,6 @@ iwyu: build/.ran-cmake
 	|src/nvim/ui_client.h\
 	|src/nvim/ui_compositor.h\
 	|src/nvim/undo.h\
-	|src/nvim/undo_defs.h\
 	|src/nvim/usercmd.h\
 	|src/nvim/version.h\
 	|src/nvim/vim.h\

src/clint.py

@@ -1046,7 +1046,6 @@ def CheckIncludes(filename, lines, error):
             "src/nvim/ui_client.h",
             "src/nvim/ui_compositor.h",
             "src/nvim/undo.h",
-            "src/nvim/undo_defs.h",
             "src/nvim/usercmd.h",
             "src/nvim/version.h",
             "src/nvim/vim.h",

src/nvim/api/buffer.c

@@ -33,7 +33,7 @@
 #include "nvim/memory.h"
 #include "nvim/move.h"
 #include "nvim/ops.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 #include "nvim/undo.h"
 #include "nvim/vim.h"

src/nvim/api/command.c

@@ -26,7 +26,7 @@
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/ops.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"

src/nvim/api/deprecated.c

@@ -21,7 +21,7 @@
 #include "nvim/lua/executor.h"
 #include "nvim/memory.h"
 #include "nvim/option.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/deprecated.c.generated.h"

src/nvim/api/extmark.c

@@ -22,7 +22,7 @@
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/sign.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/api/private/helpers.c

@@ -31,7 +31,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/msgpack_rpc/helpers.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 #include "nvim/ui.h"
 #include "nvim/version.h"

src/nvim/api/vim.c

@@ -58,7 +58,7 @@
 #include "nvim/os/os_defs.h"
 #include "nvim/os/process.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/runtime.h"
 #include "nvim/sign.h"
 #include "nvim/state.h"

src/nvim/api/win_config.c

@@ -20,7 +20,7 @@
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/option.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/syntax.h"
 #include "nvim/ui.h"
 #include "nvim/window.h"

src/nvim/api/window.c

@@ -22,7 +22,7 @@
 #include "nvim/message.h"
 #include "nvim/move.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 #include "nvim/window.h"
 

src/nvim/arglist.c

@@ -33,7 +33,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/os/input.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/types.h"
 #include "nvim/undo.h"

src/nvim/autocmd.h

@@ -11,7 +11,7 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 #include "nvim/macros.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 // Set by the apply_autocmds_group function if the given event is equal to

src/nvim/buffer.c

@@ -84,7 +84,7 @@
 #include "nvim/os/time.h"
 #include "nvim/path.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/quickfix.h"
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"

src/nvim/buffer.h

@@ -13,7 +13,7 @@
 #include "nvim/macros.h"
 #include "nvim/memline.h"
 #include "nvim/memline_defs.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // Values for buflist_getfile()
 enum getf_values {

src/nvim/buffer_defs.h

@@ -28,7 +28,7 @@ typedef struct {
 #include "nvim/mark_defs.h"
 #include "nvim/marktree.h"
 #include "nvim/option_vars.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/statusline_defs.h"
 #include "nvim/undo_defs.h"
 

src/nvim/buffer_updates.c

@@ -19,7 +19,7 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/msgpack_rpc/channel.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/buffer_updates.h

@@ -4,7 +4,7 @@
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/extmark.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "buffer_updates.h.generated.h"

src/nvim/bufwrite.c

@@ -40,7 +40,7 @@
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/sha256.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"

src/nvim/bufwrite.h

@@ -2,7 +2,7 @@
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "bufwrite.h.generated.h"

src/nvim/change.c

@@ -39,7 +39,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/os/time.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/search.h"
 #include "nvim/spell.h"
 #include "nvim/state.h"

src/nvim/change.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // flags for open_line()
 #define OPENLINE_DELSPACES  0x01  // delete spaces after cursor

src/nvim/charset.c

@@ -25,7 +25,7 @@
 #include "nvim/memory.h"
 #include "nvim/option.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/strings.h"
 #include "nvim/vim.h"
 

src/nvim/charset.h

@@ -7,7 +7,7 @@
 #include "nvim/eval/typval_defs.h"
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/strings.h"
 
 /// Return the folded-case equivalent of the given character

src/nvim/cursor.c

@@ -20,7 +20,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/state.h"
 #include "nvim/vim.h"
 

src/nvim/cursor.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "cursor.h.generated.h"

src/nvim/debugger.c

@@ -29,7 +29,7 @@
 #include "nvim/message.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"
 #include "nvim/vim.h"

src/nvim/decoration.c

@@ -19,7 +19,7 @@
 #include "nvim/memory.h"
 #include "nvim/move.h"
 #include "nvim/option_vars.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/sign.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/decoration.h

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

src/nvim/decoration_provider.c

@@ -14,7 +14,7 @@
 #include "nvim/log.h"
 #include "nvim/lua/executor.h"
 #include "nvim/message.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 static kvec_t(DecorProvider) decor_providers = KV_INITIAL_VALUE;
 

src/nvim/diff.c

@@ -51,7 +51,7 @@
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"
 #include "nvim/ui.h"

src/nvim/diff.h

@@ -4,7 +4,7 @@
 
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/macros.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // Value set from 'diffopt'.
 EXTERN int diff_context INIT( = 6);  // context for folds

src/nvim/drawline.c

@@ -35,7 +35,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/quickfix.h"
 #include "nvim/sign.h"
 #include "nvim/spell.h"

src/nvim/drawline.h

@@ -7,7 +7,7 @@
 #include "nvim/decoration_provider.h"
 #include "nvim/fold.h"
 #include "nvim/macros.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 // Maximum columns for terminal highlight attributes

src/nvim/drawscreen.c

@@ -95,7 +95,7 @@
 #include "nvim/os/os_defs.h"
 #include "nvim/plines.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/regexp.h"
 #include "nvim/search.h"

src/nvim/edit.c

@@ -51,7 +51,7 @@
 #include "nvim/os/input.h"
 #include "nvim/plines.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/search.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"

src/nvim/edit.h

@@ -2,7 +2,7 @@
 
 #include "nvim/autocmd_defs.h"  // IWYU pragma: keep
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // Values for in_cinkeys()
 #define KEY_OPEN_FORW   0x101

src/nvim/eval.c

@@ -68,7 +68,7 @@
 #include "nvim/os/shell.h"
 #include "nvim/os/stdpaths_defs.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/quickfix.h"
 #include "nvim/regexp.h"

src/nvim/eval/buffer.c

@@ -21,7 +21,7 @@
 #include "nvim/memory.h"
 #include "nvim/move.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/sign.h"
 #include "nvim/types.h"
 #include "nvim/undo.h"

src/nvim/eval/funcs.c

@@ -100,7 +100,7 @@
 #include "nvim/path.h"
 #include "nvim/plines.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"

src/nvim/eval/typval.c

@@ -31,7 +31,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/os/input.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"

src/nvim/eval/typval_defs.h

@@ -6,7 +6,7 @@
 #include "nvim/garray_defs.h"
 #include "nvim/hashtab.h"
 #include "nvim/lib/queue.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 /// Type used for Vimscript VAR_NUMBER values

src/nvim/eval/userfunc.h

@@ -9,7 +9,7 @@
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/garray_defs.h"
 #include "nvim/hashtab.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 struct funccal_entry;

src/nvim/eval/window.c

@@ -22,7 +22,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/move.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"

src/nvim/eval/window.h

@@ -12,7 +12,7 @@
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
 #include "nvim/os/fs.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
 

src/nvim/ex_cmds.c

@@ -73,7 +73,7 @@
 #include "nvim/os/time.h"
 #include "nvim/path.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/quickfix.h"
 #include "nvim/regexp.h"

src/nvim/ex_cmds.h

@@ -6,7 +6,7 @@
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: export
 #include "nvim/os/time.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // flags for do_ecmd()
 #define ECMD_HIDE            0x01    // don't free the current buffer

src/nvim/ex_cmds2.c

@@ -36,7 +36,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/quickfix.h"
 #include "nvim/runtime.h"
 #include "nvim/undo.h"

src/nvim/ex_cmds_defs.h

@@ -6,7 +6,7 @@
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_eval_defs.h"
 #include "nvim/normal.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/ex_docmd.c

@@ -69,7 +69,7 @@
 #include "nvim/os/shell.h"
 #include "nvim/path.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/quickfix.h"
 #include "nvim/regexp.h"

src/nvim/ex_eval_defs.h

@@ -2,7 +2,7 @@
 
 #include <stdbool.h>
 
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 /// A list used for saving values of "emsg_silent".  Used by ex_try() to save the
 /// value of "emsg_silent" if it was non-zero.  When this is done, the CSF_SILENT

src/nvim/ex_getln.c

@@ -62,7 +62,7 @@
 #include "nvim/os/os.h"
 #include "nvim/path.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/regexp.h"
 #include "nvim/search.h"

src/nvim/ex_session.c

@@ -33,7 +33,7 @@
 #include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/runtime.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"

src/nvim/extmark.c

@@ -37,7 +37,7 @@
 #include "nvim/map.h"
 #include "nvim/marktree.h"
 #include "nvim/memline.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/undo.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/extmark.h

@@ -10,7 +10,7 @@
 #include "nvim/extmark_defs.h"  // IWYU pragma: export
 #include "nvim/macros.h"
 #include "nvim/marktree.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 EXTERN int extmark_splice_pending INIT( = 0);

src/nvim/fileio.c

@@ -56,7 +56,7 @@
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/sha256.h"
 #include "nvim/shada.h"

src/nvim/fileio.h

@@ -10,7 +10,7 @@
 #include "nvim/garray_defs.h"  // IWYU pragma: keep
 #include "nvim/globals.h"
 #include "nvim/os/fs_defs.h"  // IWYU pragma: keep
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // Values for readfile() flags
 #define READ_NEW        0x01    // read a file into a new buffer

src/nvim/fold.c

@@ -43,7 +43,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/os/input.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"

src/nvim/fold.h

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

src/nvim/fold_defs.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // Info used to pass info about a fold from the fold-detection code to the
 // code that displays the foldcolumn.

src/nvim/getchar.c

@@ -51,7 +51,7 @@
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"

src/nvim/grid.h

@@ -8,7 +8,7 @@
 #include "nvim/grid_defs.h"  // IWYU pragma: export
 #include "nvim/macros.h"
 #include "nvim/mbyte.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 /// By default, all windows are drawn on a single rectangular grid, represented by
 /// this ScreenGrid instance. In multigrid mode each window will have its own

src/nvim/grid_defs.h

@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 // Includes final NUL. MAX_MCO is no longer used, but at least 4*(MAX_MCO+1)+1=29

src/nvim/help.c

@@ -34,7 +34,7 @@
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/runtime.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"

src/nvim/indent.c

@@ -33,7 +33,7 @@
 #include "nvim/optionstr.h"
 #include "nvim/os/input.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"

src/nvim/indent.h

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

src/nvim/indent_c.c

@@ -20,7 +20,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/vim.h"

src/nvim/indent_c.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "indent_c.h.generated.h"

src/nvim/insexpand.c

@@ -49,7 +49,7 @@
 #include "nvim/os/time.h"
 #include "nvim/path.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/search.h"
 #include "nvim/spell.h"

src/nvim/insexpand.h

@@ -2,7 +2,7 @@
 
 #include "nvim/macros.h"
 #include "nvim/option_defs.h"  // IWYU pragma: keep
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"
 

src/nvim/linematch.c

@@ -8,7 +8,7 @@
 #include "nvim/linematch.h"
 #include "nvim/macros.h"
 #include "nvim/memory.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 #define LN_MAX_BUFS 8
 #define LN_DECISION_MAX 255  // pow(2, LN_MAX_BUFS(8)) - 1 = 255

src/nvim/linematch.h

@@ -2,7 +2,7 @@
 
 #include <stddef.h>  // IWYU pragma: keep
 
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "linematch.h.generated.h"

src/nvim/lua/executor.c

@@ -51,7 +51,7 @@
 #include "nvim/os/fileio.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/runtime.h"
 #include "nvim/strings.h"

src/nvim/lua/stdlib.c

@@ -33,7 +33,7 @@
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"
 #include "nvim/types.h"

src/nvim/lua/treesitter.c

@@ -24,7 +24,7 @@
 #include "nvim/map.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"
 

src/nvim/lua/xdiff.c

@@ -13,7 +13,7 @@
 #include "nvim/lua/xdiff.h"
 #include "nvim/macros.h"
 #include "nvim/memory.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/vim.h"
 #include "xdiff/xdiff.h"
 

src/nvim/mapping.c

@@ -39,7 +39,7 @@
 #include "nvim/message.h"
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/regexp_defs.h"
 #include "nvim/runtime.h"

src/nvim/mark.h

@@ -12,7 +12,7 @@
 #include "nvim/mark_defs.h"  // IWYU pragma: export
 #include "nvim/memory.h"
 #include "nvim/os/time.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 /// Set fmark using given value
 #define SET_FMARK(fmarkp_, mark_, fnum_, view_) \

src/nvim/mark_defs.h

@@ -2,7 +2,7 @@
 
 #include "nvim/eval/typval_defs.h"
 #include "nvim/os/time.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // marks: positions in a file
 // (a normal mark is a lnum/col pair, the same as a file position)

src/nvim/marktree.c

@@ -53,7 +53,7 @@
 #include "nvim/garray.h"
 #include "nvim/marktree.h"
 #include "nvim/memory.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 // only for debug functions
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"

src/nvim/marktree.h

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

src/nvim/match.c

@@ -28,7 +28,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option_vars.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/regexp.h"
 #include "nvim/strings.h"

src/nvim/mbyte.c

@@ -62,7 +62,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/os.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"

src/nvim/memfile.c

@@ -59,7 +59,7 @@
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/vim.h"
 
 #define MEMFILE_PAGE_SIZE 4096       /// default page size

src/nvim/memfile_defs.h

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 
 #include "nvim/map.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 /// A block number.

src/nvim/memline.c

@@ -79,7 +79,7 @@
 #include "nvim/os/process.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/spell.h"
 #include "nvim/statusline.h"
 #include "nvim/strings.h"

src/nvim/memline.h

@@ -2,7 +2,7 @@
 
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/memline_defs.h"  // IWYU pragma: export
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS

src/nvim/menu.c

@@ -30,7 +30,7 @@
 #include "nvim/message.h"
 #include "nvim/option_vars.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"

src/nvim/message.c

@@ -47,7 +47,7 @@
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"
 #include "nvim/strings.h"

src/nvim/mouse.c

@@ -34,7 +34,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/plines.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/search.h"
 #include "nvim/state.h"
 #include "nvim/statusline.h"

src/nvim/move.c

@@ -39,7 +39,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/plines.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/search.h"
 #include "nvim/sign_defs.h"
 #include "nvim/strings.h"

src/nvim/normal.h

@@ -4,7 +4,7 @@
 
 #include "nvim/buffer_defs.h"
 #include "nvim/macros.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 // Values for find_ident_under_cursor()
 #define FIND_IDENT      1       // find identifier (word)

src/nvim/ops.h

@@ -12,7 +12,7 @@
 #include "nvim/normal.h"
 #include "nvim/option_defs.h"
 #include "nvim/os/time.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/types.h"
 
 typedef int (*Indenter)(void);

src/nvim/option.c

@@ -81,7 +81,7 @@
 #include "nvim/os/os.h"
 #include "nvim/path.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/runtime.h"
 #include "nvim/search.h"

src/nvim/optionstr.c

@@ -37,7 +37,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/os.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/regexp.h"
 #include "nvim/spell.h"
 #include "nvim/spellfile.h"

src/nvim/os/shell.c

@@ -36,7 +36,7 @@
 #include "nvim/os/signal.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/rbuffer.h"
 #include "nvim/strings.h"

src/nvim/plines.c

@@ -21,7 +21,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/plines.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/state.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"

src/nvim/plines.h

@@ -5,7 +5,7 @@
 
 #include "nvim/buffer_defs.h"
 #include "nvim/marktree.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 
 /// Argument for lbr_chartabsize().
 typedef struct {

src/nvim/popupmenu.c

@@ -30,7 +30,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/popupmenu.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/strings.h"
 #include "nvim/ui.h"
 #include "nvim/ui_compositor.h"

src/nvim/profile.c

@@ -26,7 +26,7 @@
 #include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
-#include "nvim/pos.h"
+#include "nvim/pos_defs.h"
 #include "nvim/profile.h"
 #include "nvim/runtime.h"
 #include "nvim/types.h"