fix header test for OpenVR and minor cleanup
Mostly fix header test for OpenVR
A GitLab update will be applied on May 23, between 8am and 10am, EDT (UTC-04:00). This site may have intermittent delays during that time.
Mostly fix header test for OpenVR