@@ -12,34 +12,13 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS
-#endif
-#ifndef __STDC_CONSTANT_MACROS
-# define __STDC_CONSTANT_MACROS
-#endif
-
-#import "objfw-defs.h"
-
-#ifdef OF_HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
 #import "OFStreamSocket.h"
 
-#ifdef _WIN32
-# include <ws2tcpip.h>
-#endif
-
-#ifdef __wii__
-# define BOOL OGC_BOOL
-# include <network.h>
-# undef BOOL
-#endif
+#import "socket.h"
 
 /*! @file */
 
 @class OFTCPSocket;
 @class OFString;
@@ -76,11 +55,11 @@
  * To create a server, create a socket, bind it and listen on it.
  */
 @interface OFTCPSocket: OFStreamSocket
 {
 	bool _listening;
-	struct sockaddr_storage *_sockAddr;
+	struct sockaddr_storage _sockAddr;
 	socklen_t _sockAddrLen;
 	OFString *_SOCKS5Host;
 	uint16_t _SOCKS5Port;
 }