@@ -140,11 +140,11 @@
 	return field;
 }
 
 static void
 seekOrThrowInvalidFormat(OFSeekableStream *stream,
-    OFStreamOffset offset, int whence)
+    OFStreamOffset offset, OFSeekWhence whence)
 {
 	@try {
 		[stream seekToOffset: offset whence: whence];
 	} @catch (OFSeekFailedException *e) {
 		if (e.errNo == EINVAL)
@@ -199,11 +199,11 @@
 		}
 
 		if (_mode == modeAppend) {
 			_offset = _centralDirectoryOffset;
 			seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-			    (OFStreamOffset)_offset, SEEK_SET);
+			    (OFStreamOffset)_offset, OFSeekSet);
 		}
 	} @catch (id e) {
 		/*
 		 * If we are in write or append mode, we do not want -[close]
 		 * to write anything to it on error - after all, it might not
@@ -262,11 +262,11 @@
 	OFStreamOffset offset = -22;
 	bool valid = false;
 
 	do {
 		seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-		    offset, SEEK_END);
+		    offset, OFSeekEnd);
 
 		if ([_stream readLittleEndianInt32] == 0x06054B50) {
 			valid = true;
 			break;
 		}
@@ -295,11 +295,11 @@
 	    _centralDirectoryOffset == 0xFFFFFFFF) {
 		int64_t offset64;
 		uint64_t size;
 
 		seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-		    offset - 20, SEEK_END);
+		    offset - 20, OFSeekEnd);
 
 		if ([_stream readLittleEndianInt32] != 0x07064B50) {
 			objc_autoreleasePoolPop(pool);
 			return;
 		}
@@ -313,11 +313,11 @@
 
 		if (offset64 < 0 || (OFStreamOffset)offset64 != offset64)
 			@throw [OFOutOfRangeException exception];
 
 		seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-		    (OFStreamOffset)offset64, SEEK_SET);
+		    (OFStreamOffset)offset64, OFSeekSet);
 
 		if ([_stream readLittleEndianInt32] != 0x06064B50)
 			@throw [OFInvalidFormatException exception];
 
 		size = [_stream readLittleEndianInt64];
@@ -353,11 +353,11 @@
 	if (_centralDirectoryOffset < 0 ||
 	    (OFStreamOffset)_centralDirectoryOffset != _centralDirectoryOffset)
 		@throw [OFOutOfRangeException exception];
 
 	seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-	    (OFStreamOffset)_centralDirectoryOffset, SEEK_SET);
+	    (OFStreamOffset)_centralDirectoryOffset, OFSeekSet);
 
 	for (size_t i = 0; i < _centralDirectoryEntries; i++) {
 		OFZIPArchiveEntry *entry = [[[OFZIPArchiveEntry alloc]
 		    of_initWithStream: _stream] autorelease];
 
@@ -449,11 +449,11 @@
 	offset64 = entry.of_localFileHeaderOffset;
 	if (offset64 < 0 || (OFStreamOffset)offset64 != offset64)
 		@throw [OFOutOfRangeException exception];
 
 	seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-	    (OFStreamOffset)offset64, SEEK_SET);
+	    (OFStreamOffset)offset64, OFSeekSet);
 	localFileHeader = [[[OFZIPArchiveLocalFileHeader alloc]
 	    initWithStream: _stream] autorelease];
 
 	if (![localFileHeader matchesEntry: entry])
 		@throw [OFInvalidFormatException exception];