@@ -245,11 +245,11 @@
 }
 
 # ifdef OF_HAVE_BLOCKS
 - (void)asyncReadIntoBuffer: (void *)buffer
 		     length: (size_t)length
-		      block: (of_stream_async_read_block_t)block
+		      block: (OFStreamAsyncReadBlock)block
 {
 	[self asyncReadIntoBuffer: buffer
 			   length: length
 		      runLoopMode: of_run_loop_mode_default
 			    block: block];
@@ -256,11 +256,11 @@
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		     length: (size_t)length
 		runLoopMode: (of_run_loop_mode_t)runLoopMode
-		      block: (of_stream_async_read_block_t)block
+		      block: (OFStreamAsyncReadBlock)block
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
 	[OFRunLoop of_addAsyncReadForStream: stream
@@ -271,11 +271,11 @@
 				   delegate: nil];
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		exactLength: (size_t)length
-		      block: (of_stream_async_read_block_t)block
+		      block: (OFStreamAsyncReadBlock)block
 {
 	[self asyncReadIntoBuffer: buffer
 		      exactLength: length
 		      runLoopMode: of_run_loop_mode_default
 			    block: block];
@@ -282,11 +282,11 @@
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		exactLength: (size_t)length
 		runLoopMode: (of_run_loop_mode_t)runLoopMode
-		      block: (of_stream_async_read_block_t)block
+		      block: (OFStreamAsyncReadBlock)block
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
 	[OFRunLoop of_addAsyncReadForStream: stream
@@ -832,28 +832,28 @@
 # endif
 				       delegate: _delegate];
 }
 
 # ifdef OF_HAVE_BLOCKS
-- (void)asyncReadLineWithBlock: (of_stream_async_read_line_block_t)block
+- (void)asyncReadLineWithBlock: (OFStreamAsyncReadLineBlock)block
 {
 	[self asyncReadLineWithEncoding: OFStringEncodingUTF8
 			    runLoopMode: of_run_loop_mode_default
 				  block: block];
 }
 
 - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
-			    block: (of_stream_async_read_line_block_t)block
+			    block: (OFStreamAsyncReadLineBlock)block
 {
 	[self asyncReadLineWithEncoding: encoding
 			    runLoopMode: of_run_loop_mode_default
 				  block: block];
 }
 
 - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
 		      runLoopMode: (of_run_loop_mode_t)runLoopMode
-			    block: (of_stream_async_read_line_block_t)block
+			    block: (OFStreamAsyncReadLineBlock)block
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
 	[OFRunLoop of_addAsyncReadLineForStream: stream
@@ -1145,21 +1145,20 @@
 # endif
 				    delegate: _delegate];
 }
 
 # ifdef OF_HAVE_BLOCKS
-- (void)asyncWriteData: (OFData *)data
-		 block: (of_stream_async_write_data_block_t)block
+- (void)asyncWriteData: (OFData *)data block: (OFStreamAsyncWriteDataBlock)block
 {
 	[self asyncWriteData: data
 		 runLoopMode: of_run_loop_mode_default
 		       block: block];
 }
 
 - (void)asyncWriteData: (OFData *)data
 	   runLoopMode: (of_run_loop_mode_t)runLoopMode
-		 block: (of_stream_async_write_data_block_t)block
+		 block: (OFStreamAsyncWriteDataBlock)block
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
 
 	[OFRunLoop of_addAsyncWriteForStream: stream
@@ -1168,21 +1167,21 @@
 				       block: block
 				    delegate: nil];
 }
 
 - (void)asyncWriteString: (OFString *)string
-		   block: (of_stream_async_write_string_block_t)block
+		   block: (OFStreamAsyncWriteStringBlock)block
 {
 	[self asyncWriteString: string
 		      encoding: OFStringEncodingUTF8
 		   runLoopMode: of_run_loop_mode_default
 			 block: block];
 }
 
 - (void)asyncWriteString: (OFString *)string
 		encoding: (OFStringEncoding)encoding
-		   block: (of_stream_async_write_string_block_t)block
+		   block: (OFStreamAsyncWriteStringBlock)block
 {
 	[self asyncWriteString: string
 		      encoding: encoding
 		   runLoopMode: of_run_loop_mode_default
 			 block: block];
@@ -1189,11 +1188,11 @@
 }
 
 - (void)asyncWriteString: (OFString *)string
 		encoding: (OFStringEncoding)encoding
 	     runLoopMode: (of_run_loop_mode_t)runLoopMode
-		   block: (of_stream_async_write_string_block_t)block
+		   block: (OFStreamAsyncWriteStringBlock)block
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
 
 	[OFRunLoop of_addAsyncWriteForStream: stream