Fixed vcxproj reference to old file name
Removed unnecessary headers