Remove unused includes

2 jobs for master in 80 minutes and 49 seconds (queued for 57 minutes and 58 seconds)