Index: src/OFApplication.h
==================================================================
--- src/OFApplication.h
+++ src/OFApplication.h
@@ -30,11 +30,15 @@
 	}
 
 /**
  * \brief A protocol for delegates of OFApplication.
  */
+#ifndef OF_APPLICATION_M
+@protocol OFApplicationDelegate <OFObject>
+#else
 @protocol OFApplicationDelegate
+#endif
 /**
  * This method is called when the application was initialized and is running
  * now.
  */
 - (void)applicationDidFinishLaunching;

Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -13,10 +13,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#define OF_APPLICATION_M
 
 #include <stdlib.h>
 
 #import "OFApplication.h"
 #import "OFString.h"

Index: src/OFCollection.h
==================================================================
--- src/OFCollection.h
+++ src/OFCollection.h
@@ -17,11 +17,11 @@
 #import "OFEnumerator.h"
 
 /**
  * \brief A protocol with methods common for all collections.
  */
-@protocol OFCollection
+@protocol OFCollection <OFObject>
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly) size_t count;
 #endif
 
 /**

Index: src/OFStreamObserver.h
==================================================================
--- src/OFStreamObserver.h
+++ src/OFStreamObserver.h
@@ -36,11 +36,15 @@
 
 /**
  * \brief A protocol that needs to be implemented by delegates for
  *	  OFStreamObserver.
  */
+#ifndef OF_STREAM_OBSERVER_M
+@protocol OFStreamObserverDelegate <OFObject>
+#else
 @protocol OFStreamObserverDelegate
+#endif
 #ifdef OF_HAVE_OPTIONAL_PROTOCOLS
 @optional
 #endif
 /**
  * This callback is called when a stream did get ready for reading.

Index: src/OFStreamObserver.m
==================================================================
--- src/OFStreamObserver.m
+++ src/OFStreamObserver.m
@@ -13,10 +13,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#define OF_STREAM_OBSERVER_M
 
 #include <string.h>
 
 #ifdef OF_HAVE_POLL
 # include <poll.h>

Index: src/OFString+XMLUnescaping.h
==================================================================
--- src/OFString+XMLUnescaping.h
+++ src/OFString+XMLUnescaping.h
@@ -31,11 +31,11 @@
 
 /**
  * \brief A protocol that needs to be implemented by delegates for
  *	  -[stringByXMLUnescapingWithHandler:].
  */
-@protocol OFStringXMLUnescapingDelegate
+@protocol OFStringXMLUnescapingDelegate <OFObject>
 /**
  * This callback is called when an unknown entity was found while trying to
  * unescape XML. The callback is supposed to return a substitution for the
  * entity or nil if it is unknown to the callback as well, in which case an
  * exception will be thrown.

Index: src/OFXMLElementBuilder.h
==================================================================
--- src/OFXMLElementBuilder.h
+++ src/OFXMLElementBuilder.h
@@ -22,11 +22,15 @@
 
 /**
  * \brief A protocol that needs to be implemented by delegates for
  * OFXMLElementBuilder.
  */
+#ifndef OF_XML_ELEMENT_BUILDER_M
+@protocol OFXMLElementBuilderDelegate <OFObject>
+#else
 @protocol OFXMLElementBuilderDelegate
+#endif
 /**
  * This callback is called when the OFXMLElementBuilder built an element.
  *
  * If the OFXMLElementBuilder was used as a delegate for the OFXMLParser since
  * parsing started, this will return the complete document as an OFXMLElement

Index: src/OFXMLElementBuilder.m
==================================================================
--- src/OFXMLElementBuilder.m
+++ src/OFXMLElementBuilder.m
@@ -13,10 +13,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#define OF_XML_ELEMENT_BUILDER_M
 
 #import "OFXMLElementBuilder.h"
 #import "OFXMLElement.h"
 #import "OFXMLParser.h"
 #import "OFMutableArray.h"

Index: src/OFXMLParser.h
==================================================================
--- src/OFXMLParser.h
+++ src/OFXMLParser.h
@@ -37,11 +37,15 @@
 #endif
 
 /**
  * \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
 /**
  * This callback is called when the XML parser found processing instructions.

Index: src/OFXMLParser.m
==================================================================
--- src/OFXMLParser.m
+++ src/OFXMLParser.m
@@ -13,10 +13,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#define OF_XML_PARSER_M
 
 #include <string.h>
 #include <unistd.h>
 
 #import "OFXMLParser.h"