1 files changed, 15 insertions, 9 deletions
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 0d5a9b2c22..48184f8a18 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -10,7 +10,7 @@
  *             file COPYING are met.  Consult the file for details.
  */
 
-#include "ruby/3/config.h"
+#include "ruby/internal/config.h"
 
 /* AC_INCLUDES_DEFAULT */
 #include <stdio.h>
@@ -67,29 +67,35 @@
 # include <setjmpex.h>
 #endif
 
-#include "ruby/3/dllexport.h"
-#include "ruby/3/dosish.h"
-#include "ruby/3/xmalloc.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/xmalloc.h"
 #include "ruby/backward/2/assume.h"
 #include "ruby/backward/2/attributes.h"
 #include "ruby/backward/2/bool.h"
-#include "ruby/backward/2/extern.h"
-#include "ruby/backward/2/gcc_version_since.h"
 #include "ruby/backward/2/long_long.h"
 #include "ruby/backward/2/stdalign.h"
 #include "ruby/backward/2/stdarg.h"
+#include "ruby/internal/dosish.h"
 #include "ruby/missing.h"
 
+/**
+ * Asserts that the compilation unit includes  Ruby's CAPI.  This has been here
+ * since the very beginning (at least since version 0.49).
+ */
 #define RUBY
 
 #ifdef __GNUC__
+# /** This is expanded to nothing for non-GCC compilers. */
 # define RB_GNUC_EXTENSION __extension__
+# /** This is expanded to the passed token for non-GCC compilers. */
 # define RB_GNUC_EXTENSION_BLOCK(x) __extension__ ({ x; })
 #else
 # define RB_GNUC_EXTENSION
 # define RB_GNUC_EXTENSION_BLOCK(x) (x)
 #endif
 
+/** @cond INTERNAL_MACRO */
+
 /* :FIXME:  Can someone  tell us  why is  this macro  defined here?   @shyouhei
  * thinks this  is a  truly internal  macro but cannot  move around  because he
  * doesn't understand the reason of this arrangement. */
@@ -99,12 +105,12 @@
 #endif
 
 #if defined(__sparc)
-RUBY3_SYMBOL_EXPORT_BEGIN()
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 void rb_sparc_flush_register_windows(void);
-RUBY3_SYMBOL_EXPORT_END()
+RBIMPL_SYMBOL_EXPORT_END()
 # define FLUSH_REGISTER_WINDOWS rb_sparc_flush_register_windows()
 #else
 # define FLUSH_REGISTER_WINDOWS ((void)0)
 #endif
-
+/** @endcond */
 #endif /* RUBY_DEFINES_H */