Remove more useless includes