Remove unused includes following r211294