Fix missing include

Change-Id: Ifee822b7168712262648092601f9b441228e37b7
Merge topic 'gio-cleanup-and-warning-fixes' into next

7a58fbd Fix missing include