Prune redundant includes

Tested on OS X and Linux