cpp: fixes for includer and workflow specs