C++ syntax alterations as after file.

With Alepha and doxygen formatting bits.