@@ -27,11 +27,11 @@
  *
  * @brief A class for accessing and manipulating tar archives.
  */
 @interface OFTarArchive: OFObject
 {
-	OFStream *_stream;
+	OF_KINDOF(OFStream *) _stream;
 	enum {
 		OF_TAR_ARCHIVE_MODE_READ,
 		OF_TAR_ARCHIVE_MODE_WRITE,
 		OF_TAR_ARCHIVE_MODE_APPEND
 	} _mode;
@@ -40,17 +40,17 @@
 
 /*!
  * @brief Creates a new OFTarArchive object with the specified stream.
  *
  * @param stream A stream from which the tar archive will be read.
- *		 For append mode, this needs to be a seekable stream.
+ *		 For append mode, this needs to be an OFSeekableStream.
  * @param mode The mode for the tar 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 OFTarArchive
  */
-+ (instancetype)archiveWithStream: (OFStream *)stream
++ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
 			     mode: (OFString *)mode;
 
 #ifdef OF_HAVE_FILES
 /*!
  * @brief Creates a new OFTarArchive object with the specified file.
@@ -68,17 +68,17 @@
 /*!
  * @brief Initializes an already allocated OFTarArchive object with the
  *	  specified stream.
  *
  * @param stream A stream from which the tar archive will be read.
- *		 For append mode, this needs to be a seekable stream.
+ *		 For append mode, this needs to be an OFSeekableStream.
  * @param mode The mode for the tar file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return An initialized OFTarArchive
  */
-- initWithStream: (OFStream *)stream
+- initWithStream: (OF_KINDOF(OFStream *))stream
 	    mode: (OFString *)mode OF_DESIGNATED_INITIALIZER;
 
 #ifdef OF_HAVE_FILES
 /*!
  * @brief Initializes an already allocated OFTarArchive object with the