@@ -309,39 +309,39 @@
 
 - (uint16_t)readBigEndianInt16
 {
 	uint16_t ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 2];
-	return OF_BSWAP16_IF_LE(ret);
+	return OFFromBigEndian16(ret);
 }
 
 - (uint32_t)readBigEndianInt32
 {
 	uint32_t ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 4];
-	return OF_BSWAP32_IF_LE(ret);
+	return OFFromBigEndian32(ret);
 }
 
 - (uint64_t)readBigEndianInt64
 {
 	uint64_t ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 8];
-	return OF_BSWAP64_IF_LE(ret);
+	return OFFromBigEndian64(ret);
 }
 
 - (float)readBigEndianFloat
 {
 	float ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 4];
-	return OF_BSWAP_FLOAT_IF_LE(ret);
+	return OFFromBigEndianFloat(ret);
 }
 
 - (double)readBigEndianDouble
 {
 	double ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 8];
-	return OF_BSWAP_DOUBLE_IF_LE(ret);
+	return OFFromBigEndianDouble(ret);
 }
 
 - (size_t)readBigEndianInt16sIntoBuffer: (uint16_t *)buffer count: (size_t)count
 {
 	size_t size;
@@ -353,11 +353,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifndef OF_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP16(buffer[i]);
+		buffer[i] = OFByteSwap16(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -372,11 +372,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifndef OF_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP32(buffer[i]);
+		buffer[i] = OFByteSwap32(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -391,11 +391,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifndef OF_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP64(buffer[i]);
+		buffer[i] = OFByteSwap64(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -410,11 +410,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP_FLOAT(buffer[i]);
+		buffer[i] = OFByteSwapFloat(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -429,49 +429,49 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
+		buffer[i] = OFByteSwapDouble(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (uint16_t)readLittleEndianInt16
 {
 	uint16_t ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 2];
-	return OF_BSWAP16_IF_BE(ret);
+	return OFFromLittleEndian16(ret);
 }
 
 - (uint32_t)readLittleEndianInt32
 {
 	uint32_t ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 4];
-	return OF_BSWAP32_IF_BE(ret);
+	return OFFromLittleEndian32(ret);
 }
 
 - (uint64_t)readLittleEndianInt64
 {
 	uint64_t ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 8];
-	return OF_BSWAP64_IF_BE(ret);
+	return OFFromLittleEndian64(ret);
 }
 
 - (float)readLittleEndianFloat
 {
 	float ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 4];
-	return OF_BSWAP_FLOAT_IF_BE(ret);
+	return OFFromLittleEndianFloat(ret);
 }
 
 - (double)readLittleEndianDouble
 {
 	double ret;
 	[self readIntoBuffer: (char *)&ret exactLength: 8];
-	return OF_BSWAP_DOUBLE_IF_BE(ret);
+	return OFFromLittleEndianDouble(ret);
 }
 
 - (size_t)readLittleEndianInt16sIntoBuffer: (uint16_t *)buffer
 				     count: (size_t)count
 {
@@ -484,11 +484,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifdef OF_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP16(buffer[i]);
+		buffer[i] = OFByteSwap16(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -504,11 +504,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifdef OF_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP32(buffer[i]);
+		buffer[i] = OFByteSwap32(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -524,11 +524,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifdef OF_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP64(buffer[i]);
+		buffer[i] = OFByteSwap64(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -544,11 +544,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP_FLOAT(buffer[i]);
+		buffer[i] = OFByteSwapFloat(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -564,11 +564,11 @@
 
 	[self readIntoBuffer: buffer exactLength: size];
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	for (size_t i = 0; i < count; i++)
-		buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
+		buffer[i] = OFByteSwapDouble(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -1212,35 +1212,35 @@
 	[self writeBuffer: (char *)&int8 length: 1];
 }
 
 - (void)writeBigEndianInt16: (uint16_t)int16
 {
-	int16 = OF_BSWAP16_IF_LE(int16);
+	int16 = OFToBigEndian16(int16);
 	[self writeBuffer: (char *)&int16 length: 2];
 }
 
 - (void)writeBigEndianInt32: (uint32_t)int32
 {
-	int32 = OF_BSWAP32_IF_LE(int32);
+	int32 = OFToBigEndian32(int32);
 	[self writeBuffer: (char *)&int32 length: 4];
 }
 
 - (void)writeBigEndianInt64: (uint64_t)int64
 {
-	int64 = OF_BSWAP64_IF_LE(int64);
+	int64 = OFToBigEndian64(int64);
 	[self writeBuffer: (char *)&int64 length: 8];
 }
 
 - (void)writeBigEndianFloat: (float)float_
 {
-	float_ = OF_BSWAP_FLOAT_IF_LE(float_);
+	float_ = OFToBigEndianFloat(float_);
 	[self writeBuffer: (char *)&float_ length: 4];
 }
 
 - (void)writeBigEndianDouble: (double)double_
 {
-	double_ = OF_BSWAP_DOUBLE_IF_LE(double_);
+	double_ = OFToBigEndianDouble(double_);
 	[self writeBuffer: (char *)&double_ length: 8];
 }
 
 - (size_t)writeBigEndianInt16s: (const uint16_t *)buffer count: (size_t)count
 {
@@ -1256,11 +1256,11 @@
 #else
 	uint16_t *tmp = OFAllocMemory(count, sizeof(uint16_t));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP16(buffer[i]);
+			tmp[i] = OFByteSwap16(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1283,11 +1283,11 @@
 #else
 	uint32_t *tmp = OFAllocMemory(count, sizeof(uint32_t));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP32(buffer[i]);
+			tmp[i] = OFByteSwap32(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1310,11 +1310,11 @@
 #else
 	uint64_t *tmp = OFAllocMemory(count, sizeof(uint64_t));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP64(buffer[i]);
+			tmp[i] = OFByteSwap64(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1337,11 +1337,11 @@
 #else
 	float *tmp = OFAllocMemory(count, sizeof(float));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP_FLOAT(buffer[i]);
+			tmp[i] = OFByteSwapFloat(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1364,11 +1364,11 @@
 #else
 	double *tmp = OFAllocMemory(count, sizeof(double));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP_DOUBLE(buffer[i]);
+			tmp[i] = OFByteSwapDouble(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1377,35 +1377,35 @@
 	return size;
 }
 
 - (void)writeLittleEndianInt16: (uint16_t)int16
 {
-	int16 = OF_BSWAP16_IF_BE(int16);
+	int16 = OFToLittleEndian16(int16);
 	[self writeBuffer: (char *)&int16 length: 2];
 }
 
 - (void)writeLittleEndianInt32: (uint32_t)int32
 {
-	int32 = OF_BSWAP32_IF_BE(int32);
+	int32 = OFToLittleEndian32(int32);
 	[self writeBuffer: (char *)&int32 length: 4];
 }
 
 - (void)writeLittleEndianInt64: (uint64_t)int64
 {
-	int64 = OF_BSWAP64_IF_BE(int64);
+	int64 = OFToLittleEndian64(int64);
 	[self writeBuffer: (char *)&int64 length: 8];
 }
 
 - (void)writeLittleEndianFloat: (float)float_
 {
-	float_ = OF_BSWAP_FLOAT_IF_BE(float_);
+	float_ = OFToLittleEndianFloat(float_);
 	[self writeBuffer: (char *)&float_ length: 4];
 }
 
 - (void)writeLittleEndianDouble: (double)double_
 {
-	double_ = OF_BSWAP_DOUBLE_IF_BE(double_);
+	double_ = OFToLittleEndianDouble(double_);
 	[self writeBuffer: (char *)&double_ length: 8];
 }
 
 - (size_t)writeLittleEndianInt16s: (const uint16_t *)buffer count: (size_t)count
 {
@@ -1421,11 +1421,11 @@
 #else
 	uint16_t *tmp = OFAllocMemory(count, sizeof(uint16_t));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP16(buffer[i]);
+			tmp[i] = OFByteSwap16(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1448,11 +1448,11 @@
 #else
 	uint32_t *tmp = OFAllocMemory(count, sizeof(uint32_t));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP32(buffer[i]);
+			tmp[i] = OFByteSwap32(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1475,11 +1475,11 @@
 #else
 	uint64_t *tmp = OFAllocMemory(count, sizeof(uint64_t));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP64(buffer[i]);
+			tmp[i] = OFByteSwap64(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1502,11 +1502,11 @@
 #else
 	float *tmp = OFAllocMemory(count, sizeof(float));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP_FLOAT(buffer[i]);
+			tmp[i] = OFByteSwapFloat(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}
@@ -1529,11 +1529,11 @@
 #else
 	double *tmp = OFAllocMemory(count, sizeof(double));
 
 	@try {
 		for (size_t i = 0; i < count; i++)
-			tmp[i] = OF_BSWAP_DOUBLE(buffer[i]);
+			tmp[i] = OFByteSwapDouble(buffer[i]);
 
 		[self writeBuffer: tmp length: size];
 	} @finally {
 		OFFreeMemory(tmp);
 	}