maint: updating includes functions
giza: porting include analysis over