Remove unnecessary include, add a few omitted dependencies.