@@ -113,11 +113,11 @@
 {
 	const char *UTF8String = host.UTF8String;
 	bool hasColon = false;
 
 	while (*UTF8String != '\0') {
-		if (!of_ascii_isdigit(*UTF8String) && *UTF8String != ':' &&
+		if (!OFASCIIIsDigit(*UTF8String) && *UTF8String != ':' &&
 		    (*UTF8String < 'a' || *UTF8String > 'f') &&
 		    (*UTF8String < 'A' || *UTF8String > 'F'))
 			return false;
 
 		if (*UTF8String == ':')
@@ -151,11 +151,11 @@
 @end
 
 @implementation OFURLAllowedCharacterSet
 - (bool)characterIsMember: (OFUnichar)character
 {
-	if (character < CHAR_MAX && of_ascii_isalnum(character))
+	if (character < CHAR_MAX && OFASCIIIsAlnum(character))
 		return true;
 
 	switch (character) {
 	case '-':
 	case '.':
@@ -180,11 +180,11 @@
 @end
 
 @implementation OFURLSchemeAllowedCharacterSet
 - (bool)characterIsMember: (OFUnichar)character
 {
-	if (character < CHAR_MAX && of_ascii_isalnum(character))
+	if (character < CHAR_MAX && OFASCIIIsAlnum(character))
 		return true;
 
 	switch (character) {
 	case '+':
 	case '-':
@@ -197,11 +197,11 @@
 @end
 
 @implementation OFURLPathAllowedCharacterSet
 - (bool)characterIsMember: (OFUnichar)character
 {
-	if (character < CHAR_MAX && of_ascii_isalnum(character))
+	if (character < CHAR_MAX && OFASCIIIsAlnum(character))
 		return true;
 
 	switch (character) {
 	case '-':
 	case '.':
@@ -229,11 +229,11 @@
 @end
 
 @implementation OFURLQueryOrFragmentAllowedCharacterSet
 - (bool)characterIsMember: (OFUnichar)character
 {
-	if (character < CHAR_MAX && of_ascii_isalnum(character))
+	if (character < CHAR_MAX && OFASCIIIsAlnum(character))
 		return true;
 
 	switch (character) {
 	case '-':
 	case '.':
@@ -262,11 +262,11 @@
 @end
 
 @implementation OFURLQueryKeyValueAllowedCharacterSet
 - (bool)characterIsMember: (OFUnichar)character
 {
-	if (character < CHAR_MAX && of_ascii_isalnum(character))
+	if (character < CHAR_MAX && OFASCIIIsAlnum(character))
 		return true;
 
 	switch (character) {
 	case '-':
 	case '.':
@@ -442,11 +442,11 @@
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		char *tmp, *tmp2;
 		bool isIPv6Host = false;
 
-		if ((UTF8String2 = of_strdup(string.UTF8String)) == NULL)
+		if ((UTF8String2 = OFStrdup(string.UTF8String)) == NULL)
 			@throw [OFOutOfMemoryException
 			     exceptionWithRequestedSize:
 			     string.UTF8StringLength];
 
 		UTF8String = UTF8String2;
@@ -456,11 +456,11 @@
 
 		if (strncmp(tmp, "://", 3) != 0)
 			@throw [OFInvalidFormatException exception];
 
 		for (tmp2 = UTF8String; tmp2 < tmp; tmp2++)
-			*tmp2 = of_ascii_tolower(*tmp2);
+			*tmp2 = OFASCIIToLower(*tmp2);
 
 		_URLEncodedScheme = [[OFString alloc]
 		    initWithUTF8String: UTF8String
 				length: tmp - UTF8String];
 
@@ -503,11 +503,11 @@
 		}
 
 		if (UTF8String[0] == '[') {
 			tmp2 = UTF8String++;
 
-			while (of_ascii_isdigit(*UTF8String) ||
+			while (OFASCIIIsDigit(*UTF8String) ||
 			    *UTF8String == ':' ||
 			    (*UTF8String >= 'a' && *UTF8String <= 'f') ||
 			    (*UTF8String >= 'A' && *UTF8String <= 'F'))
 				UTF8String++;
 
@@ -524,11 +524,11 @@
 				OFString *portString;
 
 				tmp2 = ++UTF8String;
 
 				while (*UTF8String != '\0') {
-					if (!of_ascii_isdigit(*UTF8String))
+					if (!OFASCIIIsDigit(*UTF8String))
 						@throw [OFInvalidFormatException
 						    exception];
 
 					UTF8String++;
 				}
@@ -633,11 +633,11 @@
 		_URLEncodedHost = [URL->_URLEncodedHost copy];
 		_port = [URL->_port copy];
 		_URLEncodedUser = [URL->_URLEncodedUser copy];
 		_URLEncodedPassword = [URL->_URLEncodedPassword copy];
 
-		if ((UTF8String2 = of_strdup(string.UTF8String)) == NULL)
+		if ((UTF8String2 = OFStrdup(string.UTF8String)) == NULL)
 			@throw [OFOutOfMemoryException
 			     exceptionWithRequestedSize:
 			     string.UTF8StringLength];
 
 		UTF8String = UTF8String2;
@@ -845,24 +845,24 @@
 	return true;
 }
 
 - (unsigned long)hash
 {
-	uint32_t hash;
-
-	OF_HASH_INIT(hash);
-
-	OF_HASH_ADD_HASH(hash, _URLEncodedScheme.hash);
-	OF_HASH_ADD_HASH(hash, _URLEncodedHost.hash);
-	OF_HASH_ADD_HASH(hash, _port.hash);
-	OF_HASH_ADD_HASH(hash, _URLEncodedUser.hash);
-	OF_HASH_ADD_HASH(hash, _URLEncodedPassword.hash);
-	OF_HASH_ADD_HASH(hash, _URLEncodedPath.hash);
-	OF_HASH_ADD_HASH(hash, _URLEncodedQuery.hash);
-	OF_HASH_ADD_HASH(hash, _URLEncodedFragment.hash);
-
-	OF_HASH_FINALIZE(hash);
+	unsigned long hash;
+
+	OFHashInit(&hash);
+
+	OFHashAddHash(&hash, _URLEncodedScheme.hash);
+	OFHashAddHash(&hash, _URLEncodedHost.hash);
+	OFHashAddHash(&hash, _port.hash);
+	OFHashAddHash(&hash, _URLEncodedUser.hash);
+	OFHashAddHash(&hash, _URLEncodedPassword.hash);
+	OFHashAddHash(&hash, _URLEncodedPath.hash);
+	OFHashAddHash(&hash, _URLEncodedQuery.hash);
+	OFHashAddHash(&hash, _URLEncodedFragment.hash);
+
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (OFString *)scheme