Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -45,10 +45,18 @@
 
 #import "macros.h"
 #import "of_asprintf.h"
 #import "unicode.h"
 
+/*
+ * It seems strtod is buggy on Win32.
+ * However, the MinGW version __strtod seems to be ok.
+ */
+#ifdef _WIN32
+# define strtod __strtod
+#endif
+
 /* References for static linking */
 void _references_to_categories_of_OFString(void)
 {
 	_OFString_Hashing_reference = 1;
 	_OFString_JSONValue_reference = 1;

Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -21,18 +21,20 @@
 #include <math.h>
 
 #ifndef _WIN32
 # include <unistd.h>
 # include <sched.h>
-#else
-# include <windows.h>
 #endif
 
 #import "OFThread.h"
 #import "OFList.h"
 #import "OFDate.h"
 #import "OFAutoreleasePool.h"
+
+#ifdef _WIN32
+# include <windows.h>
+#endif
 
 #import "OFConditionBroadcastFailedException.h"
 #import "OFConditionSignalFailedException.h"
 #import "OFConditionStillWaitingException.h"
 #import "OFConditionWaitFailedException.h"