Cpp header fix