Merge "Add missing <malloc.h> and <string.h> includes."