cpp: make use of the new c++ includes class