Fix compilation issues

We should now be able to build in Eclipse.
Also removed some unused imports.