@@ -52,11 +52,11 @@
 /**
  * \brief A class that can observe multiple streams at once.
  */
 @interface OFStreamObserver: OFObject
 {
-	OFObject <OFStreamObserverDelegate> *delegate;
+	id <OFStreamObserverDelegate> delegate;
 #ifdef OF_HAVE_POLL
 	OFDataArray *fds;
 #else
 	fd_set readfds;
 	fd_set writefds;
@@ -64,11 +64,11 @@
 #endif
 	OFMutableDictionary *fdToStream;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (retain) OFObject <OFStreamObserverDelegate> *delegate;
+@property (retain) id <OFStreamObserverDelegate> delegate;
 #endif
 
 /**
  * \return A new, autoreleased OFStreamObserver
  */
@@ -75,18 +75,18 @@
 + streamObserver;
 
 /**
  * \return The delegate for the OFStreamObserver
  */
-- (OFObject <OFStreamObserverDelegate>*)delegate;
+- (id <OFStreamObserverDelegate>)delegate;
 
 /**
  * Sets the delegate for the OFStreamObserver.
  *
  * \param delegate The delegate for the OFStreamObserver
  */
-- (void)setDelegate: (OFObject <OFStreamObserverDelegate>*)delegate;
+- (void)setDelegate: (id <OFStreamObserverDelegate>)delegate;
 
 /**
  * Adds a stream to observe for reading.
  *
  * \param stream The stream to observe for reading