C++ port: add header file change