@@ -73,11 +73,11 @@
 static OF_INLINE void
 byteSwapVectorIfBE(uint32_t *vector, uint_fast8_t length)
 {
 #ifdef OF_BIG_ENDIAN
 	for (uint_fast8_t i = 0; i < length; i++)
-		vector[i] = OF_BSWAP32(vector[i]);
+		vector[i] = OFByteSwap32(vector[i]);
 #endif
 }
 
 static void
 processBlock(uint32_t *state, uint32_t *buffer)
@@ -90,20 +90,21 @@
 	new[2] = state[2];
 	new[3] = state[3];
 
 	byteSwapVectorIfBE(buffer, 16);
 
-#define LOOP_BODY(f)							      \
-	{								      \
-		uint32_t tmp = new[3];					      \
-		tmp = new[3];						      \
-		new[0] += f(new[1], new[2], new[3]) +			      \
-		    buffer[wordOrder[i]] + table[i];			      \
-		new[3] = new[2];					      \
-		new[2] = new[1];					      \
-		new[1] += OF_ROL(new[0], rotateBits[(i % 4) + (i / 16) * 4]); \
-		new[0] = tmp;\
+#define LOOP_BODY(f)						\
+	{							\
+		uint32_t tmp = new[3];				\
+		tmp = new[3];					\
+		new[0] += f(new[1], new[2], new[3]) +		\
+		    buffer[wordOrder[i]] + table[i];		\
+		new[3] = new[2];				\
+		new[2] = new[1];				\
+		new[1] += OFRotateLeft(new[0],			\
+		    rotateBits[(i % 4) + (i / 16) * 4]);	\
+		new[0] = tmp;					\
 	}
 
 	for (; i < 16; i++)
 		LOOP_BODY(F)
 	for (; i < 32; i++)
@@ -245,25 +246,25 @@
 {
 	if (_calculated)
 		return (const unsigned char *)_iVars->state;
 
 	_iVars->buffer.bytes[_iVars->bufferLength] = 0x80;
-	of_explicit_memset(_iVars->buffer.bytes + _iVars->bufferLength + 1, 0,
+	OFZeroMemory(_iVars->buffer.bytes + _iVars->bufferLength + 1,
 	    64 - _iVars->bufferLength - 1);
 
 	if (_iVars->bufferLength >= 56) {
 		processBlock(_iVars->state, _iVars->buffer.words);
-		of_explicit_memset(_iVars->buffer.bytes, 0, 64);
+		OFZeroMemory(_iVars->buffer.bytes, 64);
 	}
 
 	_iVars->buffer.words[14] =
-	    OF_BSWAP32_IF_BE((uint32_t)(_iVars->bits & 0xFFFFFFFF));
+	    OFToLittleEndian32((uint32_t)(_iVars->bits & 0xFFFFFFFF));
 	_iVars->buffer.words[15] =
-	    OF_BSWAP32_IF_BE((uint32_t)(_iVars->bits >> 32));
+	    OFToLittleEndian32((uint32_t)(_iVars->bits >> 32));
 
 	processBlock(_iVars->state, _iVars->buffer.words);
-	of_explicit_memset(&_iVars->buffer, 0, sizeof(_iVars->buffer));
+	OFZeroMemory(&_iVars->buffer, sizeof(_iVars->buffer));
 	byteSwapVectorIfBE(_iVars->state, 4);
 	_calculated = true;
 
 	return (const unsigned char *)_iVars->state;
 }
@@ -270,10 +271,10 @@
 
 - (void)reset
 {
 	[self of_resetState];
 	_iVars->bits = 0;
-	of_explicit_memset(&_iVars->buffer, 0, sizeof(_iVars->buffer));
+	OFZeroMemory(&_iVars->buffer, sizeof(_iVars->buffer));
 	_iVars->bufferLength = 0;
 	_calculated = false;
 }
 @end