Fix includes
Fix #634