summaryrefslogtreecommitdiff
path: root/include/ruby/impl/intern
diff options
context:
space:
mode:
Diffstat (limited to 'include/ruby/impl/intern')
-rw-r--r--include/ruby/impl/intern/array.h4
-rw-r--r--include/ruby/impl/intern/bignum.h6
-rw-r--r--include/ruby/impl/intern/class.h4
-rw-r--r--include/ruby/impl/intern/compar.h4
-rw-r--r--include/ruby/impl/intern/complex.h6
-rw-r--r--include/ruby/impl/intern/cont.h6
-rw-r--r--include/ruby/impl/intern/dir.h4
-rw-r--r--include/ruby/impl/intern/enum.h4
-rw-r--r--include/ruby/impl/intern/enumerator.h10
-rw-r--r--include/ruby/impl/intern/error.h6
-rw-r--r--include/ruby/impl/intern/eval.h6
-rw-r--r--include/ruby/impl/intern/file.h4
-rw-r--r--include/ruby/impl/intern/gc.h4
-rw-r--r--include/ruby/impl/intern/hash.h4
-rw-r--r--include/ruby/impl/intern/io.h4
-rw-r--r--include/ruby/impl/intern/load.h4
-rw-r--r--include/ruby/impl/intern/marshal.h4
-rw-r--r--include/ruby/impl/intern/numeric.h4
-rw-r--r--include/ruby/impl/intern/object.h6
-rw-r--r--include/ruby/impl/intern/parse.h6
-rw-r--r--include/ruby/impl/intern/proc.h6
-rw-r--r--include/ruby/impl/intern/process.h8
-rw-r--r--include/ruby/impl/intern/random.h4
-rw-r--r--include/ruby/impl/intern/range.h4
-rw-r--r--include/ruby/impl/intern/rational.h6
-rw-r--r--include/ruby/impl/intern/re.h4
-rw-r--r--include/ruby/impl/intern/ruby.h4
-rw-r--r--include/ruby/impl/intern/select.h10
-rw-r--r--include/ruby/impl/intern/select/largesize.h6
-rw-r--r--include/ruby/impl/intern/select/posix.h6
-rw-r--r--include/ruby/impl/intern/select/win32.h10
-rw-r--r--include/ruby/impl/intern/signal.h6
-rw-r--r--include/ruby/impl/intern/sprintf.h6
-rw-r--r--include/ruby/impl/intern/string.h14
-rw-r--r--include/ruby/impl/intern/struct.h6
-rw-r--r--include/ruby/impl/intern/thread.h8
-rw-r--r--include/ruby/impl/intern/time.h6
-rw-r--r--include/ruby/impl/intern/variable.h6
-rw-r--r--include/ruby/impl/intern/vm.h6
39 files changed, 113 insertions, 113 deletions
diff --git a/include/ruby/impl/intern/array.h b/include/ruby/impl/intern/array.h
index bf7e1d9fab..9548fdee7b 100644
--- a/include/ruby/impl/intern/array.h
+++ b/include/ruby/impl/intern/array.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cArray.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/bignum.h b/include/ruby/impl/intern/bignum.h
index f4707f5b6d..acb44dd1d9 100644
--- a/include/ruby/impl/intern/bignum.h
+++ b/include/ruby/impl/intern/bignum.h
@@ -20,14 +20,14 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to so-called rb_cBignum.
*/
-#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"
#include "ruby/backward/2/long_long.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/class.h b/include/ruby/impl/intern/class.h
index 36b873f4df..ed46501450 100644
--- a/include/ruby/impl/intern/class.h
+++ b/include/ruby/impl/intern/class.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cClass/::rb_cModule.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
#include "ruby/backward/2/stdarg.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/compar.h b/include/ruby/impl/intern/compar.h
index 22240680c5..89547051ed 100644
--- a/include/ruby/impl/intern/compar.h
+++ b/include/ruby/impl/intern/compar.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_mComparable.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/complex.h b/include/ruby/impl/intern/complex.h
index ba9fe6c288..ca6429a7c0 100644
--- a/include/ruby/impl/intern/complex.h
+++ b/include/ruby/impl/intern/complex.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cComplex.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/arithmetic/long.h" /* INT2FIX is here. */
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/arithmetic/long.h" /* INT2FIX is here. */
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/cont.h b/include/ruby/impl/intern/cont.h
index a3c340bb0a..330e1403a5 100644
--- a/include/ruby/impl/intern/cont.h
+++ b/include/ruby/impl/intern/cont.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to rb_cFiber.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/iterator.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/iterator.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/dir.h b/include/ruby/impl/intern/dir.h
index 09bef100ac..b88c20a8ad 100644
--- a/include/ruby/impl/intern/dir.h
+++ b/include/ruby/impl/intern/dir.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cDir.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/enum.h b/include/ruby/impl/intern/enum.h
index 9dafad694a..4078570fc5 100644
--- a/include/ruby/impl/intern/enum.h
+++ b/include/ruby/impl/intern/enum.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_mEnumerable.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/enumerator.h b/include/ruby/impl/intern/enumerator.h
index acd01fca18..95a095dd1e 100644
--- a/include/ruby/impl/intern/enumerator.h
+++ b/include/ruby/impl/intern/enumerator.h
@@ -20,11 +20,11 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cEnumerator.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/intern/eval.h" /* rb_frame_this_func */
-#include "ruby/3/iterator.h" /* rb_block_given_p */
-#include "ruby/3/symbol.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/intern/eval.h" /* rb_frame_this_func */
+#include "ruby/impl/iterator.h" /* rb_block_given_p */
+#include "ruby/impl/symbol.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/error.h b/include/ruby/impl/intern/error.h
index a8b854c36b..a86910b7e9 100644
--- a/include/ruby/impl/intern/error.h
+++ b/include/ruby/impl/intern/error.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_eException.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/fl_type.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/fl_type.h"
#include "ruby/backward/2/assume.h"
#include "ruby/backward/2/attributes.h"
diff --git a/include/ruby/impl/intern/eval.h b/include/ruby/impl/intern/eval.h
index 3114d00bc0..69e5a0ed8a 100644
--- a/include/ruby/impl/intern/eval.h
+++ b/include/ruby/impl/intern/eval.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Pre-1.9 era evaluator APIs (now considered miscellaneous).
*/
-#include "ruby/3/attr/noreturn.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/noreturn.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/file.h b/include/ruby/impl/intern/file.h
index c87e59ea01..af3fd22e1c 100644
--- a/include/ruby/impl/intern/file.h
+++ b/include/ruby/impl/intern/file.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cFile.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/gc.h b/include/ruby/impl/intern/gc.h
index 81ff74839a..0f67a579e1 100644
--- a/include/ruby/impl/intern/gc.h
+++ b/include/ruby/impl/intern/gc.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_mGC.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
#include "ruby/backward/2/attributes.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/hash.h b/include/ruby/impl/intern/hash.h
index f8d0628b9b..a0c2382410 100644
--- a/include/ruby/impl/intern/hash.h
+++ b/include/ruby/impl/intern/hash.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cHash.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
#include "ruby/st.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/io.h b/include/ruby/impl/intern/io.h
index f53f14c02a..450af25839 100644
--- a/include/ruby/impl/intern/io.h
+++ b/include/ruby/impl/intern/io.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cIO.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/load.h b/include/ruby/impl/intern/load.h
index 6baf6b72b6..b0b230262f 100644
--- a/include/ruby/impl/intern/load.h
+++ b/include/ruby/impl/intern/load.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_f_require().
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/marshal.h b/include/ruby/impl/intern/marshal.h
index 2028b4520a..e4bbf846dd 100644
--- a/include/ruby/impl/intern/marshal.h
+++ b/include/ruby/impl/intern/marshal.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to rb_mMarshal.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/numeric.h b/include/ruby/impl/intern/numeric.h
index ad8d984944..cd8c83694a 100644
--- a/include/ruby/impl/intern/numeric.h
+++ b/include/ruby/impl/intern/numeric.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cNumeric.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
#include "ruby/backward/2/attributes.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/object.h b/include/ruby/impl/intern/object.h
index 502fbab908..6f09657131 100644
--- a/include/ruby/impl/intern/object.h
+++ b/include/ruby/impl/intern/object.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cObject.
*/
-#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"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/parse.h b/include/ruby/impl/intern/parse.h
index 9831bdc511..7b59188383 100644
--- a/include/ruby/impl/intern/parse.h
+++ b/include/ruby/impl/intern/parse.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cSymbol.
*/
-#include "ruby/3/attr/const.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/const.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/proc.h b/include/ruby/impl/intern/proc.h
index 1b66a3b26b..7000e268df 100644
--- a/include/ruby/impl/intern/proc.h
+++ b/include/ruby/impl/intern/proc.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cProc.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/iterator.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/iterator.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/process.h b/include/ruby/impl/intern/process.h
index 1f9c6a45c9..99f5244f66 100644
--- a/include/ruby/impl/intern/process.h
+++ b/include/ruby/impl/intern/process.h
@@ -20,10 +20,10 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_mProcess.
*/
-#include "ruby/3/attr/noreturn.h"
-#include "ruby/3/config.h" /* rb_pid_t is defined here. */
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/noreturn.h"
+#include "ruby/impl/config.h" /* rb_pid_t is defined here. */
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/random.h b/include/ruby/impl/intern/random.h
index 52bfeb0673..518eba6456 100644
--- a/include/ruby/impl/intern/random.h
+++ b/include/ruby/impl/intern/random.h
@@ -24,8 +24,8 @@
* generator", ACM Trans. on Modeling and Computer Simulation, 8
* (1): pp 3-30, 1998. https://doi.org/10.1145/272991.272995
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/range.h b/include/ruby/impl/intern/range.h
index 0ccb33abfb..c0a7297277 100644
--- a/include/ruby/impl/intern/range.h
+++ b/include/ruby/impl/intern/range.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cRange.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/rational.h b/include/ruby/impl/intern/rational.h
index fde0e37e19..f2cd292136 100644
--- a/include/ruby/impl/intern/rational.h
+++ b/include/ruby/impl/intern/rational.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cRational.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/arithmetic/long.h" /* INT2FIX is here. */
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/arithmetic/long.h" /* INT2FIX is here. */
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/re.h b/include/ruby/impl/intern/re.h
index cc1e2539ea..bdec97e208 100644
--- a/include/ruby/impl/intern/re.h
+++ b/include/ruby/impl/intern/re.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cRegexp.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/ruby.h b/include/ruby/impl/intern/ruby.h
index 730a032975..fbf4bf67b8 100644
--- a/include/ruby/impl/intern/ruby.h
+++ b/include/ruby/impl/intern/ruby.h
@@ -20,8 +20,8 @@
* extension libraries. They could be written in C++98.
* @brief Process-global APIs.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/select.h b/include/ruby/impl/intern/select.h
index c9c47d1a68..bdbb289b49 100644
--- a/include/ruby/impl/intern/select.h
+++ b/include/ruby/impl/intern/select.h
@@ -22,22 +22,22 @@
* @note Functions and structs defined in this header file are not
* necessarily ruby-specific. They don't need ::VALUE etc.
*/
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h> /* for NFDBITS (BSD Net/2) */
#endif
-#include "ruby/3/dllexport.h"
+#include "ruby/impl/dllexport.h"
/* thread.c */
#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)
-# include "ruby/3/intern/select/largesize.h"
+# include "ruby/impl/intern/select/largesize.h"
#elif defined(_WIN32)
-# include "ruby/3/intern/select/win32.h"
+# include "ruby/impl/intern/select/win32.h"
# define rb_fd_resize(n, f) ((void)(f))
#else
-# include "ruby/3/intern/select/posix.h"
+# include "ruby/impl/intern/select/posix.h"
# define rb_fd_resize(n, f) ((void)(f))
#endif
diff --git a/include/ruby/impl/intern/select/largesize.h b/include/ruby/impl/intern/select/largesize.h
index b54ac116dd..7822e90dbe 100644
--- a/include/ruby/impl/intern/select/largesize.h
+++ b/include/ruby/impl/intern/select/largesize.h
@@ -55,9 +55,9 @@
*
* So `rb_fd_set` doesn't reject file descriptors bigger than `FD_SETSIZE`.
*/
-#include "ruby/3/attr/nonnull.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/dllexport.h"
+#include "ruby/impl/attr/nonnull.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/dllexport.h"
/**@cond INTERNAL_MACRO */
#define rb_fd_ptr rb_fd_ptr
diff --git a/include/ruby/impl/intern/select/posix.h b/include/ruby/impl/intern/select/posix.h
index 156962c0bb..4e63b4c87a 100644
--- a/include/ruby/impl/intern/select/posix.h
+++ b/include/ruby/impl/intern/select/posix.h
@@ -20,7 +20,7 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs to provide ::rb_fd_select().
*/
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h> /* for select(2) (modern POSIX) */
@@ -30,8 +30,8 @@
# include <unistd.h> /* for select(2) (archaic UNIX) */
#endif
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/attr/const.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/attr/const.h"
typedef fd_set rb_fdset_t;
diff --git a/include/ruby/impl/intern/select/win32.h b/include/ruby/impl/intern/select/win32.h
index fb42b5e77d..85289072cb 100644
--- a/include/ruby/impl/intern/select/win32.h
+++ b/include/ruby/impl/intern/select/win32.h
@@ -20,11 +20,11 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs to provide ::rb_fd_select().
*/
-#include "ruby/3/dosish.h" /* for rb_w32_select */
-#include "ruby/3/attr/nonnull.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/attr/noalias.h"
-#include "ruby/3/dllexport.h"
+#include "ruby/impl/dosish.h" /* for rb_w32_select */
+#include "ruby/impl/attr/nonnull.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/attr/noalias.h"
+#include "ruby/impl/dllexport.h"
#include "ruby/assert.h"
/**@cond INTERNAL_MACRO */
diff --git a/include/ruby/impl/intern/signal.h b/include/ruby/impl/intern/signal.h
index 09a2f1df1b..2e7390a7e6 100644
--- a/include/ruby/impl/intern/signal.h
+++ b/include/ruby/impl/intern/signal.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Signal handling APIs.
*/
-#include "ruby/3/config.h" /* POSIX_SIGNAL / RETSIGTYPE */
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/config.h" /* POSIX_SIGNAL / RETSIGTYPE */
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/sprintf.h b/include/ruby/impl/intern/sprintf.h
index 908d88c691..68c3dcedc8 100644
--- a/include/ruby/impl/intern/sprintf.h
+++ b/include/ruby/impl/intern/sprintf.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Our own private printf(3).
*/
-#include "ruby/3/attr/format.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/format.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/string.h b/include/ruby/impl/intern/string.h
index 37e8d4d992..cab553ddb4 100644
--- a/include/ruby/impl/intern/string.h
+++ b/include/ruby/impl/intern/string.h
@@ -20,7 +20,7 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cString.
*/
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
#ifdef STDC_HEADERS
# include <stddef.h>
@@ -34,12 +34,12 @@
# include <stdint.h>
#endif
-#include "ruby/3/attr/nonnull.h"
-#include "ruby/3/attr/pure.h"
-#include "ruby/3/constant_p.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
-#include "ruby/3/variable.h" /* rb_gvar_setter_t */
+#include "ruby/impl/attr/nonnull.h"
+#include "ruby/impl/attr/pure.h"
+#include "ruby/impl/constant_p.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
+#include "ruby/impl/variable.h" /* rb_gvar_setter_t */
#include "ruby/st.h" /* st_index_t */
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/struct.h b/include/ruby/impl/intern/struct.h
index cf99d15747..281292dfed 100644
--- a/include/ruby/impl/intern/struct.h
+++ b/include/ruby/impl/intern/struct.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cStruct.
*/
-#include "ruby/3/dllexport.h"
-#include "ruby/3/intern/vm.h" /* rb_alloc_func_t */
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/intern/vm.h" /* rb_alloc_func_t */
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/thread.h b/include/ruby/impl/intern/thread.h
index afd63507f4..e35de61fba 100644
--- a/include/ruby/impl/intern/thread.h
+++ b/include/ruby/impl/intern/thread.h
@@ -20,10 +20,10 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cThread.
*/
-#include "ruby/3/config.h"
-#include "ruby/3/cast.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/config.h"
+#include "ruby/impl/cast.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/time.h b/include/ruby/impl/intern/time.h
index a895bc0848..cc9b689e9c 100644
--- a/include/ruby/impl/intern/time.h
+++ b/include/ruby/impl/intern/time.h
@@ -20,14 +20,14 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cTime.
*/
-#include "ruby/3/config.h"
+#include "ruby/impl/config.h"
#ifdef HAVE_TIME_H
# include <time.h> /* for time_t */
#endif
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/variable.h b/include/ruby/impl/intern/variable.h
index 7183219fc0..6885448e8b 100644
--- a/include/ruby/impl/intern/variable.h
+++ b/include/ruby/impl/intern/variable.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to names inside of a Ruby program.
*/
-#include "ruby/3/attr/noreturn.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/noreturn.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
#include "ruby/st.h"
RUBY3_SYMBOL_EXPORT_BEGIN()
diff --git a/include/ruby/impl/intern/vm.h b/include/ruby/impl/intern/vm.h
index 985971c28a..52a7a4619a 100644
--- a/include/ruby/impl/intern/vm.h
+++ b/include/ruby/impl/intern/vm.h
@@ -20,9 +20,9 @@
* extension libraries. They could be written in C++98.
* @brief Public APIs related to ::rb_cRubyVM.
*/
-#include "ruby/3/attr/noreturn.h"
-#include "ruby/3/dllexport.h"
-#include "ruby/3/value.h"
+#include "ruby/impl/attr/noreturn.h"
+#include "ruby/impl/dllexport.h"
+#include "ruby/impl/value.h"
RUBY3_SYMBOL_EXPORT_BEGIN()