Make it compile on Linux/X again

Change-Id: Ic74591292e3f4842f4a50869682c3ff605590b60