Remove unused includes

2 jobs for master in 13 minutes and 32 seconds (queued for 70 minutes and 25 seconds)