more header fixes?