@@ -29,18 +29,18 @@
  *
  * @brief A class for accessing and manipulating tar archives.
  */
 @interface OFTarArchive: OFObject
 {
-	OF_KINDOF(OFStream *) _stream;
+	OFStream *_stream;
 	enum {
 		OF_TAR_ARCHIVE_MODE_READ,
 		OF_TAR_ARCHIVE_MODE_WRITE,
 		OF_TAR_ARCHIVE_MODE_APPEND
 	} _mode;
 	of_string_encoding_t _encoding;
-	OF_KINDOF(OFStream *) _Nullable _lastReturnedStream;
+	OFStream *_Nullable _lastReturnedStream;
 }
 
 /*!
  * @brief The encoding to use for the archive. Defaults to UTF-8.
  */
@@ -65,11 +65,11 @@
  * @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: (OF_KINDOF(OFStream *))stream
++ (instancetype)archiveWithStream: (OFStream *)stream
 			     mode: (OFString *)mode;
 
 #ifdef OF_HAVE_FILES
 /*!
  * @brief Creates a new OFTarArchive object with the specified file.
@@ -95,11 +95,11 @@
  * @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
  */
-- (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 OFTarArchive object with the