@@ -20,10 +20,13 @@
 #endif
 
 #include <stdbool.h>
 
 #import "OFString.h"
+#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS)
+# import "OFTLSKey.h"
+#endif
 
 #ifdef OF_HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
 #ifdef OF_HAVE_NETINET_IN_H
@@ -34,12 +37,10 @@
 #endif
 #ifdef OF_HAVE_NETIPX_IPX_H
 # include <netipx/ipx.h>
 #endif
 
-#include "platform.h"
-
 #ifdef OF_WINDOWS
 # include <windows.h>
 # include <ws2tcpip.h>
 # ifdef OF_HAVE_IPX
 #  include <wsipx.h>
@@ -55,13 +56,10 @@
 #ifdef OF_PSP
 # include <stdint.h>
 #endif
 
 #import "macros.h"
-#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS)
-# import "tlskey.h"
-#endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 #ifndef OF_WINDOWS
 typedef int OFSocketHandle;
@@ -124,11 +122,11 @@
 # define sipx_node sa_nodenum
 # define sipx_port sa_socket
 #endif
 
 /**
- * @struct OFSocketAddress socket.h ObjFW/socket.h
+ * @struct OFSocketAddress OFSocket.h ObjFW/OFSocket.h
  *
  * @brief A struct which represents a host / port pair for a socket.
  */
 struct OF_BOXABLE OFSocketAddress {
 	/*