diff --git a/ChangeLog b/ChangeLog
index f3e565f3a2..dc363a1e70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 19 16:22:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
+
 Fri Apr 19 14:57:44 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* re.c (rb_reg_to_s): remove redundant shy group.
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 46557682a7..c288408946 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -157,11 +157,16 @@ EOS
 end
 
   if try_link(<<EOF)
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#ifdef _WIN32
+# include <windows.h>
+# include <winsock.h>
+#endif
+# include <sys/types.h>
+# include <netdb.h>
+# include <string.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+#endif
 int
 main()
 {
@@ -175,10 +180,15 @@ EOF
 end
 
   if try_link(<<EOF)
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <windows.h>
+# include <winsock.h>
+#else
+# include <sys/types.h>
+# include <netdb.h>
+# include <string.h>
+# include <sys/socket.h>
+#endif
 int
 main()
 {