Remove include of removed .h files