Remove problematic content in cpp, test header context

Authored by olivierjg.