Fix duplicate definitions in Mavericks