Revert "Minimize the changes in #5277"

This reverts commit dc51d89ac22acc60b9bfeed87115863565b74085.

16 files changed, 19 insertions, 1 deletions

diff --git a/src/backtrace.c b/src/backtrace.c
index 65404d23a..70c82e2d1 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -14,6 +14,7 @@
 #include <mruby/error.h>
 #include <mruby/numeric.h>
 #include <mruby/data.h>
+#include <mruby/presym.h>
 
 struct backtrace_location {
   int32_t lineno;
diff --git a/src/class.c b/src/class.c
index 287d63da3..126ac0004 100644
--- a/src/class.c
+++ b/src/class.c
@@ -17,6 +17,7 @@
 #include <mruby/data.h>
 #include <mruby/istruct.h>
 #include <mruby/opcode.h>
+#include <mruby/presym.h>
 
 union mt_ptr {
   struct RProc *proc;
diff --git a/src/dump.c b/src/dump.c
index d18ffebdc..216701ba8 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -1216,7 +1216,10 @@ mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, FILE
   if (fp == NULL || initname == NULL || initname[0] == '\0') {
     return MRB_DUMP_INVALID_ARGUMENT;
   }
-  if (fprintf(fp, "#include <mruby.h>\n" "#include <mruby/proc.h>\n\n") < 0) {
+  if (fprintf(fp, "#include <mruby.h>\n"
+                  "#include <mruby/proc.h>\n"
+                  "#include <mruby/presym.h>\n"
+                  "\n") < 0) {
     return MRB_DUMP_WRITE_FAULT;
   }
   fputs("#define mrb_BRACED(...) {__VA_ARGS__}\n", fp);
diff --git a/src/error.c b/src/error.c
index 4f7ca8641..d2f1c27ac 100644
--- a/src/error.c
+++ b/src/error.c
@@ -16,6 +16,7 @@
 #include <mruby/error.h>
 #include <mruby/class.h>
 #include <mruby/throw.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_value
 mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len)
diff --git a/src/gc.c b/src/gc.c
index 5943a0e3b..98a2237d5 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -22,6 +22,7 @@
 #include <mruby/gc.h>
 #include <mruby/error.h>
 #include <mruby/throw.h>
+#include <mruby/presym.h>
 
 /*
   = Tri-color Incremental Garbage Collection
diff --git a/src/hash.c b/src/hash.c
index 3c9c2f484..289f02a91 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -11,6 +11,7 @@
 #include <mruby/hash.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/presym.h>
 
 /*
  * === Glossary
diff --git a/src/kernel.c b/src/kernel.c
index 36ed0c121..05d7c7c84 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -13,6 +13,7 @@
 #include <mruby/variable.h>
 #include <mruby/error.h>
 #include <mruby/istruct.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func)
diff --git a/src/numeric.c b/src/numeric.c
index 59136bece..cef6fac96 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -17,6 +17,7 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
 #ifndef MRB_NO_FLOAT
 #ifdef MRB_USE_FLOAT32
diff --git a/src/object.c b/src/object.c
index bf4d743ff..d6474ae97 100644
--- a/src/object.c
+++ b/src/object.c
@@ -9,6 +9,7 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
diff --git a/src/print.c b/src/print.c
index 68b2aad91..607eb9d1f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -8,6 +8,7 @@
 #include <mruby/string.h>
 #include <mruby/variable.h>
 #include <mruby/error.h>
+#include <mruby/presym.h>
 #include <string.h>
 
 #ifndef MRB_NO_STDIO
diff --git a/src/proc.c b/src/proc.c
index 72d7ad120..870d5ea16 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -9,6 +9,7 @@
 #include <mruby/proc.h>
 #include <mruby/opcode.h>
 #include <mruby/data.h>
+#include <mruby/presym.h>
 
 static const mrb_code call_iseq[] = {
   OP_CALL,
diff --git a/src/range.c b/src/range.c
index f3f02a010..a109257c0 100644
--- a/src/range.c
+++ b/src/range.c
@@ -9,6 +9,7 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/array.h>
+#include <mruby/presym.h>
 
 #define RANGE_INITIALIZED_MASK 1
 #define RANGE_INITIALIZED(p) ((p)->flags |= RANGE_INITIALIZED_MASK)
diff --git a/src/string.c b/src/string.c
index 83401b3db..eb4136b10 100644
--- a/src/string.c
+++ b/src/string.c
@@ -22,6 +22,7 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 
 typedef struct mrb_shared_string {
   int refcnt;
diff --git a/src/symbol.c b/src/symbol.c
index 29d8a491b..0ea99533e 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -11,6 +11,7 @@
 #include <mruby/string.h>
 #include <mruby/dump.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
 #ifndef MRB_NO_PRESYM
 
diff --git a/src/variable.c b/src/variable.c
index 9343a2bf5..d5a7d90c7 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -10,6 +10,7 @@
 #include <mruby/proc.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/presym.h>
 
 struct iv_elem {
   mrb_sym key;
diff --git a/src/vm.c b/src/vm.c
index dd18ed44d..7a5365ebe 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -24,6 +24,7 @@
 #include "value_array.h"
 #include <mruby/throw.h>
 #include <mruby/dump.h>
+#include <mruby/presym.h>
 
 #ifdef MRB_NO_STDIO
 #if defined(__cplusplus)