@@ -49,20 +49,20 @@
 	OFSPXSocket *_socket;
 	unsigned char _node[IPX_NODE_LEN];
 	uint32_t _network;
 	uint16_t _port;
 #ifdef OF_HAVE_BLOCKS
-	of_spx_socket_async_connect_block_t _block;
+	OFSPXSocketAsyncConnectBlock _block;
 #endif
 }
 
 - (instancetype)initWithSocket: (OFSPXSocket *)socket
 			  node: (unsigned char [IPX_NODE_LEN])node
 		       network: (uint32_t)network
 			  port: (uint16_t)port
 #ifdef OF_HAVE_BLOCKS
-			 block: (of_spx_socket_async_connect_block_t)block
+			 block: (OFSPXSocketAsyncConnectBlock)block
 #endif
 ;
 - (void)startWithRunLoopMode: (of_run_loop_mode_t)runLoopMode;
 @end
 
@@ -70,11 +70,11 @@
 - (instancetype)initWithSocket: (OFSPXSocket *)sock
 			  node: (unsigned char [IPX_NODE_LEN])node
 		       network: (uint32_t)network
 			  port: (uint16_t)port
 #ifdef OF_HAVE_BLOCKS
-			 block: (of_spx_socket_async_connect_block_t)block
+			 block: (OFSPXSocketAsyncConnectBlock)block
 #endif
 {
 	self = [super init];
 
 	@try {
@@ -279,11 +279,11 @@
 
 #ifdef OF_HAVE_BLOCKS
 - (void)asyncConnectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
 		   network: (uint32_t)network
 		      port: (uint16_t)port
-		     block: (of_spx_socket_async_connect_block_t)block
+		     block: (OFSPXSocketAsyncConnectBlock)block
 {
 	[self asyncConnectToNode: node
 			 network: network
 			    port: port
 		     runLoopMode: of_run_loop_mode_default
@@ -292,11 +292,11 @@
 
 - (void)asyncConnectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
 		   network: (uint32_t)network
 		      port: (uint16_t)port
 	       runLoopMode: (of_run_loop_mode_t)runLoopMode
-		     block: (of_spx_socket_async_connect_block_t)block
+		     block: (OFSPXSocketAsyncConnectBlock)block
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[[[[OFSPXSocketAsyncConnectDelegate alloc]
 	    initWithSocket: self