@@ -118,11 +118,11 @@
 		ret = [OFMutableData dataWithCapacity: count + 4];
 
 		prefix = 0xC8;
 		[ret addItem: &prefix];
 
-		length = OF_BSWAP16_IF_LE((uint16_t)count);
+		length = OFToBigEndian16((uint16_t)count);
 		[ret addItems: &length count: 2];
 
 		[ret addItem: &_type];
 	} else {
 		uint32_t length;
@@ -130,11 +130,11 @@
 		ret = [OFMutableData dataWithCapacity: count + 6];
 
 		prefix = 0xC9;
 		[ret addItem: &prefix];
 
-		length = OF_BSWAP32_IF_LE((uint32_t)count);
+		length = OFToBigEndian32((uint32_t)count);
 		[ret addItems: &length count: 4];
 
 		[ret addItem: &_type];
 	}
 
@@ -168,22 +168,22 @@
 	return true;
 }
 
 - (unsigned long)hash
 {
-	uint32_t hash;
-
-	OF_HASH_INIT(hash);
-
-	OF_HASH_ADD(hash, (uint8_t)_type);
-	OF_HASH_ADD_HASH(hash, _data.hash);
-
-	OF_HASH_FINALIZE(hash);
+	unsigned long hash;
+
+	OFHashInit(&hash);
+
+	OFHashAdd(&hash, (uint8_t)_type);
+	OFHashAddHash(&hash, _data.hash);
+
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (id)copy
 {
 	return [self retain];
 }
 @end