9 files changed, 18 insertions, 19 deletions
diff --git a/src/nvim/api/deprecated.h b/src/nvim/api/deprecated.h
index 5541a4dac3..e20d8304e0 100644
--- a/src/nvim/api/deprecated.h
+++ b/src/nvim/api/deprecated.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <stdint.h>
+#include <stdint.h>  // IWYU pragma: keep
 
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/deprecated.h.generated.h"
diff --git a/src/nvim/api/private/converter.h b/src/nvim/api/private/converter.h
index 47e1d5a6bb..fc82abf332 100644
--- a/src/nvim/api/private/converter.h
+++ b/src/nvim/api/private/converter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "nvim/api/private/defs.h"
-#include "nvim/eval/typval_defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
+#include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/private/converter.h.generated.h"
diff --git a/src/nvim/api/tabpage.h b/src/nvim/api/tabpage.h
index b9357df10a..2f19845bd9 100644
--- a/src/nvim/api/tabpage.h
+++ b/src/nvim/api/tabpage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/tabpage.h.generated.h"
diff --git a/src/nvim/lua/converter.h b/src/nvim/lua/converter.h
index 501db36dbe..a502df80d9 100644
--- a/src/nvim/lua/converter.h
+++ b/src/nvim/lua/converter.h
@@ -1,12 +1,9 @@
 #pragma once
 
-#include <lua.h>
-#include <stdbool.h>
-#include <stdint.h>
+#include <lua.h>  // IWYU pragma: keep
 
-#include "nvim/api/private/defs.h"
-#include "nvim/eval/typval_defs.h"
-#include "nvim/func_attr.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
+#include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 
 #define nlua_pop_Buffer nlua_pop_handle
 #define nlua_pop_Window nlua_pop_handle
diff --git a/src/nvim/marktree.h b/src/nvim/marktree.h
index 3e714bc196..bf653ee564 100644
--- a/src/nvim/marktree.h
+++ b/src/nvim/marktree.h
@@ -13,7 +13,7 @@
 #include "nvim/pos.h"
 #include "nvim/types.h"
 // only for debug functions:
-#include "api/private/defs.h"
+#include "nvim/api/private/defs.h"
 
 struct mtnode_s;
 
diff --git a/src/nvim/os/process.h b/src/nvim/os/process.h
index 61a5009fd8..3b116b4bad 100644
--- a/src/nvim/os/process.h
+++ b/src/nvim/os/process.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <stddef.h>
+#include <stddef.h>  // IWYU pragma: keep
 
-#include "nvim/api/private/defs.h"
+#ifdef MSWIN
+# include "nvim/api/private/defs.h"  // IWYU pragma: keep
+#endif
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/process.h.generated.h"
diff --git a/src/nvim/spellsuggest.h b/src/nvim/spellsuggest.h
index 0100e44b07..40e51a0f88 100644
--- a/src/nvim/spellsuggest.h
+++ b/src/nvim/spellsuggest.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nvim/garray_defs.h"  // IWYU pragma: export
+#include "nvim/garray_defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "spellsuggest.h.generated.h"
diff --git a/src/nvim/tui/terminfo.h b/src/nvim/tui/terminfo.h
index f435926dd7..039c722d25 100644
--- a/src/nvim/tui/terminfo.h
+++ b/src/nvim/tui/terminfo.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <unibilium.h>
+#include <unibilium.h>  // IWYU pragma: keep
 
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "tui/terminfo.h.generated.h"
diff --git a/src/nvim/winfloat.h b/src/nvim/winfloat.h
index c66f897ec0..876ea9ccea 100644
--- a/src/nvim/winfloat.h
+++ b/src/nvim/winfloat.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "nvim/api/private/defs.h"
-#include "nvim/buffer_defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
+#include "nvim/buffer_defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "winfloat.h.generated.h"