Updated incfiles, cppproj tests pass