Fix inclusion of recently removed files