Remove unused includes

2 jobs for master in 17 minutes and 46 seconds (queued for 233 minutes and 39 seconds)