Cleaned up includes.
Merge branch 'master' of https://github.com/jhoffman0x/EventHub