@@ -109,14 +109,14 @@
 		skipWhitespaces(pointer, stop, line);
 		skipComment(pointer, stop, line);
 	}
 }
 
-static inline uint16_t
+static inline of_char16_t
 parseUnicodeEscape(const char *pointer, const char *stop)
 {
-	uint16_t ret = 0;
+	of_char16_t ret = 0;
 	char i;
 
 	if (pointer + 5 >= stop)
 		return 0xFFFF;
 
@@ -192,11 +192,11 @@
 				buffer[i++] = '\t';
 				(*pointer)++;
 				break;
 			/* Parse unicode escape sequence */
 			case 'u':;
-				uint16_t c1, c2;
+				of_char16_t c1, c2;
 				of_unichar_t c;
 				size_t l;
 
 				c1 = parseUnicodeEscape(*pointer - 1, stop);
 				if (c1 == 0xFFFF) {
@@ -311,11 +311,11 @@
 		    **pointer == '_' || **pointer == '$' ||
 		    (**pointer & 0x80)) {
 			buffer[i++] = **pointer;
 			(*pointer)++;
 		} else if (**pointer == '\\') {
-			uint16_t c1, c2;
+			of_char16_t c1, c2;
 			of_unichar_t c;
 			size_t l;
 
 			if (++(*pointer) >= stop || **pointer != 'u') {
 				free(buffer);