@@ -129,19 +129,19 @@
  *	   file
  */
 + (instancetype)elementWithFile: (OFString *)path;
 #endif
 
-- init OF_UNAVAILABLE;
+- (instancetype)init OF_UNAVAILABLE;
 
 /*!
  * @brief Initializes an already allocated OFXMLElement with the specified name.
  *
  * @param name The name for the element
  * @return An initialized OFXMLElement with the specified element name
  */
-- initWithName: (OFString *)name;
+- (instancetype)initWithName: (OFString *)name;
 
 /*!
  * @brief Initializes an already allocated OFXMLElement with the specified name
  *	  and string value.
  *
@@ -148,12 +148,12 @@
  * @param name The name for the element
  * @param stringValue The value for the element
  * @return An initialized OFXMLElement with the specified element name and
  *	   value
  */
-- initWithName: (OFString *)name
-   stringValue: (nullable OFString *)stringValue;
+- (instancetype)initWithName: (OFString *)name
+		 stringValue: (nullable OFString *)stringValue;
 
 /*!
  * @brief Initializes an already allocated OFXMLElement with the specified name
  *	  and namespace.
  *
@@ -160,12 +160,12 @@
  * @param name The name for the element
  * @param namespace_ The namespace for the element
  * @return An initialized OFXMLElement with the specified element name and
  *	   namespace
  */
-- initWithName: (OFString *)name
-     namespace: (nullable OFString *)namespace_;
+- (instancetype)initWithName: (OFString *)name
+		   namespace: (nullable OFString *)namespace_;
 
 /*!
  * @brief Initializes an already allocated OFXMLElement with the specified name,
  *	  namespace and value.
  *
@@ -173,45 +173,45 @@
  * @param namespace_ The namespace for the element
  * @param stringValue The value for the element
  * @return An initialized OFXMLElement with the specified element name,
  *	   namespace and value
  */
-- initWithName: (OFString *)name
-     namespace: (nullable OFString *)namespace_
-   stringValue: (nullable OFString *)stringValue;
+- (instancetype)initWithName: (OFString *)name
+		   namespace: (nullable OFString *)namespace_
+		 stringValue: (nullable OFString *)stringValue;
 
 /*!
  * @brief Initializes an already allocated OFXMLElement with the specified
  *	  element.
  *
  * @param element An OFXMLElement to initialize the OFXMLElement with
  * @return A new autoreleased OFXMLElement with the contents of the specified
  *	   element
  */
-- initWithElement: (OFXMLElement *)element;
+- (instancetype)initWithElement: (OFXMLElement *)element;
 
 /*!
  * @brief Parses the string and initializes an already allocated OFXMLElement
  *	  with it.
  *
  * @param string The string to parse
  * @return An initialized OFXMLElement with the contents of the string
  */
-- initWithXMLString: (OFString *)string;
+- (instancetype)initWithXMLString: (OFString *)string;
 
 #ifdef OF_HAVE_FILES
 /*!
  * @brief Parses the specified file and initializes an already allocated
  *	  OFXMLElement with it.
  *
  * @param path The path to the file
  * @return An initialized OFXMLElement with the contents of the specified file
  */
-- initWithFile: (OFString *)path;
+- (instancetype)initWithFile: (OFString *)path;
 #endif
 
-- initWithSerialization: (OFXMLElement *)element;
+- (instancetype)initWithSerialization: (OFXMLElement *)element;
 
 /*!
  * @brief Sets a prefix for a namespace.
  *
  * @param prefix The prefix for the namespace