Add '#include's missing from 4f023d7222