@@ -25,11 +25,11 @@
 
 @interface SimpleCharacterSet: OFCharacterSet
 @end
 
 @implementation SimpleCharacterSet
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	return (character % 2 == 0);
 }
 @end
 
@@ -43,11 +43,11 @@
 	module = @"OFCharacterSet";
 
 	cs = [[[SimpleCharacterSet alloc] init] autorelease];
 
 	ok = true;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c % 2 == 0) {
 			if (![cs characterIsMember: c])
 				ok = false;
 		} else if ([cs characterIsMember: c])
 			ok = false;
@@ -60,11 +60,11 @@
 	    (cs = [OFCharacterSet characterSetWithCharactersInString:
 	    @"0123456789"]) &&
 	    [cs isKindOfClass: [OFBitSetCharacterSet class]])
 
 	ok = true;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
 			if (![cs characterIsMember: c])
 				ok = false;
 		} else if ([cs characterIsMember: c])
 			ok = false;
@@ -77,11 +77,11 @@
 	    (cs = [OFCharacterSet
 	    characterSetWithRange: OFMakeRange('0', 10)]) &&
 	    [cs isKindOfClass: [OFRangeCharacterSet class]])
 
 	ok = true;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
 			if (![cs characterIsMember: c])
 				ok = false;
 		} else if ([cs characterIsMember: c])
 			ok = false;
@@ -88,11 +88,11 @@
 	}
 	TEST(@"-[characterIsMember:]", ok);
 
 	ok = true;
 	ics = cs.invertedSet;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
 			if ([ics characterIsMember: c])
 				ok = false;
 		} else if (![ics characterIsMember: c])
 			ok = false;