Fix typos

fix various typos introduced during the
refactor.

- fix spelling of include.
- ensure valid classes are included