little includes refactor
Merge branch 'master' of github.com:scriptum/Cheetah
fixes