Keep support for major 17 by using a version check for the changed API. Fixes #93907.
Library code and public headers are now properly separated, we can fix include paths to remove the redundant subfolder.