@@ -25,13 +25,13 @@
 		     objCType: (const char *)objCType
 {
 	self = [super init];
 
 	@try {
-		_size = of_sizeof_type_encoding(objCType);
+		_size = OFSizeOfTypeEncoding(objCType);
 		_objCType = objCType;
-		_bytes = of_alloc(1, _size);
+		_bytes = OFAllocMemory(1, _size);
 
 		memcpy(_bytes, bytes, _size);
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -40,11 +40,11 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	free(_bytes);
+	OFFreeMemory(_bytes);
 
 	[super dealloc];
 }
 
 - (void)getValue: (void *)value size: (size_t)size