Fix more CMake GTK+ build issues after r150336