@@ -1633,12 +1633,12 @@
 
 			if (tc)
 				oc = tc;
 		}
 #else
-		c = of_ascii_toupper(c);
-		oc = of_ascii_toupper(oc);
+		c = OFASCIIToUpper(c);
+		oc = OFASCIIToUpper(oc);
 #endif
 
 		if (c > oc) {
 			objc_autoreleasePoolPop(pool);
 			return OFOrderedDescending;
@@ -1661,23 +1661,23 @@
 
 - (unsigned long)hash
 {
 	const OFUnichar *characters = self.characters;
 	size_t length = self.length;
-	uint32_t hash;
+	unsigned long hash;
 
-	OF_HASH_INIT(hash);
+	OFHashInit(&hash);
 
 	for (size_t i = 0; i < length; i++) {
 		const OFUnichar c = characters[i];
 
-		OF_HASH_ADD(hash, (c & 0xFF0000) >> 16);
-		OF_HASH_ADD(hash, (c & 0x00FF00) >> 8);
-		OF_HASH_ADD(hash, c & 0x0000FF);
+		OFHashAdd(&hash, (c & 0xFF0000) >> 16);
+		OFHashAdd(&hash, (c & 0x00FF00) >> 8);
+		OFHashAdd(&hash, c & 0x0000FF);
 	}
 
-	OF_HASH_FINALIZE(hash);
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (OFString *)description
@@ -1736,11 +1736,11 @@
 		[JSON replaceOccurrencesOfString: @"\n" withString: @"\\\n"];
 
 		if (options & OFJSONRepresentationOptionIsIdentifier) {
 			const char *cString = self.UTF8String;
 
-			if ((!of_ascii_isalpha(cString[0]) &&
+			if ((!OFASCIIIsAlpha(cString[0]) &&
 			    cString[0] != '_' && cString[0] != '$') ||
 			    strpbrk(cString, " \n\r\t\b\f\\\"'") != NULL) {
 				[JSON prependString: @"\""];
 				[JSON appendString: @"\""];
 			}
@@ -1779,18 +1779,18 @@
 		data = [OFMutableData dataWithCapacity: length + 2];
 		[data addItem: &type];
 		[data addItem: &tmp];
 	} else if (length <= UINT16_MAX) {
 		uint8_t type = 0xDA;
-		uint16_t tmp = OF_BSWAP16_IF_LE((uint16_t)length);
+		uint16_t tmp = OFToBigEndian16((uint16_t)length);
 
 		data = [OFMutableData dataWithCapacity: length + 3];
 		[data addItem: &type];
 		[data addItems: &tmp count: sizeof(tmp)];
 	} else if (length <= UINT32_MAX) {
 		uint8_t type = 0xDB;
-		uint32_t tmp = OF_BSWAP32_IF_LE((uint32_t)length);
+		uint32_t tmp = OFToBigEndian32((uint32_t)length);
 
 		data = [OFMutableData dataWithCapacity: length + 5];
 		[data addItem: &type];
 		[data addItems: &tmp count: sizeof(tmp)];
 	} else
@@ -2282,11 +2282,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	const char *UTF8String = self.UTF8String;
 	bool negative = false;
 	long long value = 0;
 
-	while (of_ascii_isspace(*UTF8String))
+	while (OFASCIIIsSpace(*UTF8String))
 		UTF8String++;
 
 	switch (*UTF8String) {
 	case '-':
 		negative = true;
@@ -2313,19 +2313,19 @@
 
 	if (base == 0)
 		base = 10;
 
 	while (*UTF8String != '\0') {
-		unsigned char c = of_ascii_toupper(*UTF8String++);
+		unsigned char c = OFASCIIToUpper(*UTF8String++);
 
 		if (c >= '0' && c <= '9')
 			c -= '0';
 		else if (c >= 'A' && c <= 'Z')
 			c -= ('A' - 10);
-		else if (of_ascii_isspace(c)) {
+		else if (OFASCIIIsSpace(c)) {
 			while (*UTF8String != '\0')
-				if (!of_ascii_isspace(*UTF8String++))
+				if (!OFASCIIIsSpace(*UTF8String++))
 					@throw [OFInvalidFormatException
 					    exception];
 
 			break;
 		} else
@@ -2357,11 +2357,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	const char *UTF8String = self.UTF8String;
 	unsigned long long value = 0;
 
-	while (of_ascii_isspace(*UTF8String))
+	while (OFASCIIIsSpace(*UTF8String))
 		UTF8String++;
 
 	switch (*UTF8String) {
 	case '-':
 		@throw [OFInvalidFormatException exception];
@@ -2388,19 +2388,19 @@
 
 	if (base == 0)
 		base = 10;
 
 	while (*UTF8String != '\0') {
-		unsigned char c = of_ascii_toupper(*UTF8String++);
+		unsigned char c = OFASCIIToUpper(*UTF8String++);
 
 		if (c >= '0' && c <= '9')
 			c -= '0';
 		else if (c >= 'A' && c <= 'Z')
 			c -= ('A' - 10);
-		else if (of_ascii_isspace(c)) {
+		else if (OFASCIIIsSpace(c)) {
 			while (*UTF8String != '\0')
-				if (!of_ascii_isspace(*UTF8String++))
+				if (!OFASCIIIsSpace(*UTF8String++))
 					@throw [OFInvalidFormatException
 					    exception];
 
 			break;
 		} else
@@ -2573,14 +2573,15 @@
 		}
 
 		if (swap) {
 			if (c > 0xFFFF) {
 				c -= 0x10000;
-				buffer[j++] = OF_BSWAP16(0xD800 | (c >> 10));
-				buffer[j++] = OF_BSWAP16(0xDC00 | (c & 0x3FF));
+				buffer[j++] = OFByteSwap16(0xD800 | (c >> 10));
+				buffer[j++] =
+				    OFByteSwap16(0xDC00 | (c & 0x3FF));
 			} else
-				buffer[j++] = OF_BSWAP16(c);
+				buffer[j++] = OFByteSwap16(c);
 		} else {
 			if (c > 0xFFFF) {
 				c -= 0x10000;
 				buffer[j++] = 0xD800 | (c >> 10);
 				buffer[j++] = 0xDC00 | (c & 0x3FF);
@@ -2638,11 +2639,11 @@
 		[self getCharacters: buffer inRange: OFRangeMake(0, length)];
 		buffer[length] = 0;
 
 		if (byteOrder != OFByteOrderNative)
 			for (size_t i = 0; i < length; i++)
-				buffer[i] = OF_BSWAP32(buffer[i]);
+				buffer[i] = OFByteSwap32(buffer[i]);
 
 		return [[OFData dataWithItemsNoCopy: buffer
 					      count: length + 1
 					   itemSize: sizeof(OFChar32)
 				       freeWhenDone: true] items];