@@ -41,12 +41,12 @@
  *	  instructions.
  *
  * @param parser The parser which found processing instructions
  * @param pi The processing instructions
  */
--		 (void)parser: (OFXMLParser*)parser
-  foundProcessingInstructions: (OFString*)pi;
+-		 (void)parser: (OFXMLParser *)parser
+  foundProcessingInstructions: (OFString *)pi;
 
 /*!
  * @brief This callback is called when the XML parser found the start of a new
  *	  tag.
  *
@@ -55,28 +55,28 @@
  * @param prefix The prefix of the tag which just started or `nil`
  * @param ns The namespace of the tag which just started or `nil`
  * @param attributes The attributes included in the tag which just started or
  *		     `nil`
  */
--    (void)parser: (OFXMLParser*)parser
-  didStartElement: (OFString*)name
-	   prefix: (nullable OFString*)prefix
-	namespace: (nullable OFString*)ns
-       attributes: (nullable OFArray OF_GENERIC(OFXMLAttribute*)*)attributes;
+-    (void)parser: (OFXMLParser *)parser
+  didStartElement: (OFString *)name
+	   prefix: (nullable OFString *)prefix
+	namespace: (nullable OFString *)ns
+       attributes: (nullable OFArray OF_GENERIC(OFXMLAttribute *) *)attributes;
 
 /*!
  * @brief This callback is called when the XML parser found the end of a tag.
  *
  * @param parser The parser which found the end of a tag
  * @param name The name of the tag which just ended
  * @param prefix The prefix of the tag which just ended or `nil`
  * @param ns The namespace of the tag which just ended or `nil`
  */
--  (void)parser: (OFXMLParser*)parser
-  didEndElement: (OFString*)name
-	 prefix: (nullable OFString*)prefix
-      namespace: (nullable OFString*)ns;
+-  (void)parser: (OFXMLParser *)parser
+  didEndElement: (OFString *)name
+	 prefix: (nullable OFString *)prefix
+      namespace: (nullable OFString *)ns;
 
 /*!
  * @brief This callback is called when the XML parser found characters.
  *
  * In case there are comments or CDATA, it is possible that this callback is
@@ -83,30 +83,30 @@
  * called multiple times in a row.
  *
  * @param parser The parser which found a string
  * @param characters The characters the XML parser found
  */
--    (void)parser: (OFXMLParser*)parser
-  foundCharacters: (OFString*)characters;
+-    (void)parser: (OFXMLParser *)parser
+  foundCharacters: (OFString *)characters;
 
 /*!
  * @brief This callback is called when the XML parser found CDATA.
  *
  * @param parser The parser which found a string
  * @param CDATA The CDATA the XML parser found
  */
-- (void)parser: (OFXMLParser*)parser
-    foundCDATA: (OFString*)CDATA;
+- (void)parser: (OFXMLParser *)parser
+    foundCDATA: (OFString *)CDATA;
 
 /*!
  * @brief This callback is called when the XML parser found a comment.
  *
  * @param parser The parser which found a comment
  * @param comment The comment the XML parser found
  */
-- (void)parser: (OFXMLParser*)parser
-  foundComment: (OFString*)comment;
+- (void)parser: (OFXMLParser *)parser
+  foundComment: (OFString *)comment;
 
 /*!
  * @brief This callback is called when the XML parser found an entity it
  *	  doesn't know.
  *
@@ -116,12 +116,12 @@
  *
  * @param parser The parser which found an unknown entity
  * @param entity The name of the entity the XML parser didn't know
  * @return A substitution for the entity or `nil`
  */
--	(OFString*)parser: (OFXMLParser*)parser
-  foundUnknownEntityNamed: (OFString*)entity;
+-      (OFString *)parser: (OFXMLParser *)parser
+  foundUnknownEntityNamed: (OFString *)entity;
 @end
 
 /*!
  * @class OFXMLParser OFXMLParser.h ObjFW/OFXMLParser.h
  *
@@ -159,16 +159,16 @@
 	size_t _i, _last;
 	const char *_data;
 	OFDataArray *_buffer;
 	OFString *_name, *_prefix;
 	OFMutableArray
-	    OF_GENERIC(OFMutableDictionary OF_GENERIC(OFString*, OFString*)*)
+	    OF_GENERIC(OFMutableDictionary OF_GENERIC(OFString *, OFString *) *)
 	    *_namespaces;
-	OFMutableArray OF_GENERIC(OFXMLAttribute*) *_attributes;
+	OFMutableArray OF_GENERIC(OFXMLAttribute *) *_attributes;
 	OFString *_attributeName, *_attributePrefix;
 	char _delimiter;
-	OFMutableArray OF_GENERIC(OFString*) *_previous;
+	OFMutableArray OF_GENERIC(OFString *) *_previous;
 	size_t _level;
 	bool _acceptProlog;
 	size_t _lineNumber;
 	bool _lastCarriageReturn, _finishedParsing;
 	of_string_encoding_t _encoding;
@@ -200,34 +200,34 @@
  * @brief Parses the specified buffer with the specified size.
  *
  * @param buffer The buffer to parse
  * @param length The length of the buffer
  */
-- (void)parseBuffer: (const char*)buffer
+- (void)parseBuffer: (const char *)buffer
 	     length: (size_t)length;
 
 /*!
  * @brief Parses the specified string.
  *
  * @param string The string to parse
  */
-- (void)parseString: (OFString*)string;
+- (void)parseString: (OFString *)string;
 
 /*!
  * @brief Parses the specified stream.
  *
  * @param stream The stream to parse
  */
-- (void)parseStream: (OFStream*)stream;
+- (void)parseStream: (OFStream *)stream;
 
 #ifdef OF_HAVE_FILES
 /*!
  * @brief Parses the specified file.
  *
  * @param path The path to the file to parse
 */
-- (void)parseFile: (OFString*)path;
+- (void)parseFile: (OFString *)path;
 #endif
 
 /*!
  * @brief Returns the current line number.
  *