Add support for r24 headers

It looks like everything works from r20.007.