@@ -293,12 +293,12 @@
 #if defined(OF_OBJFW_RUNTIME) && UINTPTR_MAX == UINT64_MAX
 	uint64_t value;
 #endif
 
 	if (seconds == 0) {
-		static of_once_t once = OF_ONCE_INIT;
-		of_once(&once, initZeroDate);
+		static OFOnceControl once = OFOnceControlInitValue;
+		OFOnce(&once, initZeroDate);
 		return (id)zeroDate;
 	}
 
 #if defined(OF_OBJFW_RUNTIME) && UINTPTR_MAX == UINT64_MAX
 	value = OF_BSWAP64_IF_LE(OF_DOUBLE_TO_INT_RAW(OF_BSWAP_DOUBLE_IF_LE(
@@ -408,19 +408,19 @@
 					       format: format] autorelease];
 }
 
 + (instancetype)distantFuture
 {
-	static of_once_t once = OF_ONCE_INIT;
-	of_once(&once, initDistantFuture);
+	static OFOnceControl once = OFOnceControlInitValue;
+	OFOnce(&once, initDistantFuture);
 	return distantFuture;
 }
 
 + (instancetype)distantPast
 {
-	static of_once_t once = OF_ONCE_INIT;
-	of_once(&once, initDistantPast);
+	static OFOnceControl once = OFOnceControlInitValue;
+	OFOnce(&once, initDistantPast);
 	return distantPast;
 }
 
 - (instancetype)init
 {