Merge "IWYU in Movie.h"