@@ -45,36 +45,36 @@
  * If the value is not pointer-sized, @ref OFOutOfRangeException is thrown.
  */
 @property (readonly, nonatomic) id nonretainedObjectValue;
 
 /**
- * @brief The value as a range.
- *
- * If the value is not range-sized, @ref OFOutOfRangeException is thrown.
- */
-@property (readonly, nonatomic) of_range_t rangeValue;
-
-/**
- * @brief The value as a point.
- *
- * If the value is not point-sized, @ref OFOutOfRangeException is thrown.
- */
-@property (readonly, nonatomic) of_point_t pointValue;
-
-/**
- * @brief The value as a dimension.
- *
- * If the value is not dimension-sized, @ref OFOutOfRangeException is thrown.
- */
-@property (readonly, nonatomic) of_dimension_t dimensionValue;
-
-/**
- * @brief The value as a rectangle.
- *
- * If the value is not rectangle-sized, @ref OFOutOfRangeException is thrown.
- */
-@property (readonly, nonatomic) of_rectangle_t rectangleValue;
+ * @brief The value as an OFRange.
+ *
+ * If the value is not OFRange-sized, @ref OFOutOfRangeException is thrown.
+ */
+@property (readonly, nonatomic) OFRange rangeValue;
+
+/**
+ * @brief The value as an OFPoint.
+ *
+ * If the value is not OFPoint-sized, @ref OFOutOfRangeException is thrown.
+ */
+@property (readonly, nonatomic) OFPoint pointValue;
+
+/**
+ * @brief The value as an OFSize.
+ *
+ * If the value is not OFSize-sized, @ref OFOutOfRangeException is thrown.
+ */
+@property (readonly, nonatomic) OFSize sizeValue;
+
+/**
+ * @brief The value as a OFRect.
+ *
+ * If the value is not OFRect-sized, @ref OFOutOfRangeException is thrown.
+ */
+@property (readonly, nonatomic) OFRect rectValue;
 
 /**
  * @brief Creates a new, autorelease OFValue with the specified bytes of the
  *	  specified type.
  *
@@ -111,37 +111,36 @@
  * @brief Creates a new, autoreleased OFValue containing the specified range.
  *
  * @param range The range the OFValue should contain
  * @return A new, autoreleased OFValue
  */
-+ (instancetype)valueWithRange: (of_range_t)range;
++ (instancetype)valueWithRange: (OFRange)range;
 
 /**
  * @brief Creates a new, autoreleased OFValue containing the specified point.
  *
  * @param point The point the OFValue should contain
  * @return A new, autoreleased OFValue
  */
-+ (instancetype)valueWithPoint: (of_point_t)point;
++ (instancetype)valueWithPoint: (OFPoint)point;
 
 /**
- * @brief Creates a new, autoreleased OFValue containing the specified
- *	  dimension.
+ * @brief Creates a new, autoreleased OFValue containing the specified size.
  *
- * @param dimension The dimension the OFValue should contain
+ * @param size The size the OFValue should contain
  * @return A new, autoreleased OFValue
  */
-+ (instancetype)valueWithDimension: (of_dimension_t)dimension;
++ (instancetype)valueWithSize: (OFSize)size;
 
 /**
  * @brief Creates a new, autoreleased OFValue containing the specified
  *	  rectangle.
  *
- * @param rectangle The rectangle the OFValue should contain
+ * @param rect The rectangle the OFValue should contain
  * @return A new, autoreleased OFValue
  */
-+ (instancetype)valueWithRectangle: (of_rectangle_t)rectangle;
++ (instancetype)valueWithRect: (OFRect)rect;
 
 /**
  * @brief Initializes an already allocated OFValue with the specified bytes of
  *	  the specified type.
  *
@@ -150,83 +149,23 @@
  * @return An initialized OFValue
  */
 - (instancetype)initWithBytes: (const void *)bytes
 		     objCType: (const char *)objCType;
 
-/**
- * @brief Initializes an already allocated OFValue containing the specified
- *	  pointer.
- *
- * Only the raw value of the pointer is stored and no data will be copied.
- *
- * @param pointer The pointer the OFValue should contain
- * @return An initialized OFValue
- */
-- (instancetype)initWithPointer: (const void *)pointer;
-
-/**
- * @brief Initializes an already allocated OFValue containing the specified
- *	  non-retained object.
- *
- * The object is not retained, which makes this useful for storing objects in
- * collections without retaining them.
- *
- * @param object The object the OFValue should contain without retaining it
- * @return An initialized OFValue
- */
-- (instancetype)initWithNonretainedObject: (id)object;
-
-/**
- * @brief Initializes an already allocated OFValue containing the specified
- *	  range.
- *
- * @param range The range the OFValue should contain
- * @return An initialized OFValue
- */
-- (instancetype)initWithRange: (of_range_t)range;
-
-/**
- * @brief Initializes an already allocated OFValue containing the specified
- *	  point.
- *
- * @param point The point the OFValue should contain
- * @return An initialized OFValue
- */
-- (instancetype)initWithPoint: (of_point_t)point;
-
-/**
- * @brief Initializes an already allocated OFValue containing the specified
- *	  dimension.
- *
- * @param dimension The dimension the OFValue should contain
- * @return An initialized OFValue
- */
-- (instancetype)initWithDimension: (of_dimension_t)dimension;
-
-/**
- * @brief Initializes an already allocated OFValue containing the specified
- *	  rectangle.
- *
- * @param rectangle The rectangle the OFValue should contain
- * @return An initialized OFValue
- */
-- (instancetype)initWithRectangle: (of_rectangle_t)rectangle;
-
 /**
  * @brief Gets the value.
  *
  * If the specified size does not match, this raises an
  * @ref OFOutOfRangeException.
  *
  * @param value The buffer to copy the value into
  * @param size The size of the value
  */
-- (void)getValue: (void *)value
-	    size: (size_t)size;
+- (void)getValue: (void *)value size: (size_t)size;
 @end
 
 OF_ASSUME_NONNULL_END
 
 #if !defined(NSINTEGER_DEFINED) && !__has_feature(modules)
 /* Required for array literals to work */
 @compatibility_alias NSValue OFValue;
 #endif