Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -59,13 +59,13 @@
 #elif defined(OF_THREADS)
 # import "threading.h"
 #endif
 
 struct pre_ivar {
+	int32_t	      retainCount;
 	void	      **memoryChunks;
 	unsigned int  memoryChunksSize;
-	int32_t	      retainCount;
 #if !defined(OF_ATOMIC_OPS) && defined(OF_THREADS)
 	of_spinlock_t retainCountSpinlock;
 #endif
 };
 

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -19,10 +19,14 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <sys/stat.h>
+
+#ifdef _WIN32
+# include <malloc.h>
+#endif
 
 #import "OFString.h"
 #import "OFString_UTF8.h"
 #import "OFArray.h"
 #import "OFDictionary.h"