Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -79,11 +79,11 @@
 #import "autorelease.h"
 #import "macros.h"
 
 #ifdef _WIN32
 # include <windows.h>
-# include <wchar.h>
+# include <direct.h>
 #endif
 
 #ifndef O_BINARY
 # define O_BINARY 0
 #endif

Index: src/OFINICategory.m
==================================================================
--- src/OFINICategory.m
+++ src/OFINICategory.m
@@ -315,11 +315,11 @@
 - (void)setDouble: (double)double_
 	   forKey: (OFString*)key
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[self setString: [OFString stringWithFormat: @"%lg", double_]
+	[self setString: [OFString stringWithFormat: @"%g", double_]
 		 forKey: key];
 
 	objc_autoreleasePoolPop(pool);
 }
 

Index: src/OFNumber.m
==================================================================
--- src/OFNumber.m
+++ src/OFNumber.m
@@ -1302,11 +1302,11 @@
 
 		[ret makeImmutable];
 
 		return ret;
 	case OF_NUMBER_DOUBLE:
-		ret = [OFMutableString stringWithFormat: @"%lg",
+		ret = [OFMutableString stringWithFormat: @"%g",
 							 _value.double_];
 
 		if (![ret containsString: @"."])
 			[ret appendString: @".0"];
 

Index: src/socket.h
==================================================================
--- src/socket.h
+++ src/socket.h
@@ -25,11 +25,16 @@
 #ifdef OF_HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
 
 #ifdef _WIN32
-# include <winsock2.h>
+# ifdef __MINGW32__
+#  include <_mingw.h>
+#  ifdef __MINGW64_VERSION_MAJOR
+#   include <winsock2.h>
+#  endif
+# endif
 # include <windows.h>
 # include <ws2tcpip.h>
 #endif
 
 #ifdef __wii__