go support; fix some tiny includes.tmpl bugs