Updating a number of Modular headers to work with Doxygen