@@ -1161,19 +1161,19 @@
 			   options: 0
 			     range: of_range(0, [self length])];
 }
 
 - (of_range_t)rangeOfString: (OFString*)string
-		    options: (of_string_search_options_t)options
+		    options: (int)options
 {
 	return [self rangeOfString: string
 			   options: options
 			     range: of_range(0, [self length])];
 }
 
 - (of_range_t)rangeOfString: (OFString*)string
-		    options: (of_string_search_options_t)options
+		    options: (int)options
 		      range: (of_range_t)range
 {
 	void *pool;
 	const of_unichar_t *searchString;
 	of_unichar_t *unicodeString;
@@ -1324,17 +1324,19 @@
 	return new;
 }
 
 - (OFString*)stringByReplacingOccurrencesOfString: (OFString*)string
 				       withString: (OFString*)replacement
-					  inRange: (of_range_t)range
+					  options: (int)options
+					    range: (of_range_t)range
 {
 	OFMutableString *new = [[self mutableCopy] autorelease];
 
 	[new replaceOccurrencesOfString: string
 			     withString: replacement
-				inRange: range];
+				options: options
+				  range: range];
 
 	[new makeImmutable];
 
 	return new;
 }
@@ -1469,19 +1471,20 @@
 }
 
 - (OFArray*)componentsSeparatedByString: (OFString*)delimiter
 {
 	return [self componentsSeparatedByString: delimiter
-				       skipEmpty: NO];
+					 options: 0];
 }
 
 - (OFArray*)componentsSeparatedByString: (OFString*)delimiter
-			      skipEmpty: (BOOL)skipEmpty
+				options: (int)options
 {
 	void *pool;
 	OFMutableArray *array = [OFMutableArray array];
 	const of_unichar_t *string, *delimiterString;
+	BOOL skipEmpty = (options & OF_STRING_SKIP_EMPTY);
 	size_t length = [self length];
 	size_t delimiterLength = [delimiter length];
 	size_t i, last;
 	OFString *component;