These changes are for reenabling build of gnome port.