@@ -127,12 +127,12 @@
 #ifdef OF_HAVE_UNAVAILABLE
 + (instancetype)valueWithBytes: (const void *)bytes
 		      objCType: (const char *)objCType OF_UNAVAILABLE;
 + (instancetype)valueWithPointer: (const void *)pointer OF_UNAVAILABLE;
 + (instancetype)valueWithNonretainedObject: (id)object OF_UNAVAILABLE;
-+ (instancetype)valueWithRange: (of_range_t)range OF_UNAVAILABLE;
-+ (instancetype)valueWithPoint: (of_point_t)point OF_UNAVAILABLE;
++ (instancetype)valueWithRange: (OFRange)range OF_UNAVAILABLE;
++ (instancetype)valueWithPoint: (OFPoint)point OF_UNAVAILABLE;
 + (instancetype)valueWithDimension: (of_dimension_t)dimension OF_UNAVAILABLE;
 + (instancetype)valueWithRectangle: (of_rectangle_t)rectangle OF_UNAVAILABLE;
 #endif
 
 /**
@@ -360,14 +360,14 @@
  * @brief Compares the number to another number.
  *
  * @param number The number to compare the number to
  * @return The result of the comparison
  */
-- (of_comparison_result_t)compare: (OFNumber *)number;
+- (OFComparisonResult)compare: (OFNumber *)number;
 @end
 
 OF_ASSUME_NONNULL_END
 
 #if !defined(NSINTEGER_DEFINED) && !__has_feature(modules)
 /* Required for number literals to work */
 @compatibility_alias NSNumber OFNumber;
 #endif