@@ -52,35 +52,35 @@
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 
-- (void*)allocMemoryWithSize: (size_t)size
+- (void *)allocMemoryWithSize: (size_t)size
+{
+	OF_UNRECOGNIZED_SELECTOR
+}
+
+- (void *)allocMemoryWithSize: (size_t)size
+			count: (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)allocMemoryWithSize: (size_t)size
-		       count: (size_t)count
+- (void *)resizeMemory: (void *)pointer
+		  size: (size_t)size
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)resizeMemory: (void*)pointer
-		 size: (size_t)size
+- (void *)resizeMemory: (void *)pointer
+		  size: (size_t)size
+		 count: (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)resizeMemory: (void*)pointer
-		 size: (size_t)size
-		count: (size_t)count
-{
-	OF_UNRECOGNIZED_SELECTOR
-}
-
-- (void)freeMemory: (void*)pointer
+- (void)freeMemory: (void *)pointer
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - retain
@@ -158,45 +158,45 @@
 			case -1:
 				free(ivars);
 				@throw [OFInvalidEncodingException exception];
 		}
 
-		_cString = (char*)ivars;
+		_cString = (char *)ivars;
 		object_setClass(self, [OFString_const class]);
 	}
 }
 
 + alloc
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)allocMemoryWithSize: (size_t)size
+- (void *)allocMemoryWithSize: (size_t)size
+{
+	OF_UNRECOGNIZED_SELECTOR
+}
+
+- (void *)allocMemoryWithSize: (size_t)size
+			count: (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)allocMemoryWithSize: (size_t)size
-		       count: (size_t)count
+- (void *)resizeMemory: (void *)pointer
+		  size: (size_t)size
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)resizeMemory: (void*)pointer
-		 size: (size_t)size
+- (void *)resizeMemory: (void *)pointer
+		  size: (size_t)size
+		 count: (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)resizeMemory: (void*)pointer
-		 size: (size_t)size
-		count: (size_t)count
-{
-	OF_UNRECOGNIZED_SELECTOR
-}
-
-- (void)freeMemory: (void*)pointer
+- (void)freeMemory: (void *)pointer
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - retain
@@ -265,26 +265,26 @@
 	[self finishInitialization];
 
 	return [self hash];
 }
 
-- (OFString*)description
+- (OFString *)description
 {
 	[self finishInitialization];
 
 	return [self description];
 }
 
 /* From OFString */
-- (const char*)UTF8String
+- (const char *)UTF8String
 {
 	[self finishInitialization];
 
 	return [self UTF8String];
 }
 
-- (size_t)getCString: (char*)cString_
+- (size_t)getCString: (char *)cString_
 	   maxLength: (size_t)maxLength
 	    encoding: (of_string_encoding_t)encoding
 {
 	[self finishInitialization];
 
@@ -291,11 +291,11 @@
 	return [self getCString: cString_
 		      maxLength: maxLength
 		       encoding: encoding];
 }
 
-- (const char*)cStringWithEncoding: (of_string_encoding_t)encoding
+- (const char *)cStringWithEncoding: (of_string_encoding_t)encoding
 {
 	[self finishInitialization];
 
 	return [self cStringWithEncoding: encoding];
 }
@@ -319,11 +319,11 @@
 	[self finishInitialization];
 
 	return [self cStringLengthWithEncoding: encoding];
 }
 
-- (of_comparison_result_t)caseInsensitiveCompare: (OFString*)otherString
+- (of_comparison_result_t)caseInsensitiveCompare: (OFString *)otherString
 {
 	[self finishInitialization];
 
 	return [self caseInsensitiveCompare: otherString];
 }
@@ -333,36 +333,36 @@
 	[self finishInitialization];
 
 	return [self characterAtIndex: index];
 }
 
-- (void)getCharacters: (of_unichar_t*)buffer
+- (void)getCharacters: (of_unichar_t *)buffer
 	      inRange: (of_range_t)range
 {
 	[self finishInitialization];
 
 	[self getCharacters: buffer
 		    inRange: range];
 }
 
-- (of_range_t)rangeOfString: (OFString*)string
+- (of_range_t)rangeOfString: (OFString *)string
 {
 	[self finishInitialization];
 
 	return [self rangeOfString: string];
 }
 
-- (of_range_t)rangeOfString: (OFString*)string
+- (of_range_t)rangeOfString: (OFString *)string
 		    options: (int)options
 {
 	[self finishInitialization];
 
 	return [self rangeOfString: string
 			   options: options];
 }
 
-- (of_range_t)rangeOfString: (OFString*)string
+- (of_range_t)rangeOfString: (OFString *)string
 		    options: (int)options
 		      range: (of_range_t)range
 {
 	[self finishInitialization];
 
@@ -369,163 +369,163 @@
 	return [self rangeOfString: string
 			   options: options
 			     range: range];
 }
 
-- (bool)containsString: (OFString*)string
+- (bool)containsString: (OFString *)string
 {
 	[self finishInitialization];
 
 	return [self containsString: string];
 }
 
-- (OFString*)substringWithRange: (of_range_t)range
+- (OFString *)substringWithRange: (of_range_t)range
 {
 	[self finishInitialization];
 
 	return [self substringWithRange: range];
 }
 
-- (OFString*)stringByAppendingString: (OFString*)string
+- (OFString *)stringByAppendingString: (OFString *)string
 {
 	[self finishInitialization];
 
 	return [self stringByAppendingString: string];
 }
 
-- (OFString*)stringByAppendingFormat: (OFConstantString*)format
-			   arguments: (va_list)arguments
+- (OFString *)stringByAppendingFormat: (OFConstantString *)format
+			    arguments: (va_list)arguments
 {
 	[self finishInitialization];
 
 	return [self stringByAppendingFormat: format
 				   arguments: arguments];
 }
 
-- (OFString*)stringByAppendingPathComponent: (OFString*)component
+- (OFString *)stringByAppendingPathComponent: (OFString *)component
 {
 	[self finishInitialization];
 
 	return [self stringByAppendingPathComponent: component];
 }
 
-- (OFString*)stringByPrependingString: (OFString*)string
+- (OFString *)stringByPrependingString: (OFString *)string
 {
 	[self finishInitialization];
 
 	return [self stringByPrependingString: string];
 }
 
-- (OFString*)stringByReplacingOccurrencesOfString: (OFString*)string
-				       withString: (OFString*)replacement
+- (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string
+					withString: (OFString *)replacement
 {
 	[self finishInitialization];
 
 	return [self stringByReplacingOccurrencesOfString: string
 					       withString: replacement];
 }
 
-- (OFString*)stringByReplacingOccurrencesOfString: (OFString*)string
-				       withString: (OFString*)replacement
-					  options: (int)options
-					    range: (of_range_t)range
+- (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string
+					withString: (OFString *)replacement
+					   options: (int)options
+					     range: (of_range_t)range
 {
 	[self finishInitialization];
 
 	return [self stringByReplacingOccurrencesOfString: string
 					       withString: replacement
 						  options: options
 						    range: range];
 }
 
-- (OFString*)uppercaseString
+- (OFString *)uppercaseString
 {
 	[self finishInitialization];
 
 	return [self uppercaseString];
 }
 
-- (OFString*)lowercaseString
+- (OFString *)lowercaseString
 {
 	[self finishInitialization];
 
 	return [self lowercaseString];
 }
 
-- (OFString*)capitalizedString
+- (OFString *)capitalizedString
 {
 	[self finishInitialization];
 
 	return [self capitalizedString];
 }
 
-- (OFString*)stringByDeletingLeadingWhitespaces
+- (OFString *)stringByDeletingLeadingWhitespaces
 {
 	[self finishInitialization];
 
 	return [self stringByDeletingLeadingWhitespaces];
 }
 
-- (OFString*)stringByDeletingTrailingWhitespaces
+- (OFString *)stringByDeletingTrailingWhitespaces
 {
 	[self finishInitialization];
 
 	return [self stringByDeletingTrailingWhitespaces];
 }
 
-- (OFString*)stringByDeletingEnclosingWhitespaces
+- (OFString *)stringByDeletingEnclosingWhitespaces
 {
 	[self finishInitialization];
 
 	return [self stringByDeletingEnclosingWhitespaces];
 }
 
-- (bool)hasPrefix: (OFString*)prefix
+- (bool)hasPrefix: (OFString *)prefix
 {
 	[self finishInitialization];
 
 	return [self hasPrefix: prefix];
 }
 
-- (bool)hasSuffix: (OFString*)suffix
+- (bool)hasSuffix: (OFString *)suffix
 {
 	[self finishInitialization];
 
 	return [self hasSuffix: suffix];
 }
 
-- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
+- (OFArray *)componentsSeparatedByString: (OFString *)delimiter
 {
 	[self finishInitialization];
 
 	return [self componentsSeparatedByString: delimiter];
 }
 
-- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
-				options: (int)options
+- (OFArray *)componentsSeparatedByString: (OFString *)delimiter
+				 options: (int)options
 {
 	[self finishInitialization];
 
 	return [self componentsSeparatedByString: delimiter
 					 options: options];
 }
 
-- (OFArray*)pathComponents
+- (OFArray *)pathComponents
 {
 	[self finishInitialization];
 
 	return [self pathComponents];
 }
 
-- (OFString*)lastPathComponent
+- (OFString *)lastPathComponent
 {
 	[self finishInitialization];
 
 	return [self lastPathComponent];
 }
 
-- (OFString*)stringByDeletingLastPathComponent
+- (OFString *)stringByDeletingLastPathComponent
 {
 	[self finishInitialization];
 
 	return [self stringByDeletingLastPathComponent];
 }
@@ -563,25 +563,25 @@
 	[self finishInitialization];
 
 	return [self doubleValue];
 }
 
-- (const of_unichar_t*)characters
+- (const of_unichar_t *)characters
 {
 	[self finishInitialization];
 
 	return [self characters];
 }
 
-- (const of_char16_t*)UTF16String
+- (const of_char16_t *)UTF16String
 {
 	[self finishInitialization];
 
 	return [self UTF16String];
 }
 
-- (const of_char16_t*)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char16_t *)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
 {
 	[self finishInitialization];
 
 	return [self UTF16StringWithByteOrder: byteOrder];
 }
@@ -591,32 +591,32 @@
 	[self finishInitialization];
 
 	return [self UTF16StringLength];
 }
 
-- (const of_char32_t*)UTF32String
+- (const of_char32_t *)UTF32String
 {
 	[self finishInitialization];
 
 	return [self UTF32String];
 }
 
-- (const of_char32_t*)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
 {
 	[self finishInitialization];
 
 	return [self UTF32StringWithByteOrder: byteOrder];
 }
 
-- (void)writeToFile: (OFString*)path
+- (void)writeToFile: (OFString *)path
 {
 	[self finishInitialization];
 
 	[self writeToFile: path];
 }
 
-- (void)writeToFile: (OFString*)path
+- (void)writeToFile: (OFString *)path
 	   encoding: (of_string_encoding_t)encoding
 {
 	[self finishInitialization];
 
 	[self writeToFile: path