Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -37,11 +37,11 @@
 	    asprintf.h		\
 	    ${ATOMIC_H}		\
 	    objfw-defs.h	\
 	    ${THREADING_H}
 
-SRCS += ${AS_PRINTF_M} 		\
+SRCS += ${ASPRINTF_M} 		\
 	iso_8859_15.m		\
 	windows_1252.m		\
 	${OBJC_PROPERTIES_M}	\
 	${OBJC_SYNC_M}
 

Index: src/OFSocket.m
==================================================================
--- src/OFSocket.m
+++ src/OFSocket.m
@@ -11,16 +11,21 @@
 
 #include "config.h"
 
 #include <string.h>
 #include <fcntl.h>
+
+#ifndef _WIN32
+# include <sys/types.h>
+# include <sys/socket.h>
+#endif
 
 #import "OFSocket.h"
 #import "OFExceptions.h"
 
 #ifndef INVALID_SOCKET
-#define INVALID_SOCKET -1
+# define INVALID_SOCKET -1
 #endif
 
 @implementation OFSocket
 #ifdef _WIN32
 + (void)initialize

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -15,24 +15,25 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #if !defined(HAVE_THREADSAFE_GETADDRINFO) && !defined(_WIN32)
-#include <netinet/in.h>
+# include <netinet/in.h>
 #endif
 
 #import "OFTCPSocket.h"
 #import "OFString.h"
 #import "OFExceptions.h"
 #import "OFMacros.h"
 
 #ifndef INVALID_SOCKET
-#define INVALID_SOCKET -1
+# define INVALID_SOCKET -1
 #endif
 
 #if defined(OF_THREADS) && !defined(HAVE_THREADSAFE_GETADDRINFO)
-#import "OFThread.h"
+# import "OFThread.h"
+# import "OFDataArray.h"
 
 static OFMutex *mutex = nil;
 #endif
 
 @implementation OFTCPSocket

Index: src/threading.h
==================================================================
--- src/threading.h
+++ src/threading.h
@@ -9,11 +9,11 @@
  * the packaging of this file.
  */
 
 #import "OFMacros.h"
 
-#if !defined(OF_THREADS) || (!defined(OF_HAVE_PTHREADS) && defined(_WIN32))
+#if !defined(OF_THREADS) || (!defined(OF_HAVE_PTHREADS) && !defined(_WIN32))
 # error No threads available!
 #endif
 
 #if defined(OF_HAVE_PTHREADS)
 #include <pthread.h>