@@ -16,14 +16,13 @@
 #include "config.h"
 
 #import "OFCharacterSet.h"
 #import "OFBitSetCharacterSet.h"
 #import "OFInvertedCharacterSet.h"
+#import "OFOnce.h"
 #import "OFRangeCharacterSet.h"
 
-#import "once.h"
-
 @interface OFPlaceholderCharacterSet: OFCharacterSet
 @end
 
 @interface OFWhitespaceCharacterSet: OFCharacterSet
 @end
@@ -50,11 +49,11 @@
 {
 	return (id)[[OFBitSetCharacterSet alloc]
 	    initWithCharactersInString: characters];
 }
 
-- (instancetype)initWithRange: (of_range_t)range
+- (instancetype)initWithRange: (OFRange)range
 {
 	return (id)[[OFRangeCharacterSet alloc] initWithRange: range];
 }
 
 - (instancetype)retain
@@ -98,19 +97,19 @@
 {
 	return [[[self alloc] initWithCharactersInString: characters]
 	    autorelease];
 }
 
-+ (instancetype)characterSetWithRange: (of_range_t)range
++ (instancetype)characterSetWithRange: (OFRange)range
 {
 	return [[[self alloc] initWithRange: range] autorelease];
 }
 
 + (OFCharacterSet *)whitespaceCharacterSet
 {
-	static of_once_t onceControl = OF_ONCE_INIT;
-	of_once(&onceControl, initWhitespaceCharacterSet);
+	static OFOnceControl onceControl = OFOnceControlInitValue;
+	OFOnce(&onceControl, initWhitespaceCharacterSet);
 
 	return whitespaceCharacterSet;
 }
 
 - (instancetype)init
@@ -132,16 +131,16 @@
 - (instancetype)initWithCharactersInString: (OFString *)characters
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithRange: (of_range_t)range
+- (instancetype)initWithRange: (OFRange)range
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (OFCharacterSet *)invertedSet
@@ -166,14 +165,14 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	switch (character) {
 	case 0x0009:
 	case 0x0020:
 	case 0x00A0: