Reorganized Doxygen marks to obtain a better header reference