Fixed a bunch of headers