6 files changed, 12 insertions, 12 deletions
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"