The masses, and the mass discrepancy of O-type stars