Remove some includes we don't need any more.