msbuild: improved handling of includes for projects

Now split into two ItemGroups to match the way visual studio handles
adding include files within the IDE.