@@ -205,51 +205,51 @@
 	uint16_t ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 2];
 
-	return of_bswap16_if_le(ret);
+	return OF_BSWAP16_IF_LE(ret);
 }
 
 - (uint32_t)readBigEndianInt32
 {
 	uint32_t ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 4];
 
-	return of_bswap32_if_le(ret);
+	return OF_BSWAP32_IF_LE(ret);
 }
 
 - (uint64_t)readBigEndianInt64
 {
 	uint64_t ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 8];
 
-	return of_bswap64_if_le(ret);
+	return OF_BSWAP64_IF_LE(ret);
 }
 
 - (float)readBigEndianFloat
 {
 	float ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 4];
 
-	return of_bswap_float_if_le(ret);
+	return OF_BSWAP_FLOAT_IF_LE(ret);
 }
 
 - (double)readBigEndianDouble
 {
 	double ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 8];
 
-	return of_bswap_double_if_le(ret);
+	return OF_BSWAP_DOUBLE_IF_LE(ret);
 }
 
 - (size_t)readBigEndianInt16sIntoBuffer: (uint16_t*)buffer
 				  count: (size_t)nInt16s
 {
@@ -260,11 +260,11 @@
 
 #ifndef OF_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nInt16s; i++)
-		buffer[i] = of_bswap16(buffer[i]);
+		buffer[i] = OF_BSWAP16(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -278,11 +278,11 @@
 
 #ifndef OF_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nInt32s; i++)
-		buffer[i] = of_bswap32(buffer[i]);
+		buffer[i] = OF_BSWAP32(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -296,11 +296,11 @@
 
 #ifndef OF_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nInt64s; i++)
-		buffer[i] = of_bswap64(buffer[i]);
+		buffer[i] = OF_BSWAP64(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -314,11 +314,11 @@
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nFloats; i++)
-		buffer[i] = of_bswap_float(buffer[i]);
+		buffer[i] = OF_BSWAP_FLOAT(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -332,11 +332,11 @@
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nDoubles; i++)
-		buffer[i] = of_bswap_double(buffer[i]);
+		buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -345,51 +345,51 @@
 	uint16_t ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 2];
 
-	return of_bswap16_if_be(ret);
+	return OF_BSWAP16_IF_BE(ret);
 }
 
 - (uint32_t)readLittleEndianInt32
 {
 	uint32_t ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 4];
 
-	return of_bswap32_if_be(ret);
+	return OF_BSWAP32_IF_BE(ret);
 }
 
 - (uint64_t)readLittleEndianInt64
 {
 	uint64_t ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 8];
 
-	return of_bswap64_if_be(ret);
+	return OF_BSWAP64_IF_BE(ret);
 }
 
 - (float)readLittleEndianFloat
 {
 	float ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 4];
 
-	return of_bswap_float_if_be(ret);
+	return OF_BSWAP_FLOAT_IF_BE(ret);
 }
 
 - (double)readLittleEndianDouble
 {
 	double ret;
 
 	[self readIntoBuffer: (char*)&ret
 		 exactLength: 8];
 
-	return of_bswap_double_if_be(ret);
+	return OF_BSWAP_DOUBLE_IF_BE(ret);
 }
 
 - (size_t)readLittleEndianInt16sIntoBuffer: (uint16_t*)buffer
 				     count: (size_t)nInt16s
 {
@@ -400,11 +400,11 @@
 
 #ifdef OF_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nInt16s; i++)
-		buffer[i] = of_bswap16(buffer[i]);
+		buffer[i] = OF_BSWAP16(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -418,11 +418,11 @@
 
 #ifdef OF_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nInt32s; i++)
-		buffer[i] = of_bswap32(buffer[i]);
+		buffer[i] = OF_BSWAP32(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -436,11 +436,11 @@
 
 #ifdef OF_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nInt64s; i++)
-		buffer[i] = of_bswap64(buffer[i]);
+		buffer[i] = OF_BSWAP64(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -454,11 +454,11 @@
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nFloats; i++)
-		buffer[i] = of_bswap_float(buffer[i]);
+		buffer[i] = OF_BSWAP_FLOAT(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -472,11 +472,11 @@
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
 	for (i = 0; i < nDoubles; i++)
-		buffer[i] = of_bswap_double(buffer[i]);
+		buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
 #endif
 
 	return size;
 }
 
@@ -973,43 +973,43 @@
 		   length: 1];
 }
 
 - (void)writeBigEndianInt16: (uint16_t)int16
 {
-	int16 = of_bswap16_if_le(int16);
+	int16 = OF_BSWAP16_IF_LE(int16);
 
 	[self writeBuffer: (char*)&int16
 		   length: 2];
 }
 
 - (void)writeBigEndianInt32: (uint32_t)int32
 {
-	int32 = of_bswap32_if_le(int32);
+	int32 = OF_BSWAP32_IF_LE(int32);
 
 	[self writeBuffer: (char*)&int32
 		   length: 4];
 }
 
 - (void)writeBigEndianInt64: (uint64_t)int64
 {
-	int64 = of_bswap64_if_le(int64);
+	int64 = OF_BSWAP64_IF_LE(int64);
 
 	[self writeBuffer: (char*)&int64
 		   length: 8];
 }
 
 - (void)writeBigEndianFloat: (float)float_
 {
-	float_ = of_bswap_float_if_le(float_);
+	float_ = OF_BSWAP_FLOAT_IF_LE(float_);
 
 	[self writeBuffer: (char*)&float_
 		   length: 4];
 }
 
 - (void)writeBigEndianDouble: (double)double_
 {
-	double_ = of_bswap_double_if_le(double_);
+	double_ = OF_BSWAP_DOUBLE_IF_LE(double_);
 
 	[self writeBuffer: (char*)&double_
 		   length: 8];
 }
 
@@ -1029,11 +1029,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
-			tmp[i] = of_bswap16(buffer[i]);
+			tmp[i] = OF_BSWAP16(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1059,11 +1059,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
-			tmp[i] = of_bswap32(buffer[i]);
+			tmp[i] = OF_BSWAP32(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1089,11 +1089,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
-			tmp[i] = of_bswap64(buffer[i]);
+			tmp[i] = OF_BSWAP64(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1119,11 +1119,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
-			tmp[i] = of_bswap_float(buffer[i]);
+			tmp[i] = OF_BSWAP_FLOAT(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1149,11 +1149,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)
-			tmp[i] = of_bswap_double(buffer[i]);
+			tmp[i] = OF_BSWAP_DOUBLE(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1163,43 +1163,43 @@
 	return size;
 }
 
 - (void)writeLittleEndianInt16: (uint16_t)int16
 {
-	int16 = of_bswap16_if_be(int16);
+	int16 = OF_BSWAP16_IF_BE(int16);
 
 	[self writeBuffer: (char*)&int16
 		   length: 2];
 }
 
 - (void)writeLittleEndianInt32: (uint32_t)int32
 {
-	int32 = of_bswap32_if_be(int32);
+	int32 = OF_BSWAP32_IF_BE(int32);
 
 	[self writeBuffer: (char*)&int32
 		   length: 4];
 }
 
 - (void)writeLittleEndianInt64: (uint64_t)int64
 {
-	int64 = of_bswap64_if_be(int64);
+	int64 = OF_BSWAP64_IF_BE(int64);
 
 	[self writeBuffer: (char*)&int64
 		   length: 8];
 }
 
 - (void)writeLittleEndianFloat: (float)float_
 {
-	float_ = of_bswap_float_if_be(float_);
+	float_ = OF_BSWAP_FLOAT_IF_BE(float_);
 
 	[self writeBuffer: (char*)&float_
 		   length: 4];
 }
 
 - (void)writeLittleEndianDouble: (double)double_
 {
-	double_ = of_bswap_double_if_be(double_);
+	double_ = OF_BSWAP_DOUBLE_IF_BE(double_);
 
 	[self writeBuffer: (char*)&double_
 		   length: 8];
 }
 
@@ -1219,11 +1219,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
-			tmp[i] = of_bswap16(buffer[i]);
+			tmp[i] = OF_BSWAP16(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1249,11 +1249,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
-			tmp[i] = of_bswap32(buffer[i]);
+			tmp[i] = OF_BSWAP32(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1279,11 +1279,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
-			tmp[i] = of_bswap64(buffer[i]);
+			tmp[i] = OF_BSWAP64(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1309,11 +1309,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
-			tmp[i] = of_bswap_float(buffer[i]);
+			tmp[i] = OF_BSWAP_FLOAT(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];
@@ -1339,11 +1339,11 @@
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)
-			tmp[i] = of_bswap_double(buffer[i]);
+			tmp[i] = OF_BSWAP_DOUBLE(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
 		[self freeMemory: tmp];