refactor: move Arena and ArenaMem to memory_defs.h (#26240)

16 files changed, 36 insertions, 26 deletions

diff --git a/src/nvim/api/autocmd.c b/src/nvim/api/autocmd.c
index c15095243d..15a76cb8b0 100644
--- a/src/nvim/api/autocmd.c
+++ b/src/nvim/api/autocmd.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <lauxlib.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -6,7 +7,6 @@
 #include <string.h>
 
 #include "klib/kvec.h"
-#include "lauxlib.h"
 #include "nvim/api/autocmd.h"
 #include "nvim/api/keysets.h"
 #include "nvim/api/private/defs.h"
diff --git a/src/nvim/api/autocmd.h b/src/nvim/api/autocmd.h
index 8aefd45793..c2ba59734f 100644
--- a/src/nvim/api/autocmd.h
+++ b/src/nvim/api/autocmd.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <stdint.h>
+#include <stdint.h>  // IWYU pragma: keep
 
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/autocmd.h.generated.h"
diff --git a/src/nvim/api/buffer.h b/src/nvim/api/buffer.h
index 0f18f5368e..927afe61d0 100644
--- a/src/nvim/api/buffer.h
+++ b/src/nvim/api/buffer.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <lauxlib.h>
+#include <lua.h>  // IWYU pragma: keep
+#include <stdint.h>  // IWYU pragma: keep
 
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 #include "nvim/buffer_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/api/command.c b/src/nvim/api/command.c
index e1691bb910..5e46797ca4 100644
--- a/src/nvim/api/command.c
+++ b/src/nvim/api/command.c
@@ -1,10 +1,10 @@
 #include <inttypes.h>
+#include <lauxlib.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "klib/kvec.h"
-#include "lauxlib.h"
 #include "nvim/api/command.h"
 #include "nvim/api/keysets.h"
 #include "nvim/api/private/defs.h"
@@ -15,7 +15,6 @@
 #include "nvim/autocmd.h"
 #include "nvim/buffer_defs.h"
 #include "nvim/cmdexpand_defs.h"
-#include "nvim/decoration.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
diff --git a/src/nvim/api/command.h b/src/nvim/api/command.h
index 78af5cbf64..7f8c35f89a 100644
--- a/src/nvim/api/command.h
+++ b/src/nvim/api/command.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include <stdint.h>  // IWYU pragma: keep
+
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
-#include "nvim/decoration.h"
-#include "nvim/ex_cmds.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/command.h.generated.h"
diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c
index 5112d2474d..28fcf7dd0f 100644
--- a/src/nvim/api/extmark.c
+++ b/src/nvim/api/extmark.c
@@ -1,10 +1,10 @@
 #include <assert.h>
+#include <lauxlib.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "klib/kvec.h"
-#include "lauxlib.h"
 #include "nvim/api/extmark.h"
 #include "nvim/api/keysets.h"
 #include "nvim/api/private/defs.h"
diff --git a/src/nvim/api/extmark.h b/src/nvim/api/extmark.h
index 88f1e9e8ad..d41a9828be 100644
--- a/src/nvim/api/extmark.h
+++ b/src/nvim/api/extmark.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include <stdint.h>  // IWYU pragma: keep
+
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
-#include "nvim/decoration.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
+#include "nvim/decoration_defs.h"  // IWYU pragma: keep
 #include "nvim/macros.h"
 #include "nvim/map.h"
 #include "nvim/types.h"
diff --git a/src/nvim/api/options.c b/src/nvim/api/options.c
index f1aa69f48b..4cd5359cab 100644
--- a/src/nvim/api/options.c
+++ b/src/nvim/api/options.c
@@ -1,5 +1,4 @@
 #include <assert.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
 
diff --git a/src/nvim/api/options.h b/src/nvim/api/options.h
index 79aeead205..2a7385eb56 100644
--- a/src/nvim/api/options.h
+++ b/src/nvim/api/options.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include <stdint.h>  // IWYU pragma: keep
+
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
-#include "nvim/option.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
+#include "nvim/option_defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/options.h.generated.h"
diff --git a/src/nvim/api/ui.h b/src/nvim/api/ui.h
index 0101e5d31b..ecfbb2d9f6 100644
--- a/src/nvim/api/ui.h
+++ b/src/nvim/api/ui.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <stdint.h>
+#include <stdint.h>  // IWYU pragma: keep
 
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
+#include "nvim/grid_defs.h"  // IWYU pragma: keep
+#include "nvim/highlight_defs.h"  // IWYU pragma: keep
 #include "nvim/map.h"
 #include "nvim/ui.h"
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index b4e9af491f..7279cb9b1a 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <inttypes.h>
+#include <lauxlib.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -8,7 +9,6 @@
 #include <string.h>
 
 #include "klib/kvec.h"
-#include "lauxlib.h"
 #include "nvim/api/buffer.h"
 #include "nvim/api/deprecated.h"
 #include "nvim/api/keysets.h"
diff --git a/src/nvim/api/vim.h b/src/nvim/api/vim.h
index 81cb563aaf..eb165f285f 100644
--- a/src/nvim/api/vim.h
+++ b/src/nvim/api/vim.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include <stdint.h>  // IWYU pragma: keep
+
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/vim.h.generated.h"
diff --git a/src/nvim/api/vimscript.h b/src/nvim/api/vimscript.h
index ee056999ed..d782f63aec 100644
--- a/src/nvim/api/vimscript.h
+++ b/src/nvim/api/vimscript.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include <stdint.h>  // IWYU pragma: keep
+
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/vimscript.h.generated.h"
diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c
index de26c1255c..8b9f73ae87 100644
--- a/src/nvim/api/win_config.c
+++ b/src/nvim/api/win_config.c
@@ -255,8 +255,8 @@ void nvim_win_set_config(Window window, Dict(float_config) *config, Error *err)
   }
 }
 
-Dictionary config_put_bordertext(Dictionary config, FloatConfig *fconfig,
-                                 BorderTextType bordertext_type)
+static Dictionary config_put_bordertext(Dictionary config, FloatConfig *fconfig,
+                                        BorderTextType bordertext_type)
 {
   VirtText vt;
   AlignTextPos align;
diff --git a/src/nvim/api/win_config.h b/src/nvim/api/win_config.h
index f9befa6806..36f0e2bcf7 100644
--- a/src/nvim/api/win_config.h
+++ b/src/nvim/api/win_config.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include <stdint.h>  // IWYU pragma: keep
+
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
-#include "nvim/buffer_defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/win_config.h.generated.h"
diff --git a/src/nvim/api/window.h b/src/nvim/api/window.h
index 1a3da7be75..0255193ac7 100644
--- a/src/nvim/api/window.h
+++ b/src/nvim/api/window.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nvim/api/keysets.h"
-#include "nvim/api/private/defs.h"
+#include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/window.h.generated.h"