xalloc.h-instead-of-alloc.h.patch from patch #6230.