Merge "Add missing <strings.h> includes"