@@ -17,14 +17,14 @@
 #import "OFKernelEventObserver.h"
 
 #ifndef OF_AMIGAOS
 # define OF_FILE_HANDLE_IS_FD
 # define OF_INVALID_FILE_HANDLE (-1)
-typedef int of_file_handle_t;
+typedef int OFFileHandle;
 #else
 # define OF_INVALID_FILE_HANDLE NULL
-typedef struct of_file_handle *of_file_handle_t;
+typedef struct OFFileHandle *OFFileHandle;
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 @class OFURL;
@@ -38,11 +38,11 @@
 @interface OFFile: OFSeekableStream
 #ifdef OF_FILE_HANDLE_IS_FD
     <OFReadyForReadingObserving, OFReadyForWritingObserving>
 #endif
 {
-	of_file_handle_t _handle;
+	OFFileHandle _handle;
 	bool _atEndOfStream;
 }
 
 /**
  * @brief Creates a new OFFile with the specified path and mode.
@@ -91,11 +91,11 @@
  * @param handle A native file handle. If OF_FILE_HANDLE_IS_FD is defined, this
  *		 is a file descriptor. The handle is closed when the OFFile
  *		 object is deallocated!
  * @return A new autoreleased OFFile
  */
-+ (instancetype)fileWithHandle: (of_file_handle_t)handle;
++ (instancetype)fileWithHandle: (OFFileHandle)handle;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFFile.
@@ -151,10 +151,9 @@
  * @param handle A native file handle. If OF_FILE_HANDLE_IS_FD is defined, this
  *		 is a file descriptor. The handle is closed when the OFFile
  *		 object is deallocated!
  * @return An initialized OFFile
  */
-- (instancetype)initWithHandle: (of_file_handle_t)handle
-    OF_DESIGNATED_INITIALIZER;
+- (instancetype)initWithHandle: (OFFileHandle)handle OF_DESIGNATED_INITIALIZER;
 @end
 
 OF_ASSUME_NONNULL_END