@@ -24,12 +24,12 @@
 @implementation OFASN1Value
 @synthesize tagClass = _tagClass, tagNumber = _tagNumber;
 @synthesize constructed = _constructed;
 @synthesize DEREncodedContents = _DEREncodedContents;
 
-+ (instancetype)valueWithTagClass: (of_asn1_tag_class_t)tagClass
-			tagNumber: (of_asn1_tag_number_t)tagNumber
++ (instancetype)valueWithTagClass: (OFASN1TagClass)tagClass
+			tagNumber: (OFASN1TagNumber)tagNumber
 		      constructed: (bool)constructed
 	       DEREncodedContents: (OFData *)DEREncodedContents
 {
 	return [[[self alloc]
 	      initWithTagClass: tagClass
@@ -36,12 +36,12 @@
 		     tagNumber: tagNumber
 		   constructed: constructed
 	    DEREncodedContents: DEREncodedContents] autorelease];
 }
 
-- (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
-		       tagNumber: (of_asn1_tag_number_t)tagNumber
+- (instancetype)initWithTagClass: (OFASN1TagClass)tagClass
+		       tagNumber: (OFASN1TagNumber)tagNumber
 		     constructed: (bool)constructed
 	      DEREncodedContents: (OFData *)DEREncodedContents
 {
 	self = [super init];
 
@@ -97,20 +97,20 @@
 	return true;
 }
 
 - (unsigned long)hash
 {
-	uint32_t hash;
-
-	OF_HASH_INIT(hash);
-
-	OF_HASH_ADD(hash, _tagClass & 0xFF);
-	OF_HASH_ADD(hash, _tagNumber & 0xFF);
-	OF_HASH_ADD(hash, _constructed);
-	OF_HASH_ADD_HASH(hash, _DEREncodedContents.hash);
-
-	OF_HASH_FINALIZE(hash);
+	unsigned long hash;
+
+	OFHashInit(&hash);
+
+	OFHashAdd(&hash, _tagClass & 0xFF);
+	OFHashAdd(&hash, _tagNumber & 0xFF);
+	OFHashAdd(&hash, _constructed);
+	OFHashAddHash(&hash, _DEREncodedContents.hash);
+
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (OFString *)description