[AC21.5] GTK compilation fixes.