@@ -31,11 +31,11 @@
  *
  * @brief A class for accessing and manipulating ZIP files.
  */
 @interface OFZIPArchive: OFObject
 {
-	OF_KINDOF(OFStream *) _stream;
+	OFStream *_stream;
 	int64_t _offset;
 	enum {
 		OF_ZIP_ARCHIVE_MODE_READ,
 		OF_ZIP_ARCHIVE_MODE_WRITE,
 		OF_ZIP_ARCHIVE_MODE_APPEND
@@ -75,11 +75,11 @@
  * @param mode The mode for the ZIP file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFZIPArchive
  */
-+ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
++ (instancetype)archiveWithStream: (OFStream *)stream
 			     mode: (OFString *)mode;
 
 #ifdef OF_HAVE_FILES
 /*!
  * @brief Creates a new OFZIPArchive object with the specified file.
@@ -105,11 +105,11 @@
  * @param mode The mode for the ZIP file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return An initialized OFZIPArchive
  */
-- (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream
+- (instancetype)initWithStream: (OFStream *)stream
 			  mode: (OFString *)mode OF_DESIGNATED_INITIALIZER;
 
 #ifdef OF_HAVE_FILES
 /*!
  * @brief Initializes an already allocated OFZIPArchive object with the