more header cleanups