Remove use of equinox internals.
4 files changed