Adapt to some changed include paths in opm-core.

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