@@ -24,10 +24,11 @@
 
 @class OFStream;
 #ifdef OF_HAVE_POLL
 @class OFDataArray;
 #endif
+@class OFMutableArray;
 @class OFMutableDictionary;
 
 /**
  * \brief A protocol that needs to be implemented by delegates for
  *	  OFStreamObserver.
@@ -52,19 +53,21 @@
 /**
  * \brief A class that can observe multiple streams at once.
  */
 @interface OFStreamObserver: OFObject
 {
+	OFMutableArray *readStreams;
+	OFMutableArray *writeStreams;
 	id <OFStreamObserverDelegate> delegate;
 #ifdef OF_HAVE_POLL
 	OFDataArray *fds;
+	OFMutableDictionary *fdToStream;
 #else
 	fd_set readfds;
 	fd_set writefds;
 	int nfds;
 #endif
-	OFMutableDictionary *fdToStream;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (retain) id <OFStreamObserverDelegate> delegate;
 #endif