Updated files and headers for C++