diff --git a/src/Nazara/Core/Hash/CRC64.cpp b/src/Nazara/Core/Hash/CRC64.cpp
index 27dfba104..b289d64ba 100644
--- a/src/Nazara/Core/Hash/CRC64.cpp
+++ b/src/Nazara/Core/Hash/CRC64.cpp
@@ -93,9 +93,8 @@ namespace Nz
 
 	ByteArray CRC64Hasher::End()
 	{
-#ifdef NAZARA_BIG_ENDIAN
-		m_crc = ByteSwap(m_crc);
-#endif
+		m_crc = BigEndianToHost(m_crc);
+
 		return ByteArray(reinterpret_cast<UInt8*>(&m_crc), 8);
 	}
 
diff --git a/src/Nazara/Core/Hash/Fletcher16.cpp b/src/Nazara/Core/Hash/Fletcher16.cpp
index 1a79b3155..f677fa83b 100644
--- a/src/Nazara/Core/Hash/Fletcher16.cpp
+++ b/src/Nazara/Core/Hash/Fletcher16.cpp
@@ -38,12 +38,7 @@ namespace Nz
 		m_sum1 = (m_sum1 & 0xFF) + (m_sum1 >> 8);
 		m_sum2 = (m_sum2 & 0xFF) + (m_sum2 >> 8);
 
-		UInt16 fletcher = (m_sum2 << 8) | m_sum1;
-
-#ifdef NAZARA_BIG_ENDIAN
-		fletcher = ByteSwap(fletcher);
-#endif
-
+		UInt16 fletcher = BigEndianToHost((m_sum2 << 8) | m_sum1);
 		return ByteArray(reinterpret_cast<UInt8*>(&fletcher), 2);
 	}