Reduce header dependencies

Include a header file that is needed only for cpp in cpp rather than
hpp.