Converted all of the headers to the new format.