audit: Tidy header includes