Fix compile errors after JDT's https://git.eclipse.org/r/#/c/155226/
14 files changed