include support and texi fixes