OVR interface cleanup and fixed OVR includes