@@ -51,16 +51,16 @@
 {
 	return [[[OFNonretainedObjectValue alloc]
 	    initWithNonretainedObject: object] autorelease];
 }
 
-+ (instancetype)valueWithRange: (of_range_t)range
++ (instancetype)valueWithRange: (OFRange)range
 {
 	return [[[OFRangeValue alloc] initWithRange: range] autorelease];
 }
 
-+ (instancetype)valueWithPoint: (of_point_t)point
++ (instancetype)valueWithPoint: (OFPoint)point
 {
 	return [[[OFPointValue alloc] initWithPoint: point] autorelease];
 }
 
 + (instancetype)valueWithDimension: (of_dimension_t)dimension
@@ -171,20 +171,20 @@
 	id ret;
 	[self getValue: &ret size: sizeof(ret)];
 	return ret;
 }
 
-- (of_range_t)rangeValue
+- (OFRange)rangeValue
 {
-	of_range_t ret;
+	OFRange ret;
 	[self getValue: &ret size: sizeof(ret)];
 	return ret;
 }
 
-- (of_point_t)pointValue
+- (OFPoint)pointValue
 {
-	of_point_t ret;
+	OFPoint ret;
 	[self getValue: &ret size: sizeof(ret)];
 	return ret;
 }
 
 - (of_dimension_t)dimensionValue