@@ -25,15 +25,11 @@
 @class OFStream;
 
 /*!
  * @brief A protocol that needs to be implemented by delegates for OFXMLParser.
  */
-#ifndef OF_XML_PARSER_M
 @protocol OFXMLParserDelegate <OFObject>
-#else
-@protocol OFXMLParserDelegate
-#endif
 #ifdef OF_HAVE_OPTIONAL_PROTOCOLS
 @optional
 #endif
 /*!
  * @brief This callback is called when the XML parser found processing
@@ -56,11 +52,11 @@
  * @param attributes The attributes included in the tag which just started or
  *		     nil
  */
 -    (void)parser: (OFXMLParser*)parser
   didStartElement: (OFString*)name
-       withPrefix: (OFString*)prefix
+	   prefix: (OFString*)prefix
 	namespace: (OFString*)ns
        attributes: (OFArray*)attributes;
 
 /*!
  * @brief This callback is called when the XML parser found the end of a tag.
@@ -70,11 +66,11 @@
  * @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
-     withPrefix: (OFString*)prefix
+	 prefix: (OFString*)prefix
       namespace: (OFString*)ns;
 
 /*!
  * @brief This callback is called when the XML parser found characters.
  *