@@ -40,11 +40,11 @@
 #ifndef OF_AMIGAOS
 static void
 parseLocale(char *locale, OFStringEncoding *encoding,
     OFString **language, OFString **territory)
 {
-	if ((locale = of_strdup(locale)) == NULL)
+	if ((locale = OFStrdup(locale)) == NULL)
 		return;
 
 	@try {
 		OFStringEncoding enc = OFStringEncodingASCII;
 		char *tmp;
@@ -219,11 +219,11 @@
 				    [first boolValue] && [second boolValue]];
 			else if ([token isEqual: @"||"])
 				var = [OFNumber numberWithBool:
 				    [first boolValue] || [second boolValue]];
 			else
-				OF_ENSURE(0);
+				OFEnsure(0);
 
 			[stack replaceObjectAtIndex: stackSize - 2
 					 withObject: var];
 			[stack removeLastObject];
 		} else if (precedence == 1) {
@@ -236,11 +236,11 @@
 			else if ([token isEqual: @"is_real"])
 				var = [OFNumber numberWithBool:
 				    ([first doubleValue] !=
 				    [first longLongValue])];
 			else
-				OF_ENSURE(0);
+				OFEnsure(0);
 
 			[stack replaceObjectAtIndex: stackSize - 1
 					 withObject: var];
 		} else
 			[stack addObject: token];
@@ -455,11 +455,11 @@
 			@try {
 				uint32_t territory;
 				size_t length;
 
 				territory =
-				    OF_BSWAP32_IF_LE(locale->loc_CountryCode);
+				    OFToBigEndian32(locale->loc_CountryCode);
 
 				for (length = 0; length < 4; length++)
 					if (((char *)&territory)[length] == 0)
 						break;