Good points, I've made these fixes in the attached patch.
I tried building Emacs with X
(--with-x --with-ns=no) and the configuring step picked up my installed
version of GTK3, then later failed at the linking stage for temacs due
to some GDK-related symbols not being present. Have you seen similar
errors?