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