generic-include-fix.diff