@@ -46,13 +46,13 @@
 		return;
 
 	mode = [OFNumber numberWithUnsignedShort:
 	    mode.unsignedShortValue & 0777];
 
-	of_file_attributes_t attributes = [OFDictionary
+	OFFileAttributes attributes = [OFDictionary
 	    dictionaryWithObject: mode
-			  forKey: of_file_attribute_key_posix_permissions];
+			  forKey: OFFilePOSIXPermissions];
 
 	[[OFFileManager defaultManager] setAttributes: attributes
 					 ofItemAtPath: path];
 #endif
 }
@@ -59,11 +59,11 @@
 
 static void
 setModificationDate(OFString *path, OFLHAArchiveEntry *entry)
 {
 	OFDate *modificationDate = entry.modificationDate;
-	of_file_attributes_t attributes;
+	OFFileAttributes attributes;
 
 	if (modificationDate == nil) {
 		/*
 		 * Fall back to the original date if we have no modification
 		 * date, as the modification date is a UNIX extension.
@@ -74,11 +74,11 @@
 			return;
 	}
 
 	attributes = [OFDictionary
 	    dictionaryWithObject: modificationDate
-			  forKey: of_file_attribute_key_modification_date];
+			  forKey: OFFileModificationDate];
 	[[OFFileManager defaultManager] setAttributes: attributes
 					 ofItemAtPath: path];
 }
 
 @implementation LHAArchive
@@ -451,12 +451,12 @@
 		return;
 	}
 
 	for (OFString *fileName in files) {
 		void *pool = objc_autoreleasePoolPush();
-		of_file_attributes_t attributes;
-		of_file_type_t type;
+		OFFileAttributes attributes;
+		OFFileAttributeType type;
 		OFMutableLHAArchiveEntry *entry;
 		OFStream *output;
 
 		if (app->_outputLevel >= 0)
 			[of_stdout writeString: OF_LOCALIZED(@"adding_file",
@@ -472,24 +472,24 @@
 		    attributes.filePOSIXPermissions];
 #endif
 		entry.date = attributes.fileModificationDate;
 
 #ifdef OF_FILE_MANAGER_SUPPORTS_OWNER
-		entry.UID =
-		    [OFNumber numberWithUnsignedLong: attributes.filePOSIXUID];
-		entry.GID =
-		    [OFNumber numberWithUnsignedLong: attributes.filePOSIXGID];
-		entry.owner = attributes.fileOwner;
-		entry.group = attributes.fileGroup;
+		entry.UID = [OFNumber numberWithUnsignedLong:
+		    attributes.fileOwnerAccountID];
+		entry.GID = [OFNumber numberWithUnsignedLong:
+		    attributes.fileGroupOwnerAccountID];
+		entry.owner = attributes.fileOwnerAccountName;
+		entry.group = attributes.fileGroupOwnerAccountName;
 #endif
 
-		if ([type isEqual: of_file_type_directory])
+		if ([type isEqual: OFFileTypeDirectory])
 			entry.compressionMethod = @"-lhd-";
 
 		output = [_archive streamForWritingEntry: entry];
 
-		if ([type isEqual: of_file_type_regular]) {
+		if ([type isEqual: OFFileTypeRegular]) {
 			unsigned long long written = 0;
 			unsigned long long size = attributes.fileSize;
 			int8_t percent = -1, newPercent;
 
 			OFFile *input = [OFFile fileWithPath: fileName