Merge "Add missing includes for pid_t."