Fix includes
Merge pull request #124 from egeldenhuys/cleaning-master

Fix includes