Fix: Forgot to include several classes.