Fix compiler warnings, clean #includes
Merge pull request #2 from orgads/warnings

Fix compiler warnings, clean #includes