some more header cleanup