@@ -47,11 +47,11 @@
 /* References for static linking */
 void
 _references_to_categories_of_OFData(void)
 {
 	_OFData_CryptoHashing_reference = 1;
-	_OFData_MessagePackValue_reference = 1;
+	_OFData_MessagePackParsing_reference = 1;
 }
 
 @implementation OFData
 @synthesize itemSize = _itemSize;
 
@@ -181,19 +181,19 @@
 
 #ifdef OF_HAVE_FILES
 - (instancetype)initWithContentsOfFile: (OFString *)path
 {
 	char *buffer = NULL;
-	uintmax_t size;
+	unsigned long long size;
 
 	@try {
 		OFFile *file;
 
 		size = [[OFFileManager defaultManager]
 		    attributesOfItemAtPath: path].fileSize;
 
-# if UINTMAX_MAX > SIZE_MAX
+# if ULLONG_MAX > SIZE_MAX
 		if (size > SIZE_MAX)
 			@throw [OFOutOfRangeException exception];
 # endif
 
 		if ((buffer = malloc((size_t)size)) == NULL)