final repairs to LibOVR for multiple include folders