Fixed class definitions inside cpp files