Merge pull request #293 from benma/cleanup

Made all includes consistent