Doxygen and CCCC fix