Fix a wrong include in gnome3 Makefile and some other changes to continue the build