@@ -23,14 +23,11 @@
 @class OFException;
 
 /*!
  * @brief A delegate for OFHTTPServer.
  */
-@protocol OFHTTPServerDelegate
-#ifndef OF_HTTP_SERVER_M
-    <OFObject>
-#endif
+@protocol OFHTTPServerDelegate <OFObject>
 /*!
  * @brief This method is called when the HTTP server received a request from a
  *	  client.
  *
  * @param server The HTTP server which received the request
@@ -137,8 +134,5 @@
 
 - (BOOL)OF_socket: (OFTCPSocket*)socket
   didAcceptSocket: (OFTCPSocket*)clientSocket
 	exception: (OFException*)exception;
 @end
-
-@interface OFObject (OFHTTPServerDelegate) <OFHTTPServerDelegate>
-@end