Fix headers and doxygen comments