cpp: refactor content descriptor factory into its own class
cpp: add support for includers in file info factory