Remove unused includes

2 jobs for master in 45 minutes and 57 seconds (queued for 42 minutes and 46 seconds)