Also add the new function to the units header file. Remove the unnecessary inclusion of the MPI headers.