Updated all header files to new format

No match.