7 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/api/autocmd.c b/src/nvim/api/autocmd.c
index ab33bc6801..d2475150f7 100644
--- a/src/nvim/api/autocmd.c
+++ b/src/nvim/api/autocmd.c
@@ -10,6 +10,7 @@
 #include "nvim/api/autocmd.h"
 #include "nvim/api/keysets.h"
 #include "nvim/api/private/defs.h"
+#include "nvim/api/private/dispatch.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/validate.h"
 #include "nvim/autocmd.h"
diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c
index 98074da139..a05d75e3e6 100644
--- a/src/nvim/api/extmark.c
+++ b/src/nvim/api/extmark.c
@@ -8,6 +8,7 @@
 #include "nvim/api/extmark.h"
 #include "nvim/api/keysets.h"
 #include "nvim/api/private/defs.h"
+#include "nvim/api/private/dispatch.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/validate.h"
 #include "nvim/buffer_defs.h"
diff --git a/src/nvim/api/options.c b/src/nvim/api/options.c
index f151a635ab..6b9d3d1130 100644
--- a/src/nvim/api/options.c
+++ b/src/nvim/api/options.c
@@ -5,6 +5,7 @@
 #include "nvim/api/keysets.h"
 #include "nvim/api/options.h"
 #include "nvim/api/private/defs.h"
+#include "nvim/api/private/dispatch.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/validate.h"
 #include "nvim/autocmd.h"
diff --git a/src/nvim/api/private/dispatch.h b/src/nvim/api/private/dispatch.h
index 49332bfecc..0a651ebd1c 100644
--- a/src/nvim/api/private/dispatch.h
+++ b/src/nvim/api/private/dispatch.h
@@ -26,6 +26,6 @@ extern const MsgpackRpcRequestHandler method_handlers[];
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/private/dispatch.h.generated.h"
-# include "api/private/dispatch_wrappers.h.generated.h"
+# include "api/private/dispatch_wrappers.h.generated.h"  // IWYU pragma: export
 # include "keysets_defs.generated.h"
 #endif
diff --git a/src/nvim/api/ui.h b/src/nvim/api/ui.h
index ecfbb2d9f6..3d9152e0a4 100644
--- a/src/nvim/api/ui.h
+++ b/src/nvim/api/ui.h
@@ -10,5 +10,5 @@
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/ui.h.generated.h"
-# include "ui_events_remote.h.generated.h"
+# include "ui_events_remote.h.generated.h"  // IWYU pragma: export
 #endif
diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c
index bec369b907..ee9e75f183 100644
--- a/src/nvim/api/win_config.c
+++ b/src/nvim/api/win_config.c
@@ -5,6 +5,7 @@
 #include "nvim/api/extmark.h"
 #include "nvim/api/keysets.h"
 #include "nvim/api/private/defs.h"
+#include "nvim/api/private/dispatch.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/win_config.h"
 #include "nvim/ascii.h"
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 1fb7eaba95..44c1c5595c 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -5,6 +5,7 @@
 
 #include "nvim/api/keysets.h"
 #include "nvim/api/private/defs.h"
+#include "nvim/api/private/dispatch.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/validate.h"
 #include "nvim/api/window.h"