Merge with 'corrected' yourcode.h