Minor improvements to includes

6 jobs for feature/gpu-projectors in 51 seconds (queued for 1 second)