Merge "Remove unused (mostly GL-related) headers"