[PATCH 01/14] include: Add UMS typedef's