@@ -53,11 +53,11 @@
 	    SOCK_DGRAM | SOCK_CLOEXEC | extraType, 0)) == INVALID_SOCKET)
 		@throw [OFBindFailedException
 		    exceptionWithHost: OFSocketAddressString(address)
 				 port: OFSocketAddressPort(address)
 			       socket: self
-				errNo: of_socket_errno()];
+				errNo: OFSocketErrNo()];
 
 	_canBlock = true;
 
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	/* {} needed to avoid warning with Clang 10 if next #if is false. */
@@ -69,11 +69,11 @@
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
 	if (OFSocketAddressPort(address) != 0) {
 #endif
 		if (bind(_socket, &address->sockaddr.sockaddr,
 		    address->length) != 0) {
-			int errNo = of_socket_errno();
+			int errNo = OFSocketErrNo();
 
 			closesocket(_socket);
 			_socket = INVALID_SOCKET;
 
 			@throw [OFBindFailedException
@@ -97,12 +97,12 @@
 			    address->length)) == 0) {
 				port = rnd;
 				break;
 			}
 
-			if (of_socket_errno() != EADDRINUSE) {
-				int errNo = of_socket_errno();
+			if (OFSocketErrNo() != EADDRINUSE) {
+				int errNo = OFSocketErrNo();
 				OFString *host = OFSocketAddressString(address);
 				uint16_t port = OFSocketAddressPort(port);
 
 				closesocket(_socket);
 				_socket = INVALID_SOCKET;
@@ -124,13 +124,13 @@
 
 #if !defined(OF_HPUX) && !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 	memset(address, 0, sizeof(*address));
 
 	address->length = (socklen_t)sizeof(address->sockaddr);
-	if (of_getsockname(_socket, &address->sockaddr.sockaddr,
+	if (OFGetSockName(_socket, &address->sockaddr.sockaddr,
 	    &address->length) != 0) {
-		int errNo = of_socket_errno();
+		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = INVALID_SOCKET;
 
 		@throw [OFBindFailedException