@@ -417,11 +417,11 @@
 		ctx->subformat[ctx->subformatLen - 1] = 's';
 
 		{
 			char buffer[5];
 			size_t len = of_string_utf8_encode(
-			    va_arg(ctx->arguments, of_unichar_t), buffer);
+			    va_arg(ctx->arguments, OFUnichar), buffer);
 
 			if (len == 0)
 				return false;
 
 			buffer[len] = 0;
@@ -434,12 +434,12 @@
 			return false;
 
 		ctx->subformat[ctx->subformatLen - 1] = 's';
 
 		{
-			const of_unichar_t *arg =
-			    va_arg(ctx->arguments, const of_unichar_t *);
+			const OFUnichar *arg =
+			    va_arg(ctx->arguments, const OFUnichar *);
 			size_t j, len = of_string_utf32_length(arg);
 			char *buffer;
 
 			if (SIZE_MAX / 4 < len || (SIZE_MAX / 4) - len < 1)
 				return false;