Remove legacy includes