@@ -75,11 +75,11 @@
 enum {
 	OF_ZIP_ARCHIVE_ENTRY_EXTRA_FIELD_ZIP64 = 0x0001
 };
 
 @class OFString;
-@class OFDataArray;
+@class OFData;
 @class OFFile;
 @class OFDate;
 
 /*!
  * @class OFZIPArchiveEntry OFZIPArchiveEntry.h ObjFW/OFZIPArchiveEntry.h
@@ -93,11 +93,11 @@
 	uint16_t _compressionMethod;
 	uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
 	uint32_t _CRC32;
 	uint64_t _compressedSize, _uncompressedSize;
 	OFString *_fileName;
-	OFDataArray *_extraField;
+	OFData *_extraField;
 	OFString *_fileComment;
 	uint32_t _startDiskNumber;
 	uint16_t _internalAttributes;
 	uint32_t _versionSpecificAttributes;
 	int64_t _localFileHeaderOffset;
@@ -187,11 +187,11 @@
 /*!
  * @brief Returns the extra field of the entry.
  *
  * @return The extra field of the entry
  */
-- (OFDataArray *)extraField;
+- (OFData *)extraField;
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -212,12 +212,12 @@
  * @param tag The tag to look for
  * @param data A pointer to a pointer that should be set to the start of the
  *	       extra field with the specified tag
  * @param size A pointer to an uint16_t that should be set to the size
  */
-extern void of_zip_archive_entry_extra_field_find(OFDataArray *extraField,
-    uint16_t tag, uint8_t *_Nonnull *_Nonnull data, uint16_t *size);
+extern void of_zip_archive_entry_extra_field_find(OFData *extraField,
+    uint16_t tag, const uint8_t *_Nonnull *_Nonnull data, uint16_t *size);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END