[AC21.4] Compile fixes for GTK+