changed header names to c++ standard