@@ -82,11 +82,11 @@
 				*iter->argumentPtr = nil;
 
 			count++;
 		}
 
-		_options = of_alloc(count + 1, sizeof(*_options));
+		_options = OFAllocMemory(count + 1, sizeof(*_options));
 		_longOptions = [[OFMapTable alloc]
 		    initWithKeyFunctions: keyFunctions
 			 objectFunctions: objectFunctions];
 
 		for (iter = options, iter2 = _options;
@@ -144,11 +144,11 @@
 		for (OFOptionsParserOption *iter = _options;
 		    iter->shortOption != '\0' || iter->longOption != nil;
 		    iter++)
 			[iter->longOption release];
 
-	free(_options);
+	OFFreeMemory(_options);
 	[_longOptions release];
 
 	[_arguments release];
 	[_argument release];