Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -155,11 +155,11 @@
  *
  * The result is valid until the autorelease pool is released. If you want to
  * use the result outside the scope of the current autorelease pool, you have to
  * copy it.
  */
-@property (readonly, nonatomic) const char *UTF8String OF_RETURNS_INNER_POINTER;
+@property (readonly, nonatomic) const char *UTF8String;
 
 /**
  * @brief The number of bytes the string needs in UTF-8 encoding.
  */
 @property (readonly, nonatomic) size_t UTF8StringLength;
@@ -232,12 +232,11 @@
  * use the result outside the scope of the current autorelease pool, you have to
  * copy it.
  *
  * The returned string is *not* null-terminated.
  */
-@property (readonly, nonatomic) const OFUnichar *characters
-    OF_RETURNS_INNER_POINTER;
+@property (readonly, nonatomic) const OFUnichar *characters;
 
 /**
  * @brief The string in UTF-16 encoding with native byte order.
  *
  * The result is valid until the autorelease pool is released. If you want to
@@ -244,12 +243,11 @@
  * use the result outside the scope of the current autorelease pool, you have to
  * copy it.
  *
  * The returned string is null-terminated.
  */
-@property (readonly, nonatomic) const OFChar16 *UTF16String
-    OF_RETURNS_INNER_POINTER;
+@property (readonly, nonatomic) const OFChar16 *UTF16String;
 
 /**
  * @brief The length of the string in UTF-16 characters.
  */
 @property (readonly, nonatomic) size_t UTF16StringLength;
@@ -261,12 +259,11 @@
  * use the result outside the scope of the current autorelease pool, you have to
  * copy it.
  *
  * The returned string is null-terminated.
  */
-@property (readonly, nonatomic) const OFChar32 *UTF32String
-    OF_RETURNS_INNER_POINTER;
+@property (readonly, nonatomic) const OFChar32 *UTF32String;
 
 /**
  * @brief The string with leading whitespaces deleted.
  */
 @property (readonly, nonatomic) OFString *stringByDeletingLeadingWhitespaces;
@@ -918,12 +915,11 @@
  * @param encoding The encoding for the C string
  * @return The OFString as a C string in the specified encoding
  * @throw OFInvalidEncodingException The string cannot be represented in the
  *				     specified encoding
  */
-- (const char *)cStringWithEncoding: (OFStringEncoding)encoding
-    OF_RETURNS_INNER_POINTER;
+- (const char *)cStringWithEncoding: (OFStringEncoding)encoding;
 
 /**
  * @brief Returns the OFString as a C string in the specified encoding,
  *	  replacing characters that cannot be represented in the specified
  *	  encoding with a question mark.
@@ -933,12 +929,11 @@
  * copy it.
  *
  * @param encoding The encoding for the C string
  * @return The OFString as a C string in the specified encoding
  */
-- (const char *)lossyCStringWithEncoding: (OFStringEncoding)encoding
-    OF_RETURNS_INNER_POINTER;
+- (const char *)lossyCStringWithEncoding: (OFStringEncoding)encoding;
 
 /**
  * @brief Returns the number of bytes the string needs in the specified
  *	  encoding.
  *
@@ -1256,12 +1251,11 @@
  *
  * @param byteOrder The byte order for the UTF-16 encoding
  * @return The string in UTF-16 encoding with the specified byte order
  * @throw OFInvalidEncodingException The string cannot be represented in UTF-16
  */
-- (const OFChar16 *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder
-    OF_RETURNS_INNER_POINTER;
+- (const OFChar16 *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Returns the string in UTF-32 encoding with the specified byte order.
  *
  * The result is valid until the autorelease pool is released. If you want to
@@ -1271,12 +1265,11 @@
  * The returned string is null-terminated.
  *
  * @param byteOrder The byte order for the UTF-32 encoding
  * @return The string in UTF-32 encoding with the specified byte order
  */
-- (const OFChar32 *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
-    OF_RETURNS_INNER_POINTER;
+- (const OFChar32 *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Returns the string as OFData with the specified encoding.
  *
  * @param encoding The encoding to use for the returned OFData