@@ -331,20 +331,20 @@
 	return OBJFW_VERSION_MINOR;
 }
 
 + (OFString *)operatingSystemName
 {
-	static of_once_t onceControl = OF_ONCE_INIT;
-	of_once(&onceControl, initOperatingSystemName);
+	static OFOnceControl onceControl = OFOnceControlInitValue;
+	OFOnce(&onceControl, initOperatingSystemName);
 
 	return operatingSystemName;
 }
 
 + (OFString *)operatingSystemVersion
 {
-	static of_once_t onceControl = OF_ONCE_INIT;
-	of_once(&onceControl, initOperatingSystemVersion);
+	static OFOnceControl onceControl = OFOnceControlInitValue;
+	OFOnce(&onceControl, initOperatingSystemVersion);
 
 	return operatingSystemVersion;
 }
 
 #ifdef OF_HAVE_FILES