Re-add C++ files