fixing includes
Merge branch 'master' of https://github.com/srdja/Collections-C