MOSYNC-2870: Fixed missing includes