Fix build with llvm11 (duplicate symbol errors)
While here, re-generate patches using 'makepatch' target.