Fix dependency issues for newer Eclipse versions

Change-Id: I8ab548f3c497f368ca1752e65ce7190d81087917
2 files changed