more header fixes, yay