@@ -435,11 +435,11 @@
 - initWithString: (OFString*)str
 {
 	self = [super init];
 
 	string = strdup([str cString]);
-	length = [str length];
+	length = [str cStringLength];
 
 	@try {
 		[self addMemoryToPool: string];
 	} @catch (OFException *e) {
 		/*
@@ -458,11 +458,11 @@
 - (const char*)cString
 {
 	return string;
 }
 
-- (size_t)length
+- (size_t)cStringLength
 {
 	return length;
 }
 
 - (BOOL)isEqual: (id)obj
@@ -508,11 +508,11 @@
 }
 
 - (size_t)indexOfFirstOccurrenceOfString: (OFString*)str
 {
 	const char *str_c = [str cString];
-	size_t str_len = [str length];
+	size_t str_len = [str cStringLength];
 	size_t i;
 
 	if (str_len == 0)
 		return 0;
 
@@ -527,11 +527,11 @@
 }
 
 - (size_t)indexOfLastOccurrenceOfString: (OFString*)str
 {
 	const char *str_c = [str cString];
-	size_t str_len = [str length];
+	size_t str_len = [str cStringLength];
 	size_t i;
 
 	if (str_len == 0)
 		return length;
 
@@ -567,21 +567,21 @@
 	return [[OFMutableString stringWithString: self] appendString: str];
 }
 
 - (BOOL)hasPrefix: (OFString*)prefix
 {
-	size_t len = [prefix length];
+	size_t len = [prefix cStringLength];
 
 	if (len > length)
 		return NO;
 
 	return (memcmp(string, [prefix cString], len) ? NO : YES);
 }
 
 - (BOOL)hasSuffix: (OFString*)suffix
 {
-	size_t len = [suffix length];
+	size_t len = [suffix cStringLength];
 
 	if (len > length)
 		return NO;
 
 	return (memcmp(string + (length - len), [suffix cString], len)
@@ -591,11 +591,11 @@
 - (OFArray*)splitWithDelimiter: (OFString*)delimiter
 {
 	OFAutoreleasePool *pool;
 	OFArray *array;
 	const char *delim = [delimiter cString];
-	size_t delim_len = [delimiter length];
+	size_t delim_len = [delimiter cStringLength];
 	size_t i, last;
 
 	array = [OFMutableArray array];
 	pool = [[OFAutoreleasePool alloc] init];