Merge "fix-up dependencies to gl headers" into klp-dev