@@ -13,17 +13,17 @@
  * file.
  */
 
 #import "OFValue.h"
 #import "OFBytesValue.h"
-#import "OFDimensionValue.h"
 #import "OFMethodSignature.h"
 #import "OFNonretainedObjectValue.h"
 #import "OFPointValue.h"
 #import "OFPointerValue.h"
 #import "OFRangeValue.h"
 #import "OFRectangleValue.h"
+#import "OFSizeValue.h"
 #import "OFString.h"
 
 #import "OFOutOfMemoryException.h"
 
 @implementation OFValue
@@ -61,14 +61,13 @@
 + (instancetype)valueWithPoint: (OFPoint)point
 {
 	return [[[OFPointValue alloc] initWithPoint: point] autorelease];
 }
 
-+ (instancetype)valueWithDimension: (of_dimension_t)dimension
++ (instancetype)valueWithSize: (OFSize)size
 {
-	return [[[OFDimensionValue alloc]
-	    initWithDimension: dimension] autorelease];
+	return [[[OFSizeValue alloc] initWithSize: size] autorelease];
 }
 
 + (instancetype)valueWithRectangle: (of_rectangle_t)rectangle
 {
 	return [[[OFRectangleValue alloc]
@@ -185,13 +184,13 @@
 	OFPoint ret;
 	[self getValue: &ret size: sizeof(ret)];
 	return ret;
 }
 
-- (of_dimension_t)dimensionValue
+- (OFSize)sizeValue
 {
-	of_dimension_t ret;
+	OFSize ret;
 	[self getValue: &ret size: sizeof(ret)];
 	return ret;
 }
 
 - (of_rectangle_t)rectangleValue