@@ -1012,26 +1012,26 @@
 	return true;
 }
 
 - (unsigned long)hash
 {
-	uint32_t hash;
-
-	OF_HASH_INIT(hash);
-
-	OF_HASH_ADD_HASH(hash, _name.hash);
-	OF_HASH_ADD_HASH(hash, _namespace.hash);
-	OF_HASH_ADD_HASH(hash, _defaultNamespace.hash);
-	OF_HASH_ADD_HASH(hash, _attributes.hash);
-	OF_HASH_ADD_HASH(hash, _namespaces.hash);
-	OF_HASH_ADD_HASH(hash, _children.hash);
-
-	OF_HASH_FINALIZE(hash);
+	unsigned long hash;
+
+	OFHashInit(&hash);
+
+	OFHashAddHash(&hash, _name.hash);
+	OFHashAddHash(&hash, _namespace.hash);
+	OFHashAddHash(&hash, _defaultNamespace.hash);
+	OFHashAddHash(&hash, _attributes.hash);
+	OFHashAddHash(&hash, _namespaces.hash);
+	OFHashAddHash(&hash, _children.hash);
+
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (id)copy
 {
 	return [[[self class] alloc] initWithElement: self];
 }
 @end