Remove a few unused includes.
Merge pull request #572 from nico/incless

Remove a few unused includes.