@@ -23,10 +23,11 @@
 # include <sys/types.h>
 #endif
 
 #import "OFUTF8String.h"
 #import "OFUTF8String+Private.h"
+#import "OFASPrintF.h"
 #import "OFArray.h"
 #import "OFData.h"
 #import "OFMutableUTF8String.h"
 
 #import "OFInitializationFailedException.h"
@@ -34,11 +35,10 @@
 #import "OFInvalidEncodingException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
-#import "of_asprintf.h"
 #import "unicode.h"
 
 extern const OFChar16 of_iso_8859_2_table[];
 extern const size_t of_iso_8859_2_table_offset;
 extern const OFChar16 of_iso_8859_3_table[];
@@ -670,11 +670,11 @@
 		if (format == nil)
 			@throw [OFInvalidArgumentException exception];
 
 		_s = &_storage;
 
-		if ((cStringLength = of_vasprintf(&tmp, format.UTF8String,
+		if ((cStringLength = OFVASPrintF(&tmp, format.UTF8String,
 		    arguments)) == -1)
 			@throw [OFInvalidFormatException exception];
 
 		_s->cStringLength = cStringLength;