More header cleanup