Merge pull request #20157 from dundargoc/build/iwyu

build: allow IWYU to fix includes for all .c files

4 files changed, 35 insertions, 15 deletions

diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 2089686e5e..9171f79c37 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -1,20 +1,32 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check
 // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/autocmd.h"
 #include "nvim/charset.h"
-#include "nvim/ex_docmd.h"
+#include "nvim/event/defs.h"
+#include "nvim/event/multiqueue.h"
+#include "nvim/globals.h"
+#include "nvim/log.h"
 #include "nvim/macros.h"
 #include "nvim/main.h"
+#include "nvim/map.h"
+#include "nvim/memory.h"
+#include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/tui/input.h"
+#include "nvim/tui/input_defs.h"
 #include "nvim/tui/tui.h"
-#include "nvim/vim.h"
 #ifdef MSWIN
 # include "nvim/os/os_win_console.h"
 #endif
diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h
index 0b60394850..5df108b107 100644
--- a/src/nvim/tui/input.h
+++ b/src/nvim/tui/input.h
@@ -2,10 +2,14 @@
 #define NVIM_TUI_INPUT_H
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <termkey.h>
+#include <uv.h>
 
+#include "nvim/event/loop.h"
 #include "nvim/event/stream.h"
 #include "nvim/event/time.h"
+#include "nvim/rbuffer.h"
 #include "nvim/tui/input_defs.h"
 #include "nvim/tui/tui.h"
 
diff --git a/src/nvim/tui/terminfo.c b/src/nvim/tui/terminfo.c
index 229e340dc3..0f6ae03d35 100644
--- a/src/nvim/tui/terminfo.c
+++ b/src/nvim/tui/terminfo.c
@@ -8,14 +8,16 @@
 #include <unibilium.h>
 
 #include "nvim/globals.h"
-#include "nvim/log.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option.h"
-#include "nvim/os/os.h"
 #include "nvim/tui/terminfo.h"
 #include "nvim/tui/terminfo_defs.h"
 
+#ifdef __FreeBSD__
+# include "nvim/os/os.h"
+#endif
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "tui/terminfo.c.generated.h"
 #endif
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index e2d37860c4..be7658616f 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -4,31 +4,35 @@
 // Terminal UI functions. Invoked (by ui_bridge.c) on the TUI thread.
 
 #include <assert.h>
-#include <limits.h>
+#include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unibilium.h>
 #include <uv.h>
-#if defined(HAVE_TERMIOS_H)
-# include <termios.h>
-#endif
 
+#include "auto/config.h"
 #include "klib/kvec.h"
-#include "nvim/api/private/helpers.h"
-#include "nvim/api/vim.h"
+#include "nvim/api/private/defs.h"
 #include "nvim/ascii.h"
+#include "nvim/event/defs.h"
 #include "nvim/event/loop.h"
+#include "nvim/event/multiqueue.h"
 #include "nvim/event/signal.h"
-#include "nvim/highlight.h"
+#include "nvim/event/stream.h"
+#include "nvim/globals.h"
+#include "nvim/grid_defs.h"
+#include "nvim/highlight_defs.h"
 #include "nvim/log.h"
 #include "nvim/main.h"
-#include "nvim/map.h"
+#include "nvim/mbyte.h"
 #include "nvim/memory.h"
+#include "nvim/message.h"
 #include "nvim/option.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/os/signal.h"
-#include "nvim/os/tty.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
 #ifdef MSWIN
@@ -36,8 +40,6 @@
 #endif
 #include "nvim/cursor_shape.h"
 #include "nvim/macros.h"
-#include "nvim/strings.h"
-#include "nvim/syntax.h"
 #include "nvim/tui/input.h"
 #include "nvim/tui/terminfo.h"
 #include "nvim/tui/tui.h"