fixed header names in cpp files