@@ -175,11 +175,11 @@
 	return OF_RETAIN_COUNT_MAX;
 }
 
 - (bool)characterIsMember: (OFUnichar)character
 {
-	if (character < CHAR_MAX && of_ascii_isalnum(character))
+	if (character < CHAR_MAX && OFASCIIIsAlnum(character))
 		return true;
 
 	switch (character) {
 	case '-':
 	case '.':
@@ -822,17 +822,17 @@
 	if (count <= 15) {
 		uint8_t tmp = 0x80 | ((uint8_t)count & 0xF);
 		[data addItem: &tmp];
 	} else if (count <= UINT16_MAX) {
 		uint8_t type = 0xDE;
-		uint16_t tmp = OF_BSWAP16_IF_LE((uint16_t)count);
+		uint16_t tmp = OFToBigEndian16((uint16_t)count);
 
 		[data addItem: &type];
 		[data addItems: &tmp count: sizeof(tmp)];
 	} else if (count <= UINT32_MAX) {
 		uint8_t type = 0xDF;
-		uint32_t tmp = OF_BSWAP32_IF_LE((uint32_t)count);
+		uint32_t tmp = OFToBigEndian32((uint32_t)count);
 
 		[data addItem: &type];
 		[data addItems: &tmp count: sizeof(tmp)];
 	} else
 		@throw [OFOutOfRangeException exception];