fixed compile errors, have circular include, making me sad :(
Merge branch 'master' of https://github.com/TroyShaw/ThreadsOfFury