Add include file into globbing and cleanup a little
Add typeName to retrieve the a name of a type using demangling