Use C++ header file names