diff --git a/mrbgems/hal-posix-io/src/io_hal.c b/mrbgems/hal-posix-io/src/io_hal.c
index 2185e124a..fd4acb84f 100644
--- a/mrbgems/hal-posix-io/src/io_hal.c
+++ b/mrbgems/hal-posix-io/src/io_hal.c
@@ -8,7 +8,7 @@
 */
 
 #include <mruby.h>
-#include <io_hal.h>
+#include "io_hal.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/mrbgems/hal-posix-socket/src/socket_hal.c b/mrbgems/hal-posix-socket/src/socket_hal.c
index 858b0e9b7..831a0c8e3 100644
--- a/mrbgems/hal-posix-socket/src/socket_hal.c
+++ b/mrbgems/hal-posix-socket/src/socket_hal.c
@@ -12,7 +12,7 @@
 #include <mruby/class.h>
 #include <mruby/error.h>
 #include <mruby/presym.h>
-#include <socket_hal.h>
+#include "socket_hal.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/mrbgems/hal-win-io/src/io_hal.c b/mrbgems/hal-win-io/src/io_hal.c
index 6473ed43b..eb7e55779 100644
--- a/mrbgems/hal-win-io/src/io_hal.c
+++ b/mrbgems/hal-win-io/src/io_hal.c
@@ -8,7 +8,7 @@
 */
 
 #include <mruby.h>
-#include <io_hal.h>
+#include "io_hal.h"
 
 #include <windows.h>
 #include <io.h>
diff --git a/mrbgems/hal-win-socket/src/socket_hal.c b/mrbgems/hal-win-socket/src/socket_hal.c
index b24efaa2b..05bb7b83e 100644
--- a/mrbgems/hal-win-socket/src/socket_hal.c
+++ b/mrbgems/hal-win-socket/src/socket_hal.c
@@ -12,7 +12,7 @@
 #include <mruby/class.h>
 #include <mruby/error.h>
 #include <mruby/presym.h>
-#include <socket_hal.h>
+#include "socket_hal.h"
 
 #define _WIN32_WINNT 0x0501
 #include <winsock2.h>
diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c
index 1e71b8d43..1cc13ac2a 100644
--- a/mrbgems/mruby-io/src/file.c
+++ b/mrbgems/mruby-io/src/file.c
@@ -10,7 +10,7 @@
 #include <mruby/ext/io.h>
 #include <mruby/error.h>
 #include <mruby/presym.h>
-#include <io_hal.h>
+#include "io_hal.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/mrbgems/mruby-io/src/file_test.c b/mrbgems/mruby-io/src/file_test.c
index eb739ab12..51d0c27a4 100644
--- a/mrbgems/mruby-io/src/file_test.c
+++ b/mrbgems/mruby-io/src/file_test.c
@@ -9,7 +9,7 @@
 #include <mruby/ext/io.h>
 #include <mruby/error.h>
 #include <mruby/presym.h>
-#include <io_hal.h>
+#include "io_hal.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
index ff247346a..9c49fb7b2 100644
--- a/mrbgems/mruby-io/src/io.c
+++ b/mrbgems/mruby-io/src/io.c
@@ -13,7 +13,7 @@
 #include <mruby/error.h>
 #include <mruby/internal.h>
 #include <mruby/presym.h>
-#include <io_hal.h>
+#include "io_hal.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c
index ebe4a62e7..b0c1ce79e 100644
--- a/mrbgems/mruby-socket/src/socket.c
+++ b/mrbgems/mruby-socket/src/socket.c
@@ -39,7 +39,7 @@
 #include <mruby/presym.h>
 
 #include <mruby/ext/io.h>
-#include <socket_hal.h>
+#include "socket_hal.h"
 
 /* Address family information for compact lookup table */
 typedef struct {
diff --git a/mrbgems/mruby-task/src/task.c b/mrbgems/mruby-task/src/task.c
index c777ce692..498b83fc3 100644
--- a/mrbgems/mruby-task/src/task.c
+++ b/mrbgems/mruby-task/src/task.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "../include/task.h"
+#include "task.h"
 #include "task_hal.h"
 
 /*