fix header inclusions