@@ -65,25 +65,25 @@
 
 	return 0;
 }
 
 int
-of_condition_wait(of_condition_t *condition, of_mutex_t *mutex)
+of_condition_wait(of_condition_t *condition, OFPlainMutex *mutex)
 {
 	int error;
 	DWORD status;
 
-	if ((error = of_mutex_unlock(mutex)) != 0)
+	if ((error = OFPlainMutexUnlock(mutex)) != 0)
 		return error;
 
 	of_atomic_int_inc(&condition->count);
 	status = WaitForSingleObject(condition->event, INFINITE);
 	of_atomic_int_dec(&condition->count);
 
 	switch (status) {
 	case WAIT_OBJECT_0:
-		return of_mutex_lock(mutex);
+		return OFPlainMutexLock(mutex);
 	case WAIT_FAILED:
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
@@ -93,26 +93,26 @@
 		OF_ENSURE(0);
 	}
 }
 
 int
-of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex,
+of_condition_timed_wait(of_condition_t *condition, OFPlainMutex *mutex,
     OFTimeInterval timeout)
 {
 	int error;
 	DWORD status;
 
-	if ((error = of_mutex_unlock(mutex)) != 0)
+	if ((error = OFPlainMutexUnlock(mutex)) != 0)
 		return error;
 
 	of_atomic_int_inc(&condition->count);
 	status = WaitForSingleObject(condition->event, timeout * 1000);
 	of_atomic_int_dec(&condition->count);
 
 	switch (status) {
 	case WAIT_OBJECT_0:
-		return of_mutex_lock(mutex);
+		return OFPlainMutexLock(mutex);
 	case WAIT_TIMEOUT:
 		return ETIMEDOUT;
 	case WAIT_FAILED:
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE: