Merge "Add includes for waitpid"