Merge "Move GL specific code away from header"