@@ -36,28 +36,28 @@
 
 @implementation OFOptionsParser
 @synthesize lastOption = _lastOption, lastLongOption = _lastLongOption;
 @synthesize argument = _argument;
 
-+ (instancetype)parserWithOptions: (const of_options_parser_option_t *)options
++ (instancetype)parserWithOptions: (const OFOptionsParserOption *)options
 {
 	return [[[self alloc] initWithOptions: options] autorelease];
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithOptions: (const of_options_parser_option_t *)options
+- (instancetype)initWithOptions: (const OFOptionsParserOption *)options
 {
 	self = [super init];
 
 	@try {
 		size_t count = 0;
-		const of_options_parser_option_t *iter;
-		of_options_parser_option_t *iter2;
+		const OFOptionsParserOption *iter;
+		OFOptionsParserOption *iter2;
 		const of_map_table_functions_t keyFunctions = {
 			.hash = stringHash,
 			.equal = stringEqual
 		};
 		const of_map_table_functions_t objectFunctions = { NULL };
@@ -139,11 +139,11 @@
 }
 
 - (void)dealloc
 {
 	if (_options != NULL)
-		for (of_options_parser_option_t *iter = _options;
+		for (OFOptionsParserOption *iter = _options;
 		    iter->shortOption != '\0' || iter->longOption != nil;
 		    iter++)
 			[iter->longOption release];
 
 	free(_options);
@@ -155,11 +155,11 @@
 	[super dealloc];
 }
 
 - (OFUnichar)nextOption
 {
-	of_options_parser_option_t *iter;
+	OFOptionsParserOption *iter;
 	OFString *argument;
 
 	if (_done || _index >= _arguments.count)
 		return '\0';
 
@@ -184,11 +184,11 @@
 		}
 
 		if ([argument hasPrefix: @"--"]) {
 			void *pool = objc_autoreleasePoolPush();
 			size_t pos;
-			of_options_parser_option_t *option;
+			OFOptionsParserOption *option;
 
 			_lastOption = '-';
 			_index++;
 
 			if ((pos = [argument rangeOfString: @"="].location) !=