More header fixes... Derp.