build(IWYU): replace most private mappings with pragmas (#26247)

39 files changed, 67 insertions, 44 deletions

diff --git a/src/clint.py b/src/clint.py
index d853428cd0..13c2978cf4 100755
--- a/src/clint.py
+++ b/src/clint.py
@@ -1017,7 +1017,6 @@ def CheckIncludes(filename, lines, error):
             "src/nvim/os/fs.h",
             "src/nvim/os/input.h",
             "src/nvim/os/lang.h",
-            "src/nvim/os/os.h",
             "src/nvim/os/pty_conpty_win.h",
             "src/nvim/os/pty_process_unix.h",
             "src/nvim/os/pty_process_win.h",
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index bbeaa452ba..828362c10e 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -1,10 +1,10 @@
 #include <assert.h>
-#include <inttypes.h>
 #include <limits.h>
 #include <msgpack/unpack.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +17,7 @@
 #include "nvim/ascii.h"
 #include "nvim/buffer_defs.h"
 #include "nvim/eval/typval.h"
+#include "nvim/eval/typval_defs.h"
 #include "nvim/eval/vars.h"
 #include "nvim/ex_eval.h"
 #include "nvim/garray.h"
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 9df886ef9a..8526147287 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -78,7 +78,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/bufwrite.c b/src/nvim/bufwrite.c
index 96211f855c..ab57d5d754 100644
--- a/src/nvim/bufwrite.c
+++ b/src/nvim/bufwrite.c
@@ -35,7 +35,7 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c
index 9b40a17d20..7a6cc02cb8 100644
--- a/src/nvim/cmdexpand.c
+++ b/src/nvim/cmdexpand.c
@@ -46,6 +46,7 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/lang.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 9c75a21b2c..03103ecd65 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -46,7 +46,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
 #include "nvim/path.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a4b6a5fc11..52ab610267 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -60,7 +60,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/fileio.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/lang.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 98deb7b32b..53fad45d04 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -90,7 +90,7 @@
 #include "nvim/optionstr.h"
 #include "nvim/os/dl.h"
 #include "nvim/os/fileio.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/os/pty_process.h"
 #include "nvim/os/shell.h"
diff --git a/src/nvim/eval/window.h b/src/nvim/eval/window.h
index 8502978ac1..fa9b9c41d4 100644
--- a/src/nvim/eval/window.h
+++ b/src/nvim/eval/window.h
@@ -11,7 +11,7 @@
 #include "nvim/mark.h"
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
-#include "nvim/os/os.h"
+#include "nvim/os/fs.h"
 #include "nvim/pos.h"
 #include "nvim/vim.h"
 #include "nvim/window.h"
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c
index 542fb707fd..6fe6548f99 100644
--- a/src/nvim/event/socket.c
+++ b/src/nvim/event/socket.c
@@ -14,6 +14,7 @@
 #include "nvim/log.h"
 #include "nvim/main.h"
 #include "nvim/memory.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
 
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 267137cd0a..d77bd47fcf 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -65,7 +65,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 0171023fc5..373dd8cd96 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -61,6 +61,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c
index 1a36014378..903170a43c 100644
--- a/src/nvim/ex_session.c
+++ b/src/nvim/ex_session.c
@@ -29,6 +29,7 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
 #include "nvim/pos.h"
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 2dbe93c6b2..8316d0449f 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -62,7 +62,7 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 0efd826f1d..6de6f01a52 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -48,6 +48,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/fs_defs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h
index 318be20c91..d3a0e8c54a 100644
--- a/src/nvim/fileio.h
+++ b/src/nvim/fileio.h
@@ -1,12 +1,16 @@
 #pragma once
 
-#include "nvim/buffer_defs.h"
+#include <stdint.h>  // IWYU pragma: keep
+#include <stdio.h>  // IWYU pragma: keep
+#include <time.h>  // IWYU pragma: keep
+
+#include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"
-#include "nvim/ex_cmds_defs.h"
-#include "nvim/garray_defs.h"
+#include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
+#include "nvim/garray_defs.h"  // IWYU pragma: keep
 #include "nvim/globals.h"
-#include "nvim/os/fs_defs.h"
-#include "nvim/os/os.h"
+#include "nvim/os/fs_defs.h"  // IWYU pragma: keep
+#include "nvim/pos.h"
 
 // Values for readfile() flags
 #define READ_NEW        0x01    // read a file into a new buffer
diff --git a/src/nvim/generators/gen_declarations.lua b/src/nvim/generators/gen_declarations.lua
index 7ed0624b05..f9e9c6b0a8 100644
--- a/src/nvim/generators/gen_declarations.lua
+++ b/src/nvim/generators/gen_declarations.lua
@@ -171,7 +171,7 @@ static functions into static.h and declarations for non-static functions into
 non-static.h. File `definitions.i' should contain an already preprocessed
 version of definitions.c and it is the only one which is actually parsed,
 definitions.c is needed only to determine functions from which file out of all
-functions found in definitions.i are needed.
+functions found in definitions.i are needed and to generate an IWYU comment.
 
 Additionally uses the following environment variables:
 
@@ -224,6 +224,18 @@ local non_static = header .. [[
 
 local static = header
 
+if fname:find('.*/src/nvim/.*%.c$') then
+  -- Add an IWYU pragma comment if the corresponding .h file exists.
+  local header_fname = fname:sub(1, -3) .. '.h'
+  local header_f = io.open(header_fname, 'r')
+  if header_f ~= nil then
+    header_f:close()
+    non_static = ([[
+// IWYU pragma: private, include "%s"
+]]):format(header_fname:gsub('.*/src/nvim/', 'nvim/')) .. non_static
+  end
+end
+
 local filepattern = '^#%a* (%d+) "([^"]-)/?([^"/]+)"'
 
 local init = 1
@@ -241,12 +253,7 @@ while init ~= nil do
       curfile = file
       is_needed_file = (curfile == neededfile)
       declline = tonumber(line) - 1
-      local curdir_start = dir:find('src/nvim/')
-      if curdir_start ~= nil then
-        curdir = dir:sub(curdir_start + #('src/nvim/'))
-      else
-        curdir = dir
-      end
+      curdir = dir:gsub('.*/src/nvim/', '')
     else
       declline = declline - 1
     end
@@ -308,7 +315,7 @@ F = io.open(static_fname, 'w')
 F:write(static)
 F:close()
 
--- Before generating the non-static headers, check if the current file(if
+-- Before generating the non-static headers, check if the current file (if
 -- exists) is different from the new one. If they are the same, we won't touch
 -- the current version to avoid triggering an unnecessary rebuilds of modules
 -- that depend on this one
diff --git a/src/nvim/help.c b/src/nvim/help.c
index 337c34f1de..b1b2feb587 100644
--- a/src/nvim/help.c
+++ b/src/nvim/help.c
@@ -29,6 +29,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/log.c b/src/nvim/log.c
index d686621eeb..c6efdaeb49 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -23,6 +23,7 @@
 #include "nvim/log.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/os/stdpaths_defs.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/main.c b/src/nvim/main.c
index b6072eb2e4..c5ab9f0cb2 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -67,6 +67,7 @@
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/fileio.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/lang.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index bdd1947d73..e576253c89 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -29,6 +29,7 @@
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c
index f30eb38e99..5b64144187 100644
--- a/src/nvim/memfile.c
+++ b/src/nvim/memfile.c
@@ -55,7 +55,7 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 2ba6355528..032f079f46 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -41,6 +41,7 @@
 #include "nvim/ops.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index ba874422ff..deb3117f3c 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -22,6 +22,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/os/fileio.c b/src/nvim/os/fileio.c
index ed0a97aac9..b205481e98 100644
--- a/src/nvim/os/fileio.c
+++ b/src/nvim/os/fileio.c
@@ -19,7 +19,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/os/fileio.h"
-#include "nvim/os/os.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/rbuffer.h"
 #include "nvim/types.h"
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 82916eca7b..b9448ddf4b 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -17,6 +17,7 @@
 #endif
 
 #include "auto/config.h"
+#include "nvim/os/fs.h"
 
 #if defined(HAVE_ACL)
 # ifdef HAVE_SYS_ACL_H
@@ -39,7 +40,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option_vars.h"
-#include "nvim/os/fs_defs.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
 #include "nvim/types.h"
diff --git a/src/nvim/os/os.h b/src/nvim/os/os.h
index 84c4e6668e..e0c970f20c 100644
--- a/src/nvim/os/os.h
+++ b/src/nvim/os/os.h
@@ -1,19 +1,17 @@
 #pragma once
 
-#include <stdbool.h>
-#include <uv.h>
+#include <stddef.h>  // IWYU pragma: keep
+#include <stdint.h>  // IWYU pragma: keep
+#include <uv.h>  // IWYU pragma: keep
 
-#include "nvim/buffer_defs.h"
-#include "nvim/cmdexpand_defs.h"
-#include "nvim/garray_defs.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/buffer_defs.h"  // IWYU pragma: keep
+#include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
+#include "nvim/garray_defs.h"  // IWYU pragma: keep
 #include "nvim/os/os_defs.h"  // IWYU pragma: export
-#include "nvim/os/stdpaths_defs.h"
-#include "nvim/types.h"
+#include "nvim/os/stdpaths_defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/env.h.generated.h"
-# include "os/fs.h.generated.h"
 # include "os/mem.h.generated.h"
 # include "os/stdpaths.h.generated.h"
 # include "os/users.h.generated.h"
diff --git a/src/nvim/os/os_win_console.c b/src/nvim/os/os_win_console.c
index 44a2b6f769..784f97e58b 100644
--- a/src/nvim/os/os_win_console.c
+++ b/src/nvim/os/os_win_console.c
@@ -1,3 +1,4 @@
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/os_win_console.h"
diff --git a/src/nvim/os/pty_process_unix.c b/src/nvim/os/pty_process_unix.c
index f3a841f7d0..d4be3086ea 100644
--- a/src/nvim/os/pty_process_unix.c
+++ b/src/nvim/os/pty_process_unix.c
@@ -36,7 +36,7 @@
 #include "nvim/event/process.h"
 #include "nvim/event/stream.h"
 #include "nvim/log.h"
-#include "nvim/os/os.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/os/pty_process.h"
 #include "nvim/os/pty_process_unix.h"
diff --git a/src/nvim/path.c b/src/nvim/path.c
index ad1d8771aa..805b361bb1 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -25,7 +25,7 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
diff --git a/src/nvim/profile.c b/src/nvim/profile.c
index fd6c316e38..0c771d2dfe 100644
--- a/src/nvim/profile.c
+++ b/src/nvim/profile.c
@@ -22,6 +22,7 @@
 #include "nvim/keycodes.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 #include "nvim/pos.h"
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 68217eefe7..fdc01e0a01 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -47,7 +47,7 @@
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c
index decf16c02e..e6720a9211 100644
--- a/src/nvim/runtime.c
+++ b/src/nvim/runtime.c
@@ -40,6 +40,7 @@
 #include "nvim/option.h"
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/stdpaths_defs.h"
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index 81b6bf2ff9..9a0d322a9a 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -41,7 +41,7 @@
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
 #include "nvim/os/fileio.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c
index 92bbf2aebd..0d76ad631e 100644
--- a/src/nvim/spellfile.c
+++ b/src/nvim/spellfile.c
@@ -252,6 +252,7 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index d750e24898..90bd2f8fad 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -41,8 +41,8 @@
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
-#include "nvim/os/os.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
diff --git a/src/nvim/testing.c b/src/nvim/testing.c
index d5bb5171fa..3c78a1ab0e 100644
--- a/src/nvim/testing.c
+++ b/src/nvim/testing.c
@@ -20,7 +20,7 @@
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/os/os.h"
+#include "nvim/os/fs.h"
 #include "nvim/runtime.h"
 #include "nvim/strings.h"
 #include "nvim/testing.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 7cd9ae378f..15577931f3 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -110,9 +110,8 @@
 #include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/option_vars.h"
-#include "nvim/os/fs_defs.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/input.h"
-#include "nvim/os/os.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
diff --git a/src/nvim/window.c b/src/nvim/window.c
index bed47670cc..af29a2c2d1 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -55,7 +55,7 @@
 #include "nvim/option.h"
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
-#include "nvim/os/os.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/path.h"
 #include "nvim/plines.h"