fix some minor header inclusion