10 files changed, 42 insertions, 42 deletions
diff --git a/include/ruby/backward/2/assume.h b/include/ruby/backward/2/assume.h
index 095a43876d..54448895f0 100644
--- a/include/ruby/backward/2/assume.h
+++ b/include/ruby/backward/2/assume.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #ASSUME / #RB_LIKELY / #UNREACHABLE
  */
-#include "ruby/3/config.h"
-#include "ruby/3/assume.h"
-#include "ruby/3/has/builtin.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/assume.h"
+#include "ruby/impl/has/builtin.h"
 
 #undef  ASSUME             /* Kill config.h definition */
 #undef  UNREACHABLE        /* Kill config.h definition */
diff --git a/include/ruby/backward/2/attributes.h b/include/ruby/backward/2/attributes.h
index 043646eb4b..8bf72ba458 100644
--- a/include/ruby/backward/2/attributes.h
+++ b/include/ruby/backward/2/attributes.h
@@ -28,23 +28,23 @@
  * - A: Don't know.   Don't blame me.  Backward compatibility is  the key here.
  *      I'm just preserving what they have been.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/attr/alloc_size.h"
-#include "ruby/3/attr/cold.h"
-#include "ruby/3/attr/const.h"
-#include "ruby/3/attr/deprecated.h"
-#include "ruby/3/attr/error.h"
-#include "ruby/3/attr/forceinline.h"
-#include "ruby/3/attr/format.h"
-#include "ruby/3/attr/maybe_unused.h"
-#include "ruby/3/attr/noinline.h"
-#include "ruby/3/attr/nonnull.h"
-#include "ruby/3/attr/noreturn.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/attr/restrict.h"
-#include "ruby/3/attr/returns_nonnull.h"
-#include "ruby/3/attr/warning.h"
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/attr/alloc_size.h"
+#include "ruby/impl/attr/cold.h"
+#include "ruby/impl/attr/const.h"
+#include "ruby/impl/attr/deprecated.h"
+#include "ruby/impl/attr/error.h"
+#include "ruby/impl/attr/forceinline.h"
+#include "ruby/impl/attr/format.h"
+#include "ruby/impl/attr/maybe_unused.h"
+#include "ruby/impl/attr/noinline.h"
+#include "ruby/impl/attr/nonnull.h"
+#include "ruby/impl/attr/noreturn.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/attr/restrict.h"
+#include "ruby/impl/attr/returns_nonnull.h"
+#include "ruby/impl/attr/warning.h"
+#include "ruby/impl/has/attribute.h"
 
 /* function attributes */
 #undef CONSTFUNC
diff --git a/include/ruby/backward/2/bool.h b/include/ruby/backward/2/bool.h
index b2cca2a206..df3e5fdc07 100644
--- a/include/ruby/backward/2/bool.h
+++ b/include/ruby/backward/2/bool.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines old #TRUE / #FALSE
  */
-#include "ruby/3/stdbool.h"
+#include "ruby/impl/stdbool.h"
 
 #ifndef FALSE
 # define FALSE false
diff --git a/include/ruby/backward/2/extern.h b/include/ruby/backward/2/extern.h
index 697c593000..40d86c8cad 100644
--- a/include/ruby/backward/2/extern.h
+++ b/include/ruby/backward/2/extern.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines old #EXTERN
  */
-#include "ruby/3/config.h"      /* for STRINGIZE */
+#include "ruby/impl/config.h"      /* for STRINGIZE */
 
 /**
  * @brief      Synonym of #RUBY_EXTERN.
diff --git a/include/ruby/backward/2/gcc_version_since.h b/include/ruby/backward/2/gcc_version_since.h
index 03f767aedb..1db20f0e88 100644
--- a/include/ruby/backward/2/gcc_version_since.h
+++ b/include/ruby/backward/2/gcc_version_since.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines old #GCC_VERSION_SINCE
  */
-#include "ruby/3/compiler_since.h"
+#include "ruby/impl/compiler_since.h"
 
 #ifndef GCC_VERSION_SINCE
 #define GCC_VERSION_SINCE(x, y, z) RUBY3_COMPILER_SINCE(GCC, (x), (y), (z))
diff --git a/include/ruby/backward/2/inttypes.h b/include/ruby/backward/2/inttypes.h
index c6419bc7b3..ae52573665 100644
--- a/include/ruby/backward/2/inttypes.h
+++ b/include/ruby/backward/2/inttypes.h
@@ -20,13 +20,13 @@
  *             extension libraries. They could be written in C++98.
  * @brief      C99 shim for `<inttypes.h>`
  */
-#include "ruby/3/config.h"      /* PRI_LL_PREFIX etc. are here */
+#include "ruby/impl/config.h"      /* PRI_LL_PREFIX etc. are here */
 
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 
-#include "ruby/3/value.h"       /* PRI_VALUE_PREFIX is here. */
+#include "ruby/impl/value.h"       /* PRI_VALUE_PREFIX is here. */
 
 #ifndef PRI_INT_PREFIX
 # define PRI_INT_PREFIX ""
diff --git a/include/ruby/backward/2/limits.h b/include/ruby/backward/2/limits.h
index f003d86057..d728247000 100644
--- a/include/ruby/backward/2/limits.h
+++ b/include/ruby/backward/2/limits.h
@@ -23,7 +23,7 @@
  * The macros in this header file are obsolescent.  Does anyone really need our
  * own definition of #CHAR_BIT today?
  */
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
 
 #ifdef HAVE_LIMITS_H
 # include <limits.h>
diff --git a/include/ruby/backward/2/long_long.h b/include/ruby/backward/2/long_long.h
index 3b2261b71f..cb63dc676e 100644
--- a/include/ruby/backward/2/long_long.h
+++ b/include/ruby/backward/2/long_long.h
@@ -25,9 +25,9 @@
  * while  ago  (some  time  back  in  2013).   The  macros  are  for  backwards
  * compatibility only.
  */
-#include "ruby/3/config.h"
-#include "ruby/3/has/warning.h"
-#include "ruby/3/warning_push.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/has/warning.h"
+#include "ruby/impl/warning_push.h"
 
 #if RUBY3_HAS_WARNING("-Wc++11-long-long")
 # define HAVE_TRUE_LONG_LONG 1
diff --git a/include/ruby/backward/2/stdalign.h b/include/ruby/backward/2/stdalign.h
index bdea030a41..112421be23 100644
--- a/include/ruby/backward/2/stdalign.h
+++ b/include/ruby/backward/2/stdalign.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY_ALIGNAS / #RUBY_ALIGNOF
  */
-#include "ruby/3/stdalign.h"
+#include "ruby/impl/stdalign.h"
 
 #undef RUBY_ALIGNAS
 #undef RUBY_ALIGNOF
diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp
index c30ab46f43..3cc36c15d6 100644
--- a/include/ruby/backward/cxxanyargs.hpp
+++ b/include/ruby/backward/cxxanyargs.hpp
@@ -10,18 +10,18 @@
 ///             meant to  be a backwards  compatibility shim.  Please  stick to
 ///             C++ 98 and never use newer features, like `constexpr`.
 /// @brief      Provides old prototypes for C++ programs.
-#include "ruby/3/config.h"
-#include "ruby/3/intern/class.h"
-#include "ruby/3/intern/cont.h"
-#include "ruby/3/intern/hash.h"
-#include "ruby/3/intern/proc.h"
-#include "ruby/3/intern/thread.h"
-#include "ruby/3/intern/variable.h"
-#include "ruby/3/intern/vm.h"
-#include "ruby/3/iterator.h"
-#include "ruby/3/method.h"
-#include "ruby/3/value.h"
-#include "ruby/3/variable.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/intern/class.h"
+#include "ruby/impl/intern/cont.h"
+#include "ruby/impl/intern/hash.h"
+#include "ruby/impl/intern/proc.h"
+#include "ruby/impl/intern/thread.h"
+#include "ruby/impl/intern/variable.h"
+#include "ruby/impl/intern/vm.h"
+#include "ruby/impl/iterator.h"
+#include "ruby/impl/method.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/variable.h"
 #include "ruby/backward/2/stdarg.h"
 #include "ruby/st.h"