@@ -497,11 +497,11 @@
 		s->length = length;
 
 		for (i = 0; i < length; i++) {
 			char buffer[4];
 			size_t characterLen = of_string_utf8_encode(
-			    (swap ? of_bswap32(string[i]) : string[i]),
+			    (swap ? OF_BSWAP32(string[i]) : string[i]),
 			    buffer);
 
 			switch (characterLen) {
 			case 1:
 				s->cString[j++] = buffer[0];
@@ -579,11 +579,11 @@
 		s->length = length;
 
 		for (i = 0; i < length; i++) {
 			char buffer[4];
 			of_unichar_t character =
-			    (swap ? of_bswap16(string[i]) : string[i]);
+			    (swap ? OF_BSWAP16(string[i]) : string[i]);
 			size_t characterLen;
 
 			/* Missing high surrogate */
 			if ((character & 0xFC00) == 0xDC00)
 				@throw [OFInvalidEncodingException
@@ -595,11 +595,11 @@
 				if (length <= i + 1)
 					@throw [OFInvalidEncodingException
 					    exceptionWithClass: [self class]];
 
 				nextCharacter = (swap
-				    ? of_bswap16(string[i + 1])
+				    ? OF_BSWAP16(string[i + 1])
 				    : string[i + 1]);
 				character = (((character & 0x3FF) << 10) |
 				    (nextCharacter & 0x3FF)) + 0x10000;
 
 				i++;