@@ -12,11 +12,11 @@
  * 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.
  */
 
-#import "objfw-defs.h"
+#include "objfw-defs.h"
 
 #ifndef OF_HAVE_SOCKETS
 # error No sockets available!
 #endif
 
@@ -30,11 +30,13 @@
 #endif
 #ifdef OF_HAVE_NETINET_TCP_H
 # include <netinet/tcp.h>
 #endif
 
-#ifdef _WIN32
+#include "platform.h"
+
+#ifdef OF_WINDOWS
 # ifdef __MINGW32__
 #  include <_mingw.h>
 #  ifdef __MINGW64_VERSION_MAJOR
 #   include <winsock2.h>
 #  endif
@@ -41,11 +43,11 @@
 # endif
 # include <windows.h>
 # include <ws2tcpip.h>
 #endif
 
-#ifdef __wii__
+#ifdef OF_WII
 # define BOOL OGC_BOOL
 # include <network.h>
 # undef BOOL
 
 struct sockaddr_storage {
@@ -53,11 +55,11 @@
 	u8 ss_family;
 	u8 ss_data[14];
 };
 #endif
 
-#ifdef _PSP
+#ifdef OF_PSP
 # include <stdint.h>
 
 struct sockaddr_storage {
 	uint8_t	       ss_len;
 	sa_family_t    ss_family;
@@ -69,11 +71,11 @@
 
 #import "macros.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 typedef int of_socket_t;
 #else
 typedef SOCKET of_socket_t;
 #endif
 
@@ -80,11 +82,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
 extern bool of_socket_init(void);
 extern int of_socket_errno(void);
-# ifndef __wii__
+# ifndef OF_WII
 extern int of_getsockname(of_socket_t socket, struct sockaddr *restrict address,
     socklen_t *restrict address_len);
 # else
 extern bool of_socket_port_register(uint16_t port, int type);
 extern void of_socket_port_free(uint16_t port, int type);