@@ -33,12 +33,12 @@
  *
  * @param socket The socket which connected
  * @param exception An exception which occurred while connecting the socket or
  *		    `nil` on success
  */
-typedef void (^of_tcp_socket_async_connect_block_t)(
-    OF_KINDOF(OFTCPSocket *) socket, id _Nullable exception);
+typedef void (^of_tcp_socket_async_connect_block_t)(OFTCPSocket *socket,
+    id _Nullable exception);
 
 /*!
  * @brief A block which is called when the socket accepted a connection.
  *
  * @param socket The socket which accepted the connection
@@ -46,13 +46,12 @@
  * @param exception An exception which occurred while accepting the socket or
  *		    `nil` on success
  * @return A bool whether the same block should be used for the next incoming
  *	   connection
  */
-typedef bool (^of_tcp_socket_async_accept_block_t)(
-    OF_KINDOF(OFTCPSocket *) socket, OF_KINDOF(OFTCPSocket *) acceptedSocket,
-    id _Nullable exception);
+typedef bool (^of_tcp_socket_async_accept_block_t)(OFTCPSocket *socket,
+    OFTCPSocket *acceptedSocket, id _Nullable exception);
 #endif
 
 /*!
  * @protocol OFTCPSocketDelegate OFTCPSocket.h ObjFW/OFTCPSocket.h
  *
@@ -67,11 +66,11 @@
  * @param host The host connected to
  * @param port The port on the host connected to
  * @param exception An exception that occurred while connecting, or nil on
  *		    success
  */
--     (void)socket: (OF_KINDOF(OFTCPSocket *))socket
+-     (void)socket: (OFTCPSocket *)socket
   didConnectToHost: (OFString *)host
 	      port: (uint16_t)port
 	 exception: (nullable id)exception;
 
 /*!
@@ -81,12 +80,12 @@
  * @param acceptedSocket The socket which has been accepted
  * @param exception An exception that occurred while accepting, or nil on
  *		    success
  * @return A bool whether to accept the next incoming connection
  */
--    (bool)socket: (OF_KINDOF(OFTCPSocket *))socket
-  didAcceptSocket: (OF_KINDOF(OFTCPSocket *))acceptedSocket
+-    (bool)socket: (OFTCPSocket *)socket
+  didAcceptSocket: (OFTCPSocket *)acceptedSocket
 	exception: (nullable id)exception;
 @end
 
 /*!
  * @class OFTCPSocket OFTCPSocket.h ObjFW/OFTCPSocket.h