Adapt to changed include paths for some opm-core headers.

This PR should only be merged after the corresponding PR in opm-core is merged.