Use new CPP generation from afb-genskel