@@ -15,12 +15,12 @@
  */
 
 #include <stdarg.h>
 
 #import "OFObject.h"
+#import "OFString.h"
 
-@class OFString;
 @class OFDataArray;
 
 /**
  * \brief A base class for different types of streams.
  *
@@ -183,11 +183,11 @@
  *
  * \param encoding The encoding used by the stream
  * \return The line that was read, autoreleased, or nil if the end of the
  *	   stream has been reached.
  */
-- (OFString*)readLineWithEncoding: (enum of_string_encoding)encoding;
+- (OFString*)readLineWithEncoding: (of_string_encoding_t)encoding;
 
 /**
  * Read until the specified string or \\0 is found or the end of stream occurs.
  *
  * \param delimiter The delimiter
@@ -203,11 +203,11 @@
  * \param encoding The encoding used by the stream
  * \return The line that was read, autoreleased, or nil if the end of the
  *	   stream has been reached.
  */
 - (OFString*)readTillDelimiter: (OFString*)delimiter
-		  withEncoding: (enum of_string_encoding)encoding;
+		  withEncoding: (of_string_encoding_t)encoding;
 
 /**
  * \return A boolean whether writes are buffered
  */
 - (BOOL)buffersWrites;