@@ -46,15 +46,14 @@
 
 @interface OFString_const: OFString_UTF8
 @end
 
 @implementation OFString_const
-+ alloc
++ (instancetype)alloc
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
-
 
 - (void *)allocMemoryWithSize: (size_t)size
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
@@ -81,16 +80,16 @@
 - (void)freeMemory: (void *)pointer
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- retain
+- (instancetype)retain
 {
 	return self;
 }
 
-- autorelease
+- (instancetype)autorelease
 {
 	return self;
 }
 
 - (unsigned int)retainCount
@@ -163,11 +162,11 @@
 		_cString = (char *)ivars;
 		object_setClass(self, [OFString_const class]);
 	}
 }
 
-+ alloc
++ (instancetype)alloc
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void *)allocMemoryWithSize: (size_t)size
@@ -197,16 +196,16 @@
 - (void)freeMemory: (void *)pointer
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- retain
+- (instancetype)retain
 {
 	return self;
 }
 
-- autorelease
+- (instancetype)autorelease
 {
 	return self;
 }
 
 - (unsigned int)retainCount
@@ -227,19 +226,19 @@
  * In all following methods, the constant string is converted to an
  * OFString_UTF8 and the message sent again.
  */
 
 /* From protocol OFCopying */
-- copy
+- (id)copy
 {
 	[self finishInitialization];
 
 	return [self copy];
 }
 
 /* From protocol OFMutableCopying */
-- mutableCopy
+- (id)mutableCopy
 {
 	[self finishInitialization];
 
 	return [self mutableCopy];
 }