Updated Windows project and fixed wrong includes