Index: source/lib/sysdep/os/bsd/bcpu.cpp
===================================================================
--- source/lib/sysdep/os/bsd/bcpu.cpp
+++ source/lib/sysdep/os/bsd/bcpu.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2022 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -33,6 +33,7 @@
 #endif
 #include <sys/param.h>
 #include <sys/sysctl.h>
+#include <sys/types.h>
 
 size_t os_cpu_NumProcessors()
 {
@@ -90,11 +91,11 @@
 
 size_t os_cpu_QueryMemorySize()
 {
-	size_t memorySize = 0;
+	int64_t memorySize = 0;
 	size_t len = sizeof(memorySize);
 	// Argh, the API doesn't seem to be const-correct
-	/*const*/ int mib[2] = { CTL_HW, HW_PHYSMEM };
-	sysctl(mib, 2, &memorySize, &len, 0, 0);
+	/*const*/ int mib[2] = { CTL_HW, HW_MEMSIZE };
+	sysctl(mib, 2, &memorySize, &len, nullptr, 0);
 	memorySize /= MiB;
 	return memorySize;
 }
@@ -102,11 +103,11 @@
 
 size_t os_cpu_MemoryAvailable()
 {
-	size_t memoryAvailable = 0;
+	int64_t memoryAvailable = 0;
 	size_t len = sizeof(memoryAvailable);
 	// Argh, the API doesn't seem to be const-correct
 	/*const*/ int mib[2] = { CTL_HW, HW_USERMEM };
-	sysctl(mib, 2, &memoryAvailable, &len, 0, 0);
+	sysctl(mib, 2, &memoryAvailable, &len, nullptr, 0);
 	memoryAvailable /= MiB;
 	return memoryAvailable;
 }
Index: source/lib/sysdep/os/osx/ocpu.cpp
===================================================================
--- source/lib/sysdep/os/osx/ocpu.cpp
+++ source/lib/sysdep/os/osx/ocpu.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2022 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -27,6 +27,7 @@
 #include "lib/bits.h"
 
 #include <sys/sysctl.h>
+#include <sys/types.h>
 
 size_t os_cpu_NumProcessors()
 {
@@ -78,11 +79,11 @@
 
 size_t os_cpu_QueryMemorySize()
 {
-	size_t memorySize = 0;
+	int64_t memorySize = 0;
 	size_t len = sizeof(memorySize);
 	// Argh, the API doesn't seem to be const-correct
-	/*const*/ int mib[2] = { CTL_HW, HW_PHYSMEM };
-	sysctl(mib, 2, &memorySize, &len, 0, 0);
+	/*const*/ int mib[2] = { CTL_HW, HW_MEMSIZE };
+	sysctl(mib, 2, &memorySize, &len, nullptr, 0);
 	memorySize /= MiB;
 	return memorySize;
 }
@@ -90,11 +91,11 @@
 
 size_t os_cpu_MemoryAvailable()
 {
-	size_t memoryAvailable = 0;
+	int64_t memoryAvailable = 0;
 	size_t len = sizeof(memoryAvailable);
 	// Argh, the API doesn't seem to be const-correct
 	/*const*/ int mib[2] = { CTL_HW, HW_USERMEM };
-	sysctl(mib, 2, &memoryAvailable, &len, 0, 0);
+	sysctl(mib, 2, &memoryAvailable, &len, nullptr, 0);
 	memoryAvailable /= MiB;
 	return memoryAvailable;
 }