Fixed header inclusion logic