Fix various compile issues with commit 591b00c0dfdeb180467818babd722f2f0a0c485c
Update project file to fix a few missing header files