MOSYNC-2871: More missing includes