AVALANCHE: Remove useless includes