Updated C++ wrapper for new .h inclusion rules.