Use consistent header includes.