13 files changed, 93 insertions, 93 deletions
diff --git a/include/ruby/impl/core/rarray.h b/include/ruby/impl/core/rarray.h
index added0c41c..63ebb09d60 100644
--- a/include/ruby/impl/core/rarray.h
+++ b/include/ruby/impl/core/rarray.h
@@ -20,19 +20,19 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RArray.
  */
-#include "ruby/3/arithmetic/long.h"
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/constexpr.h"
-#include "ruby/3/attr/maybe_unused.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/core/rbasic.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/fl_type.h"
-#include "ruby/3/rgengc.h"
-#include "ruby/3/stdbool.h"
-#include "ruby/3/value.h"
-#include "ruby/3/value_type.h"
+#include "ruby/impl/arithmetic/long.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/constexpr.h"
+#include "ruby/impl/attr/maybe_unused.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/core/rbasic.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/fl_type.h"
+#include "ruby/impl/rgengc.h"
+#include "ruby/impl/stdbool.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/value_type.h"
 #include "ruby/assert.h"
 
 #ifndef USE_TRANSIENT_HEAP
diff --git a/include/ruby/impl/core/rbasic.h b/include/ruby/impl/core/rbasic.h
index 4f6fa576aa..f1c05e57fb 100644
--- a/include/ruby/impl/core/rbasic.h
+++ b/include/ruby/impl/core/rbasic.h
@@ -20,15 +20,15 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RBasic.
  */
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/constexpr.h"
-#include "ruby/3/attr/forceinline.h"
-#include "ruby/3/attr/noalias.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/special_consts.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/constexpr.h"
+#include "ruby/impl/attr/forceinline.h"
+#include "ruby/impl/attr/noalias.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/special_consts.h"
+#include "ruby/impl/value.h"
 #include "ruby/assert.h"
 
 #define RBASIC(obj)          RUBY3_CAST((struct RBasic *)(obj))
diff --git a/include/ruby/impl/core/rbignum.h b/include/ruby/impl/core/rbignum.h
index 09a478c2f8..5adc82bee8 100644
--- a/include/ruby/impl/core/rbignum.h
+++ b/include/ruby/impl/core/rbignum.h
@@ -20,10 +20,10 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Routines to manipulate struct ::RBignum.
  */
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/value_type.h"
-#include "ruby/3/stdbool.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/value_type.h"
+#include "ruby/impl/stdbool.h"
 
 #define RBIGNUM_SIGN rb_big_sign
 
diff --git a/include/ruby/impl/core/rclass.h b/include/ruby/impl/core/rclass.h
index e492da5ae5..d9e08a3c75 100644
--- a/include/ruby/impl/core/rclass.h
+++ b/include/ruby/impl/core/rclass.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Routines to manipulate struct ::RClass.
  */
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/cast.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/cast.h"
 
 #define RMODULE_IS_OVERLAID              RMODULE_IS_OVERLAID
 #define RMODULE_IS_REFINEMENT            RMODULE_IS_REFINEMENT
diff --git a/include/ruby/impl/core/rdata.h b/include/ruby/impl/core/rdata.h
index 383785af4c..eac05dbf2e 100644
--- a/include/ruby/impl/core/rdata.h
+++ b/include/ruby/impl/core/rdata.h
@@ -20,21 +20,21 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RData.
  */
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
 
 #ifdef STDC_HEADERS
 # include <stddef.h>
 #endif
 
-#include "ruby/3/attr/deprecated.h"
-#include "ruby/3/attr/warning.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/core/rbasic.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/fl_type.h"
-#include "ruby/3/token_paste.h"
-#include "ruby/3/value.h"
-#include "ruby/3/value_type.h"
+#include "ruby/impl/attr/deprecated.h"
+#include "ruby/impl/attr/warning.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/core/rbasic.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/fl_type.h"
+#include "ruby/impl/token_paste.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/value_type.h"
 #include "ruby/defines.h"
 
 #ifdef RUBY_UNTYPED_DATA_WARNING
diff --git a/include/ruby/impl/core/rfile.h b/include/ruby/impl/core/rfile.h
index 0b12d7bba4..7c162bd9de 100644
--- a/include/ruby/impl/core/rfile.h
+++ b/include/ruby/impl/core/rfile.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RFile.
  */
-#include "ruby/3/core/rbasic.h"
-#include "ruby/3/cast.h"
+#include "ruby/impl/core/rbasic.h"
+#include "ruby/impl/cast.h"
 
 /* rb_io_t is in ruby/io.h.  The header file has historically not been included
  * into ruby/ruby.h.  We follow that tradition. */
diff --git a/include/ruby/impl/core/rhash.h b/include/ruby/impl/core/rhash.h
index e8f9901aa5..7cd0386c6f 100644
--- a/include/ruby/impl/core/rhash.h
+++ b/include/ruby/impl/core/rhash.h
@@ -32,14 +32,14 @@
  *
  * Shyouhei stopped thinking.  Let them be as is.
  */
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
 
 #ifdef STDC_HEADERS
 # include <stddef.h>
 #endif
 
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
 #if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY
 # include "ruby/backward.h"
 #endif
diff --git a/include/ruby/impl/core/rmatch.h b/include/ruby/impl/core/rmatch.h
index f89cea849c..f47b5d966d 100644
--- a/include/ruby/impl/core/rmatch.h
+++ b/include/ruby/impl/core/rmatch.h
@@ -20,13 +20,13 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RMatch.
  */
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/attr/returns_nonnull.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/core/rbasic.h"
-#include "ruby/3/value.h"
-#include "ruby/3/value_type.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/attr/returns_nonnull.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/core/rbasic.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/value_type.h"
 #include "ruby/assert.h"
 
 #define RMATCH(obj) RUBY3_CAST((struct RMatch *)(obj))
diff --git a/include/ruby/impl/core/robject.h b/include/ruby/impl/core/robject.h
index c6101af2d2..7464af74c6 100644
--- a/include/ruby/impl/core/robject.h
+++ b/include/ruby/impl/core/robject.h
@@ -20,18 +20,18 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RObject.
  */
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
 
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
 
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/fl_type.h"
-#include "ruby/3/value.h"
-#include "ruby/3/value_type.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/fl_type.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/value_type.h"
 
 #define ROBJECT(obj)          RUBY3_CAST((struct RObject *)(obj))
 #define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX
diff --git a/include/ruby/impl/core/rregexp.h b/include/ruby/impl/core/rregexp.h
index 0978c00c74..e40b8d19bd 100644
--- a/include/ruby/impl/core/rregexp.h
+++ b/include/ruby/impl/core/rregexp.h
@@ -20,13 +20,13 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RRegexp.
  */
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/core/rbasic.h"
-#include "ruby/3/core/rstring.h"
-#include "ruby/3/value.h"
-#include "ruby/3/value_type.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/core/rbasic.h"
+#include "ruby/impl/core/rstring.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/value_type.h"
 
 #define RREGEXP(obj)     RUBY3_CAST((struct RRegexp *)(obj))
 #define RREGEXP_PTR(obj) (RREGEXP(obj)->ptr)
diff --git a/include/ruby/impl/core/rstring.h b/include/ruby/impl/core/rstring.h
index 10104c7a55..df0b4c4fb3 100644
--- a/include/ruby/impl/core/rstring.h
+++ b/include/ruby/impl/core/rstring.h
@@ -20,16 +20,16 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RString.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/long.h"
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/core/rbasic.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/fl_type.h"
-#include "ruby/3/value_type.h"
-#include "ruby/3/warning_push.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/long.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/core/rbasic.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/fl_type.h"
+#include "ruby/impl/value_type.h"
+#include "ruby/impl/warning_push.h"
 #include "ruby/assert.h"
 
 #define RSTRING(obj)            RUBY3_CAST((struct RString *)(obj))
diff --git a/include/ruby/impl/core/rstruct.h b/include/ruby/impl/core/rstruct.h
index d474697e4e..4cbe643244 100644
--- a/include/ruby/impl/core/rstruct.h
+++ b/include/ruby/impl/core/rstruct.h
@@ -20,12 +20,12 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Routines to manipulate struct ::RStruct.
  */
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/value_type.h"
-#include "ruby/3/arithmetic/long.h"
-#include "ruby/3/arithmetic/int.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/value_type.h"
+#include "ruby/impl/arithmetic/long.h"
+#include "ruby/impl/arithmetic/int.h"
 #if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY
 # include "ruby/backward.h"
 #endif
diff --git a/include/ruby/impl/core/rtypeddata.h b/include/ruby/impl/core/rtypeddata.h
index d46fd5c519..548d316122 100644
--- a/include/ruby/impl/core/rtypeddata.h
+++ b/include/ruby/impl/core/rtypeddata.h
@@ -20,23 +20,23 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines struct ::RTypedData.
  */
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
 
 #ifdef STDC_HEADERS
 # include <stddef.h>
 #endif
 
-#include "ruby/3/assume.h"
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/core/rbasic.h"
-#include "ruby/3/core/rdata.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/error.h"
-#include "ruby/3/fl_type.h"
-#include "ruby/3/stdbool.h"
-#include "ruby/3/value_type.h"
+#include "ruby/impl/assume.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/core/rbasic.h"
+#include "ruby/impl/core/rdata.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/error.h"
+#include "ruby/impl/fl_type.h"
+#include "ruby/impl/stdbool.h"
+#include "ruby/impl/value_type.h"
 
 #define HAVE_TYPE_RB_DATA_TYPE_T     1
 #define HAVE_RB_DATA_TYPE_T_FUNCTION 1