cpp: put external Engine and peers in builtins
cpp: Fixes to build