diff -uwrN aria2c-0.13.0.orig/configure.ac aria2c-0.13.0/configure.ac
--- aria2c-0.13.0.orig/configure.ac	Sat Mar  1 01:32:45 2008
+++ aria2c-0.13.0/configure.ac	Sun Mar  2 10:37:27 2008
@@ -12,7 +12,7 @@
 
 case "$target" in
 	*mingw*|*cygwin*)
-		WINSOCK_LIBS="-lws2_32"
+		WINSOCK_LIBS="-lws2_32 -lpthread"
 		AC_SUBST(WINSOCK_LIBS)
 		;;
 esac
diff -uwrN aria2c-0.13.0.orig/src/DHTRoutingTableDeserializer.cc aria2c-0.13.0/src/DHTRoutingTableDeserializer.cc
--- aria2c-0.13.0.orig/src/DHTRoutingTableDeserializer.cc	Wed Feb 20 18:19:55 2008
+++ aria2c-0.13.0/src/DHTRoutingTableDeserializer.cc	Sun Mar  2 10:25:38 2008
@@ -38,7 +38,7 @@
 #include "PeerMessageUtil.h"
 #include "DlAbortEx.h"
 #include "Logger.h"
-#include <arpa/inet.h>
+#include "a2netcompat.h"
 #include <cerrno>
 #include <cstring>
 #include <istream>
diff -uwrN aria2c-0.13.0.orig/src/DHTRoutingTableSerializer.cc aria2c-0.13.0/src/DHTRoutingTableSerializer.cc
--- aria2c-0.13.0.orig/src/DHTRoutingTableSerializer.cc	Wed Feb 20 18:19:55 2008
+++ aria2c-0.13.0/src/DHTRoutingTableSerializer.cc	Sun Mar  2 10:25:17 2008
@@ -38,7 +38,7 @@
 #include "DHTConstants.h"
 #include "PeerMessageUtil.h"
 #include "Logger.h"
-#include <arpa/inet.h>
+#include "a2netcompat.h"
 #include <cerrno>
 #include <cstring>
 #include <ostream>
diff -uwrN aria2c-0.13.0.orig/src/DownloadEngine.h aria2c-0.13.0/src/DownloadEngine.h
--- aria2c-0.13.0.orig/src/DownloadEngine.h	Sun Feb 10 21:07:08 2008
+++ aria2c-0.13.0/src/DownloadEngine.h	Sun Mar  2 09:35:41 2008
@@ -39,7 +39,7 @@
 #include "SharedHandle.h"
 #include "Command.h"
 #include <deque>
-#include <sys/select.h>
+#include "a2netcompat.h"
 
 namespace aria2 {
 
diff -uwrN aria2c-0.13.0.orig/src/PeerMessageUtil.h aria2c-0.13.0/src/PeerMessageUtil.h
--- aria2c-0.13.0.orig/src/PeerMessageUtil.h	Fri Feb  8 07:53:45 2008
+++ aria2c-0.13.0/src/PeerMessageUtil.h	Sun Mar  2 10:12:19 2008
@@ -38,6 +38,7 @@
 #include "common.h"
 #include <string>
 #include <utility>
+#include "a2netcompat.h"
 
 namespace aria2 {
 
diff -uwrN aria2c-0.13.0.orig/src/Platform.cc aria2c-0.13.0/src/Platform.cc
--- aria2c-0.13.0.orig/src/Platform.cc	Fri Feb  1 20:38:24 2008
+++ aria2c-0.13.0/src/Platform.cc	Sun Mar  2 10:00:52 2008
@@ -49,6 +49,8 @@
 #include <stdlib.h> /* _fmode */
 #include <fcntl.h> /*  _O_BINARY */
 
+namespace aria2 {
+
 Platform::Platform() {
   unsigned int _CRT_fmode = _O_BINARY;
   WSADATA wsaData;
@@ -61,5 +63,7 @@
 Platform::~Platform() {
   WSACleanup();
 }
+
+} // namespace aria2
 
 #endif // HAVE_WINSOCK2_H
diff -uwrN aria2c-0.13.0.orig/src/Platform.h aria2c-0.13.0/src/Platform.h
--- aria2c-0.13.0.orig/src/Platform.h	Fri Feb  1 20:38:24 2008
+++ aria2c-0.13.0/src/Platform.h	Sun Mar  2 10:01:51 2008
@@ -37,6 +37,8 @@
 
 #include "common.h"
 
+namespace aria2 {
+
 #ifdef HAVE_WINSOCK2_H
 
 class Platform {
@@ -47,5 +49,7 @@
 };
 
 #endif // HAVE_WINSOCK2_H
+
+} // namespace aria2
 
 #endif // _D_PLATFORM_H_
diff -uwrN aria2c-0.13.0.orig/src/SocketCore.h aria2c-0.13.0/src/SocketCore.h
--- aria2c-0.13.0.orig/src/SocketCore.h	Wed Feb 20 05:02:48 2008
+++ aria2c-0.13.0/src/SocketCore.h	Sun Mar  2 09:35:34 2008
@@ -36,7 +36,7 @@
 #define _D_SOCKET_CORE_H_
 
 #include "common.h"
-#include <sys/socket.h>
+#include "a2netcompat.h"
 #include <string>
 #include <utility>
 
diff -uwrN aria2c-0.13.0.orig/src/a2netcompat.h aria2c-0.13.0/src/a2netcompat.h
--- aria2c-0.13.0.orig/src/a2netcompat.h	Tue Aug 28 09:36:33 2007
+++ aria2c-0.13.0/src/a2netcompat.h	Sun Mar  2 10:13:58 2008
@@ -91,4 +91,25 @@
 # include "gai_strerror.h"
 #endif // HAVE_GAI_STRERROR
 
+#ifdef __MINGW32__
+# ifndef AI_PASSIVE
+#  define AI_PASSIVE	0x0020
+# endif // AI_PASSIVE
+# ifndef AI_NUMERICHOST
+#  define AI_NUMERICHOST	0x0008
+# endif // AI_NUMERICHOST
+# ifndef NI_NUMERICHOST
+#  define NI_NUMERICHOST	0x0008
+# endif // NI_NUMERICHOST
+# ifndef NI_NUMERICSERV
+#  define NI_NUMERICSERV	0x0020
+# endif // NI_NUMERICSERV
+# ifndef NI_MAXHOST
+#  define NI_MAXHOST	1025
+# endif // NI_MAXHOST
+# ifndef NI_MAXSERV
+#  define NI_MAXSERV	32
+# endif // NI_MAXSERV
+#endif // __MINGW32__
+
 #endif // _D_A2NETCOMPAT_H_
diff -uwrN aria2c-0.13.0.orig/src/common.h aria2c-0.13.0/src/common.h
--- aria2c-0.13.0.orig/src/common.h	Fri Feb  8 07:53:45 2008
+++ aria2c-0.13.0/src/common.h	Sun Mar  2 09:56:29 2008
@@ -35,6 +35,10 @@
 #ifndef _D_COMMON_H_
 #define _D_COMMON_H_
 
+#ifdef __MINGW32__
+# undef SIZE_MAX
+#endif // __MINGW32__
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff -uwrN aria2c-0.13.0.orig/src/gai_strerror.h aria2c-0.13.0/src/gai_strerror.h
--- aria2c-0.13.0.orig/src/gai_strerror.h	Tue Aug 28 09:36:33 2007
+++ aria2c-0.13.0/src/gai_strerror.h	Sun Mar  2 09:56:29 2008
@@ -33,6 +33,10 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#ifdef __MINGW32__
+# undef SIZE_MAX
+#endif // __MINGW32__
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif // HAVE_CONFIG_H
diff -uwrN aria2c-0.13.0.orig/src/getaddrinfo.h aria2c-0.13.0/src/getaddrinfo.h
--- aria2c-0.13.0.orig/src/getaddrinfo.h	Tue Aug 28 09:36:33 2007
+++ aria2c-0.13.0/src/getaddrinfo.h	Sun Mar  2 09:56:29 2008
@@ -33,6 +33,10 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#ifdef __MINGW32__
+# undef SIZE_MAX
+#endif // __MINGW32__
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif // HAVE_CONFIG_H
diff -uwrN aria2c-0.13.0.orig/src/gettimeofday.h aria2c-0.13.0/src/gettimeofday.h
--- aria2c-0.13.0.orig/src/gettimeofday.h	Tue Aug 28 09:36:33 2007
+++ aria2c-0.13.0/src/gettimeofday.h	Sun Mar  2 09:56:29 2008
@@ -36,6 +36,10 @@
 #ifndef _D_GETTIMEOFDAY_H
 #define _D_GETTIMEOFDAY_H 1
 
+#ifdef __MINGW32__
+# undef SIZE_MAX
+#endif // __MINGW32__
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif // HAVE_CONFIG_H
diff -uwrN aria2c-0.13.0.orig/src/inet_aton.h aria2c-0.13.0/src/inet_aton.h
--- aria2c-0.13.0.orig/src/inet_aton.h	Tue Aug 28 09:36:33 2007
+++ aria2c-0.13.0/src/inet_aton.h	Sun Mar  2 09:56:29 2008
@@ -40,6 +40,10 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#ifdef __MINGW32__
+# undef SIZE_MAX
+#endif // __MINGW32__
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif // HAVE_CONFIG_H
diff -uwrN aria2c-0.13.0.orig/src/timegm.h aria2c-0.13.0/src/timegm.h
--- aria2c-0.13.0.orig/src/timegm.h	Tue Aug 28 09:36:33 2007
+++ aria2c-0.13.0/src/timegm.h	Sun Mar  2 09:56:29 2008
@@ -34,6 +34,10 @@
 #ifndef _D_TIMEGM_H_
 #define _D_TIMEGM_H_
 
+#ifdef __MINGW32__
+# undef SIZE_MAX
+#endif // __MINGW32__
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif // HAVE_CONFIG_H