and yet more header fixes