diff --git a/mrbgems/hal-win-socket/src/socket_hal.c b/mrbgems/hal-win-socket/src/socket_hal.c
index cfd467b34..3acda0b5e 100644
--- a/mrbgems/hal-win-socket/src/socket_hal.c
+++ b/mrbgems/hal-win-socket/src/socket_hal.c
@@ -7,19 +7,20 @@
 ** Supported platforms: Windows, MinGW
 */
 
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501 // need Windows XP or later
+#endif
+
 #include <mruby.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
 #include <mruby/error.h>
 #include <mruby/presym.h>
 #include "socket_hal.h"
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
+#include <errno.h>
 #include <string.h>
 
 /*
diff --git a/mrbgems/mruby-dir/mrbgem.rake b/mrbgems/mruby-dir/mrbgem.rake
index 08985cfc4..b31b7cdcc 100644
--- a/mrbgems/mruby-dir/mrbgem.rake
+++ b/mrbgems/mruby-dir/mrbgem.rake
@@ -11,10 +11,10 @@ MRuby::Gem::Specification.new('mruby-dir') do |spec|
     elsif spec.build.primary_toolchain == 'visualcpp'
       # Visual C++ on Windows - use native Windows HAL
       'hal-win-dir'
-    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
-      'hal-posix-dir'
     elsif spec.for_windows?
       'hal-win-dir'
+    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
+      'hal-posix-dir'
     else
       nil
     end
diff --git a/mrbgems/mruby-io/mrbgem.rake b/mrbgems/mruby-io/mrbgem.rake
index 74ae70520..6639b6bd0 100644
--- a/mrbgems/mruby-io/mrbgem.rake
+++ b/mrbgems/mruby-io/mrbgem.rake
@@ -13,10 +13,10 @@ MRuby::Gem::Specification.new('mruby-io') do |spec|
     suggested_hal = if spec.build.primary_toolchain == 'visualcpp'
       # Visual C++ on Windows - use native Windows HAL
       'hal-win-io'
-    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
-      'hal-posix-io'
     elsif spec.for_windows?
       'hal-win-io'
+    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
+      'hal-posix-io'
     else
       nil
     end
diff --git a/mrbgems/mruby-socket/mrbgem.rake b/mrbgems/mruby-socket/mrbgem.rake
index b99643c15..b077fcc8c 100644
--- a/mrbgems/mruby-socket/mrbgem.rake
+++ b/mrbgems/mruby-socket/mrbgem.rake
@@ -16,10 +16,10 @@ MRuby::Gem::Specification.new('mruby-socket') do |spec|
     suggested_hal = if spec.build.primary_toolchain == 'visualcpp'
       # Visual C++ on Windows - use native Windows HAL
       'hal-win-socket'
-    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
-      'hal-posix-socket'
     elsif spec.for_windows?
       'hal-win-socket'
+    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
+      'hal-posix-socket'
     else
       nil
     end
diff --git a/mrbgems/mruby-task/mrbgem.rake b/mrbgems/mruby-task/mrbgem.rake
index 7f3adc66f..ea5daea57 100644
--- a/mrbgems/mruby-task/mrbgem.rake
+++ b/mrbgems/mruby-task/mrbgem.rake
@@ -18,10 +18,10 @@ MRuby::Gem::Specification.new('mruby-task') do |spec|
           RUBY_PLATFORM =~ /mingw/
       # MinGW provides POSIX I/O but NOT POSIX signals - use Windows HAL
       'hal-win-task'
-    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
-      'hal-posix-task'
     elsif spec.for_windows?
       'hal-win-task'
+    elsif RUBY_PLATFORM =~ /linux|darwin|bsd/
+      'hal-posix-task'
     else
       nil
     end