automerge: 86b48b3 * commit '86b48b3f8056a8efa6857d87dd4f30495e8b0464': Add missing <string.h> includes.