generic-include-fix.diff
