Import patch to set *CPPFLAGS in upstream's mkfile