pedantic header cleanup