GLKit: Move headers inline with Mesa maste