Index: src/OFMD5Hash.m
==================================================================
--- src/OFMD5Hash.m
+++ src/OFMD5Hash.m
@@ -59,17 +59,19 @@
 	5, 9, 14, 20,
 	4, 11, 16, 23,
 	6, 10, 15, 21
 };
 
-static void
+static OF_INLINE void
 byteSwapVectorIfBE(uint32_t *vector, uint_fast8_t length)
 {
+#ifdef OF_BIG_ENDIAN
 	uint_fast8_t i;
 
 	for (i = 0; i < length; i++)
-		vector[i] = OF_BSWAP32_IF_BE(vector[i]);
+		vector[i] = OF_BSWAP32(vector[i]);
+#endif
 }
 
 static void
 processBlock(uint32_t *state, uint32_t *buffer)
 {

Index: src/OFRIPEMD160Hash.m
==================================================================
--- src/OFRIPEMD160Hash.m
+++ src/OFRIPEMD160Hash.m
@@ -55,17 +55,19 @@
 	9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5,
 	15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8,
 	8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11
 };
 
-static void
+static OF_INLINE void
 byteSwapVectorIfBE(uint32_t *vector, uint_fast8_t length)
 {
+#ifdef OF_BIG_ENDIAN
 	uint_fast8_t i;
 
 	for (i = 0; i < length; i++)
-		vector[i] = OF_BSWAP32_IF_BE(vector[i]);
+		vector[i] = OF_BSWAP32(vector[i]);
+#endif
 }
 
 static void
 processBlock(uint32_t *state, uint32_t *buffer)
 {

Index: src/OFSHA1Hash.m
==================================================================
--- src/OFSHA1Hash.m
+++ src/OFSHA1Hash.m
@@ -25,17 +25,19 @@
 #define F(a, b, c, d) ((d) ^ ((b) & ((c) ^ (d))))
 #define G(a, b, c, d) ((b) ^ (c) ^ (d))
 #define H(a, b, c, d) (((b) & (c)) | ((d) & ((b) | (c))))
 #define I(a, b, c, d) ((b) ^ (c) ^ (d))
 
-static void
+static OF_INLINE void
 byteSwapVectorIfLE(uint32_t *vector, uint_fast8_t length)
 {
+#ifndef OF_BIG_ENDIAN
 	uint_fast8_t i;
 
 	for (i = 0; i < length; i++)
-		vector[i] = OF_BSWAP32_IF_LE(vector[i]);
+		vector[i] = OF_BSWAP32(vector[i]);
+#endif
 }
 
 static void
 processBlock(uint32_t *state, uint32_t *buffer)
 {

Index: src/OFSHA224Or256Hash.m
==================================================================
--- src/OFSHA224Or256Hash.m
+++ src/OFSHA224Or256Hash.m
@@ -40,17 +40,19 @@
 	0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3,
 	0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208,
 	0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2
 };
 
-static void
+static OF_INLINE void
 byteSwapVectorIfLE(uint32_t *vector, uint_fast8_t length)
 {
+#ifndef OF_BIG_ENDIAN
 	uint_fast8_t i;
 
 	for (i = 0; i < length; i++)
-		vector[i] = OF_BSWAP32_IF_LE(vector[i]);
+		vector[i] = OF_BSWAP32(vector[i]);
+#endif
 }
 
 static void
 processBlock(uint32_t *state, uint32_t *buffer)
 {

Index: src/OFSHA384Or512Hash.m
==================================================================
--- src/OFSHA384Or512Hash.m
+++ src/OFSHA384Or512Hash.m
@@ -51,17 +51,19 @@
 	0x28DB77F523047D84, 0x32CAAB7B40C72493, 0x3C9EBE0A15C9BEBC,
 	0x431D67C49C100D4C, 0x4CC5D4BECB3E42B6, 0x597F299CFC657E2A,
 	0x5FCB6FAB3AD6FAEC, 0x6C44198C4A475817
 };
 
-static void
+static OF_INLINE void
 byteSwapVectorIfLE(uint64_t *vector, uint_fast8_t length)
 {
+#ifndef OF_BIG_ENDIAN
 	uint_fast8_t i;
 
 	for (i = 0; i < length; i++)
-		vector[i] = OF_BSWAP64_IF_LE(vector[i]);
+		vector[i] = OF_BSWAP64(vector[i]);
+#endif
 }
 
 static void
 processBlock(uint64_t *state, uint64_t *buffer)
 {