14 files changed, 68 insertions, 68 deletions
diff --git a/include/ruby/impl/arithmetic/char.h b/include/ruby/impl/arithmetic/char.h
index 03afa0a406..7b6de911c0 100644
--- a/include/ruby/impl/arithmetic/char.h
+++ b/include/ruby/impl/arithmetic/char.h
@@ -20,14 +20,14 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `char` and Ruby's.
  */
-#include "ruby/3/arithmetic/int.h"  /* NUM2INT is here, but */
-#include "ruby/3/arithmetic/long.h" /* INT2FIX is here.*/
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/const.h"
-#include "ruby/3/attr/constexpr.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/core/rstring.h"
-#include "ruby/3/value_type.h"
+#include "ruby/impl/arithmetic/int.h"  /* NUM2INT is here, but */
+#include "ruby/impl/arithmetic/long.h" /* INT2FIX is here.*/
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/const.h"
+#include "ruby/impl/attr/constexpr.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/core/rstring.h"
+#include "ruby/impl/value_type.h"
 
 #define RB_NUM2CHR rb_num2char_inline
 #define NUM2CHR    RB_NUM2CHR
diff --git a/include/ruby/impl/arithmetic/double.h b/include/ruby/impl/arithmetic/double.h
index 4a37611a21..f41aa29103 100644
--- a/include/ruby/impl/arithmetic/double.h
+++ b/include/ruby/impl/arithmetic/double.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `double` and Ruby's.
  */
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
 
 #define NUM2DBL      rb_num2dbl
 #define RFLOAT_VALUE rb_float_value
diff --git a/include/ruby/impl/arithmetic/gid_t.h b/include/ruby/impl/arithmetic/gid_t.h
index 7c4c1b00ed..57efa3370a 100644
--- a/include/ruby/impl/arithmetic/gid_t.h
+++ b/include/ruby/impl/arithmetic/gid_t.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `gid_t` and Ruby's.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/long.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/long.h"
 
 #ifndef GIDT2NUM
 # define GIDT2NUM RB_LONG2NUM
diff --git a/include/ruby/impl/arithmetic/int.h b/include/ruby/impl/arithmetic/int.h
index 2ebf8081f9..ba6aede883 100644
--- a/include/ruby/impl/arithmetic/int.h
+++ b/include/ruby/impl/arithmetic/int.h
@@ -20,18 +20,18 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `int` and Ruby's.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/fixnum.h"
-#include "ruby/3/arithmetic/intptr_t.h"
-#include "ruby/3/arithmetic/long.h"
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/const.h"
-#include "ruby/3/attr/constexpr.h"
-#include "ruby/3/compiler_is.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/special_consts.h"
-#include "ruby/3/value.h"
-#include "ruby/3/warning_push.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/fixnum.h"
+#include "ruby/impl/arithmetic/intptr_t.h"
+#include "ruby/impl/arithmetic/long.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/const.h"
+#include "ruby/impl/attr/constexpr.h"
+#include "ruby/impl/compiler_is.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/special_consts.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/warning_push.h"
 #include "ruby/assert.h"
 
 #define RB_INT2NUM  rb_int2num_inline
diff --git a/include/ruby/impl/arithmetic/intptr_t.h b/include/ruby/impl/arithmetic/intptr_t.h
index 7eabf75a80..f6dc2bbd33 100644
--- a/include/ruby/impl/arithmetic/intptr_t.h
+++ b/include/ruby/impl/arithmetic/intptr_t.h
@@ -20,14 +20,14 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `intptr_t` and Ruby's.
  */
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
 
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
 
-#include "ruby/3/value.h"
-#include "ruby/3/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/dllexport.h"
 
 #define rb_int_new  rb_int2inum
 #define rb_uint_new rb_uint2inum
diff --git a/include/ruby/impl/arithmetic/long.h b/include/ruby/impl/arithmetic/long.h
index 3263c616b0..0874c6db7b 100644
--- a/include/ruby/impl/arithmetic/long.h
+++ b/include/ruby/impl/arithmetic/long.h
@@ -28,19 +28,19 @@
  *      understand the difference of `int`  and `long` when they designed those
  *      macros.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/fixnum.h"   /* FIXABLE */
-#include "ruby/3/arithmetic/intptr_t.h" /* rb_int2big etc.*/
-#include "ruby/3/assume.h"
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/cold.h"
-#include "ruby/3/attr/const.h"
-#include "ruby/3/attr/constexpr.h"
-#include "ruby/3/attr/noreturn.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/special_consts.h"      /* FIXNUM_FLAG */
-#include "ruby/3/value.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/fixnum.h"   /* FIXABLE */
+#include "ruby/impl/arithmetic/intptr_t.h" /* rb_int2big etc.*/
+#include "ruby/impl/assume.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/cold.h"
+#include "ruby/impl/attr/const.h"
+#include "ruby/impl/attr/constexpr.h"
+#include "ruby/impl/attr/noreturn.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/special_consts.h"      /* FIXNUM_FLAG */
+#include "ruby/impl/value.h"
 #include "ruby/assert.h"
 
 #define FIX2LONG     RB_FIX2LONG
diff --git a/include/ruby/impl/arithmetic/long_long.h b/include/ruby/impl/arithmetic/long_long.h
index 1dfe0f6f71..1dd5207b9a 100644
--- a/include/ruby/impl/arithmetic/long_long.h
+++ b/include/ruby/impl/arithmetic/long_long.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `long long` and Ruby's.
  */
-#include "ruby/3/value.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/special_consts.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/special_consts.h"
 #include "ruby/backward/2/long_long.h"
 
 #define RB_LL2NUM  rb_ll2inum
diff --git a/include/ruby/impl/arithmetic/mode_t.h b/include/ruby/impl/arithmetic/mode_t.h
index ea6386305a..c75200123b 100644
--- a/include/ruby/impl/arithmetic/mode_t.h
+++ b/include/ruby/impl/arithmetic/mode_t.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `mode_t` and Ruby's.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/int.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/int.h"
 
 #ifndef NUM2MODET
 # define NUM2MODET RB_NUM2INT
diff --git a/include/ruby/impl/arithmetic/off_t.h b/include/ruby/impl/arithmetic/off_t.h
index 03d0756257..c2a88b948f 100644
--- a/include/ruby/impl/arithmetic/off_t.h
+++ b/include/ruby/impl/arithmetic/off_t.h
@@ -20,10 +20,10 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `off_t` and Ruby's.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/int.h"
-#include "ruby/3/arithmetic/long.h"
-#include "ruby/3/arithmetic/long_long.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/int.h"
+#include "ruby/impl/arithmetic/long.h"
+#include "ruby/impl/arithmetic/long_long.h"
 #include "ruby/backward/2/long_long.h"
 
 #ifdef OFFT2NUM
diff --git a/include/ruby/impl/arithmetic/pid_t.h b/include/ruby/impl/arithmetic/pid_t.h
index e63d9e3049..e268793391 100644
--- a/include/ruby/impl/arithmetic/pid_t.h
+++ b/include/ruby/impl/arithmetic/pid_t.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `pid_t` and Ruby's.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/long.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/long.h"
 
 #ifndef PIDT2NUM
 # define PIDT2NUM RB_LONG2NUM
diff --git a/include/ruby/impl/arithmetic/short.h b/include/ruby/impl/arithmetic/short.h
index 4fb07a8d03..5eb92cff24 100644
--- a/include/ruby/impl/arithmetic/short.h
+++ b/include/ruby/impl/arithmetic/short.h
@@ -23,9 +23,9 @@
  * Shyouhei  wonders:  why  there  is   no  SHORT2NUM,  given  there  are  both
  * #USHORT2NUM and #CHR2FIX?
  */
-#include "ruby/3/value.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/special_consts.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/special_consts.h"
 
 #define RB_NUM2SHORT  rb_num2short_inline
 #define RB_NUM2USHORT rb_num2ushort
diff --git a/include/ruby/impl/arithmetic/size_t.h b/include/ruby/impl/arithmetic/size_t.h
index 848a3f1271..8e771921da 100644
--- a/include/ruby/impl/arithmetic/size_t.h
+++ b/include/ruby/impl/arithmetic/size_t.h
@@ -20,10 +20,10 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `size_t` and Ruby's.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/int.h"
-#include "ruby/3/arithmetic/long.h"
-#include "ruby/3/arithmetic/long_long.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/int.h"
+#include "ruby/impl/arithmetic/long.h"
+#include "ruby/impl/arithmetic/long_long.h"
 #include "ruby/backward/2/long_long.h"
 
 #if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
diff --git a/include/ruby/impl/arithmetic/st_data_t.h b/include/ruby/impl/arithmetic/st_data_t.h
index f9a28ce1db..ecd9097b9e 100644
--- a/include/ruby/impl/arithmetic/st_data_t.h
+++ b/include/ruby/impl/arithmetic/st_data_t.h
@@ -20,13 +20,13 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `st_data_t` and Ruby's.
  */
-#include "ruby/3/arithmetic/fixnum.h"
-#include "ruby/3/arithmetic/long.h"
-#include "ruby/3/attr/artificial.h"
-#include "ruby/3/attr/const.h"
-#include "ruby/3/attr/constexpr.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/arithmetic/fixnum.h"
+#include "ruby/impl/arithmetic/long.h"
+#include "ruby/impl/attr/artificial.h"
+#include "ruby/impl/attr/const.h"
+#include "ruby/impl/attr/constexpr.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/value.h"
 #include "ruby/assert.h"
 #include "ruby/st.h"
 
diff --git a/include/ruby/impl/arithmetic/uid_t.h b/include/ruby/impl/arithmetic/uid_t.h
index c49b79e934..4b2526d0f3 100644
--- a/include/ruby/impl/arithmetic/uid_t.h
+++ b/include/ruby/impl/arithmetic/uid_t.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Arithmetic conversion between C's `uid_t` and Ruby's.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/arithmetic/long.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/arithmetic/long.h"
 
 #ifndef UIDT2NUM
 # define UIDT2NUM RB_LONG2NUM