tidied up C++ headers