More conditional header inclusion.