@@ -15,21 +15,20 @@
 
 #include "config.h"
 
 #include <stdlib.h>
 
+#import "OFPBKDF2.h"
 #import "OFHMAC.h"
 #import "OFSecureData.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
-#import "pbkdf2.h"
-
 void
-of_pbkdf2(of_pbkdf2_parameters_t param)
+OFPBKDF2(OFPBKDF2Parameters param)
 {
 	void *pool = objc_autoreleasePoolPush();
 	size_t blocks, digestSize = param.HMAC.digestSize;
 	OFSecureData *buffer = [OFSecureData
 		    dataWithCount: digestSize
@@ -57,11 +56,11 @@
 		    dataWithCount: param.saltLength + 4
 	    allowsSwappableMemory: param.allowsSwappableMemory];
 	extendedSaltItems = extendedSalt.mutableItems;
 
 	@try {
-		uint32_t i = OF_BSWAP32_IF_LE(1);
+		uint32_t i = OFToBigEndian32(1);
 
 		[param.HMAC setKey: param.password
 			    length: param.passwordLength];
 
 		memcpy(extendedSaltItems, param.salt, param.saltLength);
@@ -94,11 +93,11 @@
 
 			memcpy(param.key, bufferItems, length);
 			param.key += length;
 			param.keyLength -= length;
 
-			i = OF_BSWAP32_IF_LE(OF_BSWAP32_IF_LE(i) + 1);
+			i = OFToBigEndian32(OFFromBigEndian32(i) + 1);
 		}
 	} @catch (id e) {
 		[extendedSalt zero];
 		[buffer zero];
 		[digest zero];