@@ -478,11 +478,11 @@
 #endif
 		@throw [OFChangeCurrentDirectoryPathFailedException
 		    exceptionWithPath: path];
 }
 
-+ (off_t)sizeOfFileAtPath: (OFString*)path
++ (of_offset_t)sizeOfFileAtPath: (OFString*)path
 {
 	of_stat_t s;
 
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
@@ -490,12 +490,11 @@
 	if (of_stat(path, &s) == -1)
 		/* FIXME: Maybe use another exception? */
 		@throw [OFOpenFileFailedException exceptionWithPath: path
 							       mode: @"r"];
 
-	/* FIXME: On Android, off_t is 32 bit, but st_size is long long there */
-	return (off_t)s.st_size;
+	return s.st_size;
 }
 
 + (OFDate*)modificationDateOfFileAtPath: (OFString*)path
 {
 	of_stat_t s;
@@ -973,14 +972,14 @@
 		@throw [OFWriteFailedException exceptionWithObject: self
 						   requestedLength: length];
 #endif
 }
 
-- (off_t)lowlevelSeekToOffset: (off_t)offset
-		       whence: (int)whence
+- (of_offset_t)lowlevelSeekToOffset: (of_offset_t)offset
+			     whence: (int)whence
 {
-	off_t ret = lseek(_fd, offset, whence);
+	of_offset_t ret = lseek(_fd, offset, whence);
 
 	if (ret == -1)
 		@throw [OFSeekFailedException exceptionWithStream: self
 							   offset: offset
 							   whence: whence];