@@ -26,26 +26,26 @@
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
 
-#ifdef OF_HAVE_SOCKETS
-# import "socket_helpers.h"
-#endif
-
 #include "platform.h"
 
 #if !defined(OF_WINDOWS) && !defined(OF_MORPHOS)
 # include <signal.h>
 #endif
 
 #import "OFStream.h"
 #import "OFStream+Private.h"
+#import "OFASPrintF.h"
 #import "OFData.h"
 #import "OFKernelEventObserver.h"
 #import "OFRunLoop+Private.h"
 #import "OFRunLoop.h"
+#ifdef OF_HAVE_SOCKETS
+# import "OFSocket+Private.h"
+#endif
 #import "OFString.h"
 #import "OFSystemInfo.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
@@ -54,12 +54,10 @@
 #import "OFOutOfRangeException.h"
 #import "OFSetOptionFailedException.h"
 #import "OFTruncatedDataException.h"
 #import "OFWriteFailedException.h"
 
-#import "of_asprintf.h"
-
 #define MIN_READ_SIZE 512
 
 @implementation OFStream
 @synthesize buffersWrites = _buffersWrites;
 @synthesize of_waitingForDelimiter = _waitingForDelimiter, delegate = _delegate;
@@ -1627,11 +1625,11 @@
 	int length;
 
 	if (format == nil)
 		@throw [OFInvalidArgumentException exception];
 
-	if ((length = of_vasprintf(&UTF8String, format.UTF8String,
+	if ((length = OFVASPrintF(&UTF8String, format.UTF8String,
 	    arguments)) == -1)
 		@throw [OFInvalidFormatException exception];
 
 	@try {
 		[self writeBuffer: UTF8String length: length];