1 files changed, 51 insertions, 17 deletions

diff --git a/inits.c b/inits.c
index 79a6cf014e..4988fa09d0 100644
--- a/inits.c
+++ b/inits.c
@@ -9,8 +9,10 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "internal/inits.h"
+#include "ruby.h"
 #include "builtin.h"
+static void Init_builtin_prelude(void);
 #include "prelude.rbinc"
 
 #define CALL(n) {void Init_##n(void); Init_##n();}
@@ -18,11 +20,8 @@
 void
 rb_call_inits(void)
 {
-#if USE_TRANSIENT_HEAP
-    CALL(TransientHeap);
-#endif
-    CALL(vm_postponed_job);
-    CALL(Method);
+    CALL(default_shapes);
+    CALL(Thread_Mutex);
     CALL(RandomSeedCore);
     CALL(encodings);
     CALL(sym);
@@ -35,7 +34,6 @@ rb_call_inits(void)
     CALL(String);
     CALL(Exception);
     CALL(eval);
-    CALL(safe);
     CALL(jump);
     CALL(Numeric);
     CALL(Bignum);
@@ -44,39 +42,75 @@ rb_call_inits(void)
     CALL(Hash);
     CALL(Struct);
     CALL(Regexp);
+    CALL(pack);
     CALL(transcode);
     CALL(marshal);
     CALL(Range);
     CALL(IO);
+    CALL(IO_Buffer)
     CALL(Dir);
     CALL(Time);
     CALL(Random);
-    CALL(signal);
     CALL(load);
+    CALL(Ruby_module);
+    CALL(Box);
     CALL(Proc);
     CALL(Binding);
     CALL(Math);
+    CALL(GC);
+    CALL(WeakMap);
     CALL(Enumerator);
+    CALL(Ractor);
     CALL(VM);
     CALL(ISeq);
     CALL(Thread);
-    CALL(process);
+    CALL(signal);
     CALL(Cont);
+    CALL(Fiber_Scheduler);
+    CALL(process);
     CALL(Rational);
     CALL(Complex);
+    CALL(MemoryView);
+    CALL(pathname);
     CALL(version);
+    CALL(vm_trace);
     CALL(vm_stack_canary);
-    CALL(gc_stress);
+    CALL(ast);
+    CALL(shape);
+    CALL(Prism);
+    CALL(unicode_version);
+    CALL(Set);
 
     // enable builtin loading
     CALL(builtin);
+}
 
-    CALL(GC);
-    CALL(IO_nonblock);
-    CALL(ast);
-    CALL(vm_trace);
-    CALL(pack);
-    CALL(warning);
-    load_prelude();
+void
+rb_call_builtin_inits(void)
+{
+#define BUILTIN(n) CALL(builtin_##n)
+    BUILTIN(jit_hook);
+    BUILTIN(yjit);
+    BUILTIN(zjit);
+    BUILTIN(kernel);
+    BUILTIN(gc);
+    BUILTIN(ractor);
+    BUILTIN(numeric);
+    BUILTIN(io);
+    BUILTIN(dir);
+    BUILTIN(ast);
+    BUILTIN(trace_point);
+    BUILTIN(pack);
+    BUILTIN(pathname_builtin);
+    BUILTIN(warning);
+    BUILTIN(array);
+    BUILTIN(hash);
+    BUILTIN(symbol);
+    BUILTIN(timev);
+    BUILTIN(thread_sync);
+    BUILTIN(nilclass);
+    BUILTIN(marshal);
+    BUILTIN(jit_undef);
+    Init_builtin_prelude();
 }
 #undef CALL