build(iwyu): add a few more _defs.h mappings (#25435)

7 files changed, 4 insertions, 6 deletions

diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index c95b5defaa..400284606f 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -33,7 +33,6 @@
 #include "nvim/globals.h"
 #include "nvim/log.h"
 #include "nvim/macros.h"
-#include "nvim/main.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option_defs.h"
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 6310b90f04..d4ca31aa54 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -11,7 +11,6 @@
 #include "nvim/api/private/defs.h"
 #include "nvim/ascii.h"
 #include "nvim/autocmd.h"
-#include "nvim/buffer_defs.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/multiqueue.h"
 #include "nvim/event/rstream.h"
@@ -26,6 +25,7 @@
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/option_defs.h"
 #include "nvim/os/input.h"
+#include "nvim/os/os_defs.h"
 #include "nvim/os/time.h"
 #include "nvim/profile.h"
 #include "nvim/rbuffer.h"
diff --git a/src/nvim/os/input.h b/src/nvim/os/input.h
index 6f25efdc7b..af17aabd90 100644
--- a/src/nvim/os/input.h
+++ b/src/nvim/os/input.h
@@ -6,6 +6,7 @@
 
 #include "nvim/api/private/defs.h"
 #include "nvim/event/multiqueue.h"
+#include "nvim/macros.h"
 
 EXTERN bool used_stdin INIT(= false);
 
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 9b7b013edf..be5c6be222 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -11,7 +11,6 @@
 #include "auto/config.h"
 #include "klib/kvec.h"
 #include "nvim/ascii.h"
-#include "nvim/buffer_defs.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
 #include "nvim/eval/typval_defs.h"
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index 56fd2125c2..4c4ac9df1e 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -9,7 +9,6 @@
 #endif
 
 #include "nvim/autocmd.h"
-#include "nvim/buffer_defs.h"
 #include "nvim/eval.h"
 #include "nvim/event/signal.h"
 #include "nvim/globals.h"
diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c
index b129eb445a..fa474b67dd 100644
--- a/src/nvim/os/stdpaths.c
+++ b/src/nvim/os/stdpaths.c
@@ -1,11 +1,13 @@
 // 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 <stdbool.h>
 #include <string.h>
 
 #include "nvim/ascii.h"
 #include "nvim/fileio.h"
+#include "nvim/globals.h"
 #include "nvim/memory.h"
 #include "nvim/os/os.h"
 #include "nvim/os/stdpaths_defs.h"
diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c
index 0c3b254b9a..ac98f0cf9a 100644
--- a/src/nvim/os/time.c
+++ b/src/nvim/os/time.c
@@ -4,7 +4,6 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -15,7 +14,6 @@
 #include "nvim/gettext.h"
 #include "nvim/globals.h"
 #include "nvim/log.h"
-#include "nvim/macros.h"
 #include "nvim/main.h"
 #include "nvim/memory.h"
 #include "nvim/os/input.h"