simplify header inclusion logic