Fix smp building and remove references to includes that don't exist.
Merge pull request #180 from hobbes1069/patches

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