refactor: IWYU (#27186)

20 files changed, 31 insertions, 17 deletions

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 7e79087f10..7af2b7241c 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -32,7 +32,7 @@
 #include "nvim/mapping.h"
 #include "nvim/mark.h"
 #include "nvim/mark_defs.h"
-#include "nvim/marktree.h"
+#include "nvim/marktree_defs.h"
 #include "nvim/memline.h"
 #include "nvim/memline_defs.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index 144573849c..4c5023d39a 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -1,11 +1,14 @@
 #pragma once
 
+#include <stdint.h>
+
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 #include "nvim/func_attr.h"
 #include "nvim/gettext_defs.h"  // IWYU pragma: keep
 #include "nvim/macros_defs.h"
+#include "nvim/marktree_defs.h"
 #include "nvim/types_defs.h"
 
 /// Values for buflist_getfile()
diff --git a/src/nvim/change.c b/src/nvim/change.c
index 9103b43a24..fa098a3220 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -33,7 +33,7 @@
 #include "nvim/macros_defs.h"
 #include "nvim/mark.h"
 #include "nvim/mark_defs.h"
-#include "nvim/marktree.h"
+#include "nvim/marktree_defs.h"
 #include "nvim/mbyte.h"
 #include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index 3d31061d4c..e93e658f1e 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -13,6 +13,7 @@
 #include "nvim/globals.h"
 #include "nvim/mark.h"
 #include "nvim/mbyte.h"
+#include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/move.h"
diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c
index 7f1946ba05..8d9b234bbc 100644
--- a/src/nvim/decoration.c
+++ b/src/nvim/decoration.c
@@ -18,7 +18,6 @@
 #include "nvim/grid_defs.h"
 #include "nvim/highlight.h"
 #include "nvim/highlight_group.h"
-#include "nvim/map_defs.h"
 #include "nvim/marktree.h"
 #include "nvim/memory.h"
 #include "nvim/move.h"
@@ -673,8 +672,8 @@ int sign_item_cmp(const void *p1, const void *p2)
          ? n : (s2->sh->sign_add_id - s1->sh->sign_add_id);
 }
 
-const uint32_t sign_filter[4] = {[kMTMetaSignText] = kMTFilterSelect,
-                                 [kMTMetaSignHL] = kMTFilterSelect };
+static const uint32_t sign_filter[4] = {[kMTMetaSignText] = kMTFilterSelect,
+                                        [kMTMetaSignHL] = kMTFilterSelect };
 
 /// Return the sign attributes on the currently refreshed row.
 ///
@@ -761,7 +760,7 @@ DecorSignHighlight *decor_find_sign(DecorInline decor)
   }
 }
 
-const uint32_t signtext_filter[4] = {[kMTMetaSignText] = kMTFilterSelect };
+static const uint32_t signtext_filter[4] = {[kMTMetaSignText] = kMTFilterSelect };
 
 /// Count the number of signs in a range after adding/removing a sign, or to
 /// (re-)initialize a range in "b_signcols.count".
@@ -861,7 +860,7 @@ bool decor_redraw_eol(win_T *wp, DecorState *state, int *eol_attr, int eol_col)
   return has_virt_pos;
 }
 
-uint32_t lines_filter[4] = {[kMTMetaLines] = kMTFilterSelect };
+static const uint32_t lines_filter[4] = {[kMTMetaLines] = kMTFilterSelect };
 
 /// @param has_fold  whether line "lnum" has a fold, or kNone when not calculated yet
 int decor_virt_lines(win_T *wp, linenr_T lnum, VirtLines *lines, TriState has_fold)
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
index 62b937f810..0dd8d6398b 100644
--- a/src/nvim/drawline.c
+++ b/src/nvim/drawline.c
@@ -32,9 +32,10 @@
 #include "nvim/highlight_group.h"
 #include "nvim/indent.h"
 #include "nvim/mark_defs.h"
-#include "nvim/marktree.h"
+#include "nvim/marktree_defs.h"
 #include "nvim/match.h"
 #include "nvim/mbyte.h"
+#include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/move.h"
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
index a9bdafd58b..8d67def774 100644
--- a/src/nvim/drawscreen.c
+++ b/src/nvim/drawscreen.c
@@ -88,7 +88,7 @@
 #include "nvim/highlight_defs.h"
 #include "nvim/highlight_group.h"
 #include "nvim/insexpand.h"
-#include "nvim/marktree.h"
+#include "nvim/marktree_defs.h"
 #include "nvim/match.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 25d2c964ed..4dcf4d266d 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -41,7 +41,7 @@
 #include "nvim/mapping.h"
 #include "nvim/mark.h"
 #include "nvim/mark_defs.h"
-#include "nvim/marktree.h"
+#include "nvim/marktree_defs.h"
 #include "nvim/mbyte.h"
 #include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c
index 22d01084d4..e4a3e79726 100644
--- a/src/nvim/extmark.c
+++ b/src/nvim/extmark.c
@@ -39,6 +39,7 @@
 #include "nvim/map_defs.h"
 #include "nvim/marktree.h"
 #include "nvim/memline.h"
+#include "nvim/memory.h"
 #include "nvim/pos_defs.h"
 #include "nvim/types_defs.h"
 #include "nvim/undo.h"
diff --git a/src/nvim/grid.c b/src/nvim/grid.c
index 32b1d3f8eb..e0caa3841b 100644
--- a/src/nvim/grid.c
+++ b/src/nvim/grid.c
@@ -22,7 +22,6 @@
 #include "nvim/globals.h"
 #include "nvim/grid.h"
 #include "nvim/highlight.h"
-#include "nvim/highlight_defs.h"
 #include "nvim/log.h"
 #include "nvim/map_defs.h"
 #include "nvim/mbyte.h"
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index 8d97f2ca03..54aab72f81 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -25,6 +25,7 @@
 #include "nvim/indent_c.h"
 #include "nvim/mark_defs.h"
 #include "nvim/mbyte.h"
+#include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
diff --git a/src/nvim/mbyte.h b/src/nvim/mbyte.h
index be632ee834..2603f0df55 100644
--- a/src/nvim/mbyte.h
+++ b/src/nvim/mbyte.h
@@ -1,11 +1,13 @@
 #pragma once
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>  // IWYU pragma: keep
 #include <uv.h>  // IWYU pragma: keep
 
 #include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
+#include "nvim/func_attr.h"
 #include "nvim/macros_defs.h"
 #include "nvim/mbyte_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
diff --git a/src/nvim/memory.h b/src/nvim/memory.h
index 5aafeb1260..e98a5dc228 100644
--- a/src/nvim/memory.h
+++ b/src/nvim/memory.h
@@ -2,7 +2,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>  // IWYU pragma: keep
-#include <string.h>
 #include <time.h>  // IWYU pragma: keep
 
 #include "auto/config.h"
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index fe59ceb82a..b3f651296f 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -23,6 +23,7 @@
 #include "nvim/macros_defs.h"
 #include "nvim/mark_defs.h"
 #include "nvim/mbyte.h"
+#include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/menu.h"
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 7f5be88a88..d785be54e5 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -46,6 +46,7 @@
 #include "nvim/mark.h"
 #include "nvim/mark_defs.h"
 #include "nvim/mbyte.h"
+#include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
 #include "nvim/memline_defs.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index 87eec8d22d..678752eae5 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -19,6 +19,7 @@
 #include "nvim/mark_defs.h"
 #include "nvim/marktree.h"
 #include "nvim/mbyte.h"
+#include "nvim/mbyte_defs.h"
 #include "nvim/memline.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
@@ -76,7 +77,8 @@ int linetabsize(win_T *wp, linenr_T lnum)
   return win_linetabsize(wp, lnum, ml_get_buf(wp->w_buffer, lnum), (colnr_T)MAXCOL);
 }
 
-const uint32_t inline_filter[4] = {[kMTMetaInline] = kMTFilterSelect };
+static const uint32_t inline_filter[4] = {[kMTMetaInline] = kMTFilterSelect };
+
 /// Prepare the structure passed to charsize functions.
 ///
 /// "line" is the start of the line.
diff --git a/src/nvim/plines.h b/src/nvim/plines.h
index 30d3f671fa..461e79e3ad 100644
--- a/src/nvim/plines.h
+++ b/src/nvim/plines.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <stdbool.h>
-#include <stdint.h>  // IWYU pragma: keep
+#include <stdint.h>
 
+#include "nvim/func_attr.h"
 #include "nvim/marktree_defs.h"
-#include "nvim/mbyte_defs.h"
-#include "nvim/pos_defs.h"  // IWYU pragma: keep
+#include "nvim/pos_defs.h"
 #include "nvim/types_defs.h"
 
 typedef bool CSType;
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 35867d6ce3..d760fcf324 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <signal.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,6 +27,7 @@
 #include "nvim/log.h"
 #include "nvim/macros_defs.h"
 #include "nvim/main.h"
+#include "nvim/map_defs.h"
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/msgpack_rpc/channel.h"
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 316342c028..2744f68951 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <uv.h>
 
 #include "klib/kvec.h"
 #include "nvim/api/private/helpers.h"
@@ -31,6 +32,7 @@
 #include "nvim/option.h"
 #include "nvim/option_defs.h"
 #include "nvim/option_vars.h"
+#include "nvim/os/os_defs.h"
 #include "nvim/os/time.h"
 #include "nvim/state_defs.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 11ebbb9bf1..3eb0f1f2ec 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -67,7 +67,6 @@
 // Uncomment the next line for including the u_check() function.  This warns
 // for errors in the debug information.
 // #define U_DEBUG 1
-#include "nvim/marktree.h"
 #define UH_MAGIC 0x18dade       // value for uh_magic when in use
 #define UE_MAGIC 0xabc123       // value for ue_magic when in use
 
@@ -112,6 +111,7 @@
 #include "nvim/macros_defs.h"
 #include "nvim/mark.h"
 #include "nvim/mark_defs.h"
+#include "nvim/marktree_defs.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memline_defs.h"