Clean up more includes
Simplify glm includes
Use specific glm imports