Fix includes of C++ header