r9310: update headers