Merge "Add missing <malloc.h> include."