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

Remove a few unused includes.
delete obsolete todo
call this version 1.3.0