Fix smp building and remove references to includes that don't exist.