clean up includes
Merge branch 'master' of github.com:kallaballa/Janosh