Index: src/OFSocket.h
==================================================================
--- src/OFSocket.h
+++ src/OFSocket.h
@@ -21,11 +21,11 @@
 #import "OFStream.h"
 
 /*
  * Headers for Win32
  *
- * These must be imported after objc/Object and thus OFObject!
+ * These must be imported after objc/objc.h and thus OFObject!
  */
 #ifdef _WIN32
 #define _WIN32_WINNT 0x0501
 #include <winsock2.h>
 #include <ws2tcpip.h>

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -14,15 +14,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#ifndef HAVE_GETADDRINFO
-# include <stdlib.h>
-# ifndef _WIN32
-#  include <arpa/inet.h>
-# endif
+#if !defined(HAVE_THREADSAFE_GETADDRINFO) && !defined(_WIN32)
+#include <netinet/in.h>
 #endif
 
 #import "OFTCPSocket.h"
 #import "OFExceptions.h"
 #import "OFMacros.h"