@@ -99,11 +99,11 @@
 
 OF_DIRECT_MEMBERS
 @interface OFInvertedCharacterSetWithoutPercent: OFCharacterSet
 {
 	OFCharacterSet *_characterSet;
-	bool (*_characterIsMember)(id, SEL, of_unichar_t);
+	bool (*_characterIsMember)(id, SEL, OFUnichar);
 }
 
 - (instancetype)initWithCharacterSet: (OFCharacterSet *)characterSet;
 @end
 
@@ -148,11 +148,11 @@
 	return OF_RETAIN_COUNT_MAX;
 }
 @end
 
 @implementation OFURLAllowedCharacterSet
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	if (character < CHAR_MAX && of_ascii_isalnum(character))
 		return true;
 
 	switch (character) {
@@ -177,11 +177,11 @@
 	}
 }
 @end
 
 @implementation OFURLSchemeAllowedCharacterSet
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	if (character < CHAR_MAX && of_ascii_isalnum(character))
 		return true;
 
 	switch (character) {
@@ -194,11 +194,11 @@
 	}
 }
 @end
 
 @implementation OFURLPathAllowedCharacterSet
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	if (character < CHAR_MAX && of_ascii_isalnum(character))
 		return true;
 
 	switch (character) {
@@ -226,11 +226,11 @@
 	}
 }
 @end
 
 @implementation OFURLQueryOrFragmentAllowedCharacterSet
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	if (character < CHAR_MAX && of_ascii_isalnum(character))
 		return true;
 
 	switch (character) {
@@ -259,11 +259,11 @@
 	}
 }
 @end
 
 @implementation OFURLQueryKeyValueAllowedCharacterSet
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	if (character < CHAR_MAX && of_ascii_isalnum(character))
 		return true;
 
 	switch (character) {
@@ -296,11 +296,11 @@
 {
 	self = [super init];
 
 	@try {
 		_characterSet = [characterSet retain];
-		_characterIsMember = (bool (*)(id, SEL, of_unichar_t))
+		_characterIsMember = (bool (*)(id, SEL, OFUnichar))
 		    [_characterSet methodForSelector:
 		    @selector(characterIsMember:)];
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -314,11 +314,11 @@
 	[_characterSet release];
 
 	[super dealloc];
 }
 
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	return (character != '%' && !_characterIsMember(_characterSet,
 	    @selector(characterIsMember:), character));
 }
 @end