@@ -85,17 +85,17 @@
 	       OFHTTPServer.m		\
 	       OFKernelEventObserver.m	\
 	       OFStreamSocket.m		\
 	       OFTCPSocket.m		\
 	       OFUDPSocket.m		\
-	       resolver.m
+	       resolver.m		\
+	       socket.m
 SRCS_THREADS = OFCondition.m		\
 	       OFMutex.m		\
 	       OFRecursiveMutex.m	\
 	       OFThreadPool.m
 
-INCLUDES_SOCKETS = socket.h
 INCLUDES_THREADS = threading.h
 INCLUDES := ${SRCS:.m=.h}			\
 	    OFCollection.h			\
 	    OFHash.h				\
 	    OFJSONRepresentation.h		\
@@ -109,11 +109,10 @@
 	    ${ATOMIC_H}				\
 	    block.h				\
 	    instance.h				\
 	    macros.h				\
 	    objfw-defs.h			\
-	    ${USE_INCLUDES_SOCKETS}		\
 	    ${USE_INCLUDES_THREADS}
 
 SRCS += OFArray_adjacent.m		\
 	OFArray_adjacentSubarray.m	\
 	OFCountedSet_hashtable.m	\