diff --git a/mrbgems/mruby-io/include/mruby/ext/io.h b/mrbgems/mruby-io/include/mruby/io.h
similarity index 100%
rename from mrbgems/mruby-io/include/mruby/ext/io.h
rename to mrbgems/mruby-io/include/mruby/io.h
diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c
index f8d56ade6..06dfe9f7f 100644
--- a/mrbgems/mruby-io/src/file.c
+++ b/mrbgems/mruby-io/src/file.c
@@ -7,7 +7,7 @@
 #include <mruby/class.h>
 #include <mruby/data.h>
 #include <mruby/string.h>
-#include <mruby/ext/io.h>
+#include <mruby/io.h>
 #include <mruby/error.h>
 #include <mruby/presym.h>
 #include "io_hal.h"
diff --git a/mrbgems/mruby-io/src/file_test.c b/mrbgems/mruby-io/src/file_test.c
index 52c976905..6f1ad24f0 100644
--- a/mrbgems/mruby-io/src/file_test.c
+++ b/mrbgems/mruby-io/src/file_test.c
@@ -6,7 +6,7 @@
 #include <mruby/class.h>
 #include <mruby/data.h>
 #include <mruby/string.h>
-#include <mruby/ext/io.h>
+#include <mruby/io.h>
 #include <mruby/error.h>
 #include <mruby/presym.h>
 #include <mruby/internal.h>
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
index 16b16e0e5..36b7bd964 100644
--- a/mrbgems/mruby-io/src/io.c
+++ b/mrbgems/mruby-io/src/io.c
@@ -9,7 +9,7 @@
 #include <mruby/hash.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
-#include <mruby/ext/io.h>
+#include <mruby/io.h>
 #include <mruby/error.h>
 #include <mruby/internal.h>
 #include <mruby/presym.h>
diff --git a/mrbgems/mruby-io/test/mruby_io_test.c b/mrbgems/mruby-io/test/mruby_io_test.c
index 2f298ceb2..ea288ae5d 100644
--- a/mrbgems/mruby-io/test/mruby_io_test.c
+++ b/mrbgems/mruby-io/test/mruby_io_test.c
@@ -65,7 +65,7 @@ mkdtemp(char *temp)
 #include <mruby/error.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
-#include <mruby/ext/io.h>
+#include <mruby/io.h>
 
 static mrb_value
 mrb_io_test_io_setup(mrb_state *mrb, mrb_value self)
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c
index f3fa663d4..e010e60fd 100644
--- a/mrbgems/mruby-socket/src/socket.c
+++ b/mrbgems/mruby-socket/src/socket.c
@@ -38,7 +38,7 @@
 #include <mruby/internal.h>
 #include <mruby/presym.h>
 
-#include <mruby/ext/io.h>
+#include <mruby/io.h>
 #include "socket_hal.h"
 
 /* Address family information for compact lookup table */