Include headers properly so that they appear in project solutions