Fix includes and project file