$OpenBSD$
--- doomsday/libcore/src/data/byteorder.cpp.orig	Sun Jan 31 19:37:12 2016
+++ doomsday/libcore/src/data/byteorder.cpp	Sun Oct 30 00:30:17 2016
@@ -95,7 +95,7 @@ void BigEndianByteOrder::foreignToNative(de::duint16 c
 #ifdef __BIG_ENDIAN__ 
     nativeValue = foreignValue;
 #else
-    nativeValue = swap16(foreignValue);
+    nativeValue = duswap16(foreignValue);
 #endif
 }
 
@@ -104,7 +104,7 @@ void BigEndianByteOrder::foreignToNative(de::duint32 c
 #ifdef __BIG_ENDIAN__ 
     nativeValue = foreignValue;
 #else
-    nativeValue = swap32(foreignValue);
+    nativeValue = duswap32(foreignValue);
 #endif
 }
 
@@ -113,7 +113,7 @@ void BigEndianByteOrder::foreignToNative(de::duint64 c
 #ifdef __BIG_ENDIAN__ 
     nativeValue = foreignValue;
 #else
-    nativeValue = swap64(foreignValue);
+    nativeValue = duswap64(foreignValue);
 #endif
 }
 
@@ -122,7 +122,7 @@ void BigEndianByteOrder::nativeToForeign(de::duint16 c
 #ifdef __BIG_ENDIAN__ 
     foreignValue = nativeValue;
 #else
-    foreignValue = swap16(nativeValue);
+    foreignValue = duswap16(nativeValue);
 #endif
 }
 
@@ -131,7 +131,7 @@ void BigEndianByteOrder::nativeToForeign(de::duint32 c
 #ifdef __BIG_ENDIAN__ 
     foreignValue = nativeValue;
 #else
-    foreignValue = swap32(nativeValue);
+    foreignValue = duswap32(nativeValue);
 #endif
 }
 
@@ -140,7 +140,7 @@ void BigEndianByteOrder::nativeToForeign(de::duint64 c
 #ifdef __BIG_ENDIAN__ 
     foreignValue = nativeValue;
 #else
-    foreignValue = swap64(nativeValue);
+    foreignValue = duswap64(nativeValue);
 #endif
 }
 
@@ -149,7 +149,7 @@ void LittleEndianByteOrder::foreignToNative(de::duint1
 #ifndef __BIG_ENDIAN__ 
     nativeValue = foreignValue;
 #else
-    nativeValue = swap16(foreignValue);
+    nativeValue = duswap16(foreignValue);
 #endif
 }
 
@@ -158,7 +158,7 @@ void LittleEndianByteOrder::foreignToNative(de::duint3
 #ifndef __BIG_ENDIAN__ 
     nativeValue = foreignValue;
 #else
-    nativeValue = swap32(foreignValue);
+    nativeValue = duswap32(foreignValue);
 #endif
 }
 
@@ -167,7 +167,7 @@ void LittleEndianByteOrder::foreignToNative(de::duint6
 #ifndef __BIG_ENDIAN__ 
     nativeValue = foreignValue;
 #else
-    nativeValue = swap64(foreignValue);
+    nativeValue = duswap64(foreignValue);
 #endif
 }
 
@@ -176,7 +176,7 @@ void LittleEndianByteOrder::nativeToForeign(de::duint1
 #ifndef __BIG_ENDIAN__ 
     foreignValue = nativeValue;
 #else
-    foreignValue = swap16(nativeValue);
+    foreignValue = duswap16(nativeValue);
 #endif
 }
 
@@ -185,7 +185,7 @@ void LittleEndianByteOrder::nativeToForeign(de::duint3
 #ifndef __BIG_ENDIAN__ 
     foreignValue = nativeValue;
 #else
-    foreignValue = swap32(nativeValue);
+    foreignValue = duswap32(nativeValue);
 #endif
 }
 
@@ -194,11 +194,11 @@ void LittleEndianByteOrder::nativeToForeign(de::duint6
 #ifndef __BIG_ENDIAN__ 
     foreignValue = nativeValue;
 #else
-    foreignValue = swap64(nativeValue);
+    foreignValue = duswap64(nativeValue);
 #endif
 }
 
-de::duint64 de::swap64(de::duint64 const &n)
+de::duint64 de::duswap64(de::duint64 const &n)
 {
     de::duint64 result;
     dbyte const *in = reinterpret_cast<dbyte const *>(&n);