Merge "Fix omitted libc includes."