more header fixes