more header cleanup