Update autodocumentation routines
Fix missing includes