refactor: remove some unused includes (#19747)

- Remove autocmd.h from fileio.h
- Remove normal.h from main.h
- Move bufinfo_T from undo_defs.h to undo.c

23 files changed, 22 insertions, 21 deletions

diff --git a/src/nvim/api/autocmd.c b/src/nvim/api/autocmd.c
index bf6402f938..79ae7994f7 100644
--- a/src/nvim/api/autocmd.c
+++ b/src/nvim/api/autocmd.c
@@ -9,9 +9,9 @@
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/eval/typval.h"
-#include "nvim/fileio.h"
 #include "nvim/lua/executor.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 315df72a53..c466fc53e1 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -21,7 +21,6 @@
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/ex_eval.h"
 #include "nvim/extmark.h"
-#include "nvim/fileio.h"
 #include "nvim/highlight_group.h"
 #include "nvim/lib/kvec.h"
 #include "nvim/lua/executor.h"
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 657a18e0b6..7c187ca735 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -27,6 +27,7 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/ascii.h"
 #include "nvim/assert.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/buffer_updates.h"
 #include "nvim/change.h"
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 38f701ea7d..c7a300a5a6 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -30,7 +30,7 @@ typedef struct {
 #include "nvim/option_defs.h"
 // for jump list and tag stack sizes in a buffer and mark types
 #include "nvim/mark_defs.h"
-// for u_header_T; needs buf_T.
+// for u_header_T
 #include "nvim/undo_defs.h"
 // for hashtab_T
 #include "nvim/hashtab.h"
diff --git a/src/nvim/channel.c b/src/nvim/channel.c
index 20fae3a206..169f2dacde 100644
--- a/src/nvim/channel.c
+++ b/src/nvim/channel.c
@@ -4,14 +4,15 @@
 #include "nvim/api/private/converter.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/ui.h"
+#include "nvim/autocmd.h"
 #include "nvim/channel.h"
 #include "nvim/eval.h"
 #include "nvim/eval/encode.h"
 #include "nvim/event/socket.h"
-#include "nvim/fileio.h"
 #include "nvim/lua/executor.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/msgpack_rpc/server.h"
+#include "nvim/os/fs.h"
 #include "nvim/os/shell.h"
 #ifdef WIN32
 # include "nvim/os/os_win_console.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index ec580856f9..d483e22a30 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/change.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d377840c77..0cd2c7314d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -15,6 +15,7 @@
 #endif
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/change.h"
 #include "nvim/channel.h"
@@ -34,7 +35,6 @@
 #include "nvim/ex_eval.h"
 #include "nvim/ex_getln.h"
 #include "nvim/ex_session.h"
-#include "nvim/fileio.h"
 #include "nvim/getchar.h"
 #include "nvim/highlight_group.h"
 #include "nvim/lua/executor.h"
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index d164d5d0b3..4d9a1b7e3c 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/globals.h"
 #include "nvim/vim.h"
 #ifdef HAVE_LOCALE_H
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index fdc90d378a..176765e6ac 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -50,6 +50,7 @@
 #include <string.h>
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
 #include "nvim/file_search.h"
diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h
index 62d8b6142e..650977deac 100644
--- a/src/nvim/fileio.h
+++ b/src/nvim/fileio.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_FILEIO_H
 #define NVIM_FILEIO_H
 
-#include "nvim/autocmd.h"
 #include "nvim/buffer_defs.h"
 #include "nvim/eval/typval.h"
 #include "nvim/garray.h"
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index d8b7d7824e..cdd746d17d 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/main.h b/src/nvim/main.h
index d5384ecc95..0c497a7c0e 100644
--- a/src/nvim/main.h
+++ b/src/nvim/main.h
@@ -2,7 +2,6 @@
 #define NVIM_MAIN_H
 
 #include "nvim/event/loop.h"
-#include "nvim/normal.h"
 
 // Maximum number of commands from + or -c arguments.
 #define MAX_ARG_CMDS 10
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 087e64f3c0..593275d489 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -19,7 +19,6 @@
 #include "nvim/eval.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/extmark.h"
-#include "nvim/fileio.h"
 #include "nvim/fold.h"
 #include "nvim/mark.h"
 #include "nvim/mbyte.h"
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index b44276db33..8b8f709396 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -44,6 +44,7 @@
 #include <string.h>
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/change.h"
 #include "nvim/cursor.h"
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 4d00c0212e..2d473aa66b 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -617,6 +617,7 @@ char *arena_memdupz(Arena *arena, const char *buf, size_t size)
 
 #if defined(EXITFREE)
 
+# include "nvim/autocmd.h"
 # include "nvim/buffer.h"
 # include "nvim/charset.h"
 # include "nvim/cmdhist.h"
@@ -627,7 +628,6 @@ char *arena_memdupz(Arena *arena, const char *buf, size_t size)
 # include "nvim/ex_docmd.h"
 # include "nvim/ex_getln.h"
 # include "nvim/file_search.h"
-# include "nvim/fileio.h"
 # include "nvim/fold.h"
 # include "nvim/getchar.h"
 # include "nvim/mark.h"
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index cf52f58dc0..55bffe6fc5 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -24,7 +24,6 @@
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_getln.h"
 #include "nvim/extmark.h"
-#include "nvim/fileio.h"
 #include "nvim/fold.h"
 #include "nvim/getchar.h"
 #include "nvim/globals.h"
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 93d9497a11..98ef4bd0f6 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -10,7 +10,6 @@
 #include "nvim/charset.h"
 #include "nvim/eval.h"
 #include "nvim/ex_getln.h"
-#include "nvim/fileio.h"
 #include "nvim/macros.h"
 #include "nvim/map.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 8745ef8b37..bfe6d59dc6 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -8,9 +8,9 @@
 
 #include "nvim/api/private/defs.h"
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/rstream.h"
-#include "nvim/fileio.h"
 #include "nvim/getchar.h"
 #include "nvim/keycodes.h"
 #include "nvim/main.h"
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index 581f025a0f..e592570966 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -9,10 +9,10 @@
 #endif
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/eval.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/signal.h"
-#include "nvim/fileio.h"
 #include "nvim/globals.h"
 #include "nvim/log.h"
 #include "nvim/main.h"
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 16bf5c223d..1079533df2 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -14,6 +14,7 @@
 
 #include "nvim/api/private/helpers.h"
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
 #include "nvim/cursor_shape.h"
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 8a612294d0..dffcf89f2c 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -44,16 +44,15 @@
 
 #include "nvim/api/private/helpers.h"
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/change.h"
 #include "nvim/cursor.h"
-#include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/time.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_docmd.h"
-#include "nvim/fileio.h"
 #include "nvim/getchar.h"
 #include "nvim/highlight.h"
 #include "nvim/highlight_group.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index ab3fda95dc..1874958964 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -113,6 +113,12 @@
 #include "nvim/types.h"
 #include "nvim/undo.h"
 
+/// Structure passed around between undofile functions.
+typedef struct {
+  buf_T *bi_buf;
+  FILE *bi_fp;
+} bufinfo_T;
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "undo.c.generated.h"
 #endif
diff --git a/src/nvim/undo_defs.h b/src/nvim/undo_defs.h
index d8470b07b1..4b64f97919 100644
--- a/src/nvim/undo_defs.h
+++ b/src/nvim/undo_defs.h
@@ -74,10 +74,4 @@ struct u_header {
 #define UH_EMPTYBUF 0x02        // buffer was empty
 #define UH_RELOAD   0x04        // buffer was reloaded
 
-/// Structure passed around between undofile functions.
-typedef struct {
-  buf_T *bi_buf;
-  FILE *bi_fp;
-} bufinfo_T;
-
 #endif  // NVIM_UNDO_DEFS_H