Changes required to allow building on Eclipse Luna.

Tested by building against both Eclipse Kepler and Eclipse Luna.