The prof inline functions are no longer involved in a circular dependency, so consolidate the two headers into one.