More C++ fixes, so headers can be included.